mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-24 10:25:51 +03:00
Matrix client / Element Android fork
978056e01f
Conflicts:
dependencies.gradle
gradle.properties
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
vector/build.gradle
vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
Parts of conflict resolution taken from
commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
Merge: 06f52832b
|
||
|---|---|---|
| .github | ||
| .idea | ||
| attachment-viewer | ||
| changelog.d | ||
| diff-match-patch | ||
| docs | ||
| fastlane | ||
| fastlane_alternatives | ||
| gradle/wrapper | ||
| graphics | ||
| library/ui-styles | ||
| matrix-sdk-android | ||
| matrix-sdk-android-flow | ||
| matrix-sdk-android-rx | ||
| multipicker | ||
| newsfragment | ||
| resources/img | ||
| tmp_sc_.github/ISSUE_TEMPLATE | ||
| tmp_sc_fastlane | ||
| tools | ||
| vector | ||
| .editorconfig | ||
| .gitignore | ||
| .travis.yml | ||
| alternative_package.sh | ||
| AUTHORS.md | ||
| build.gradle | ||
| CHANGES.md | ||
| CONTRIBUTING.md | ||
| correct_strings.sh | ||
| correct_strings_de.sh | ||
| dependencies.gradle | ||
| FEATURES.md | ||
| Gemfile | ||
| Gemfile.lock | ||
| generate_themes.sh | ||
| gradle.properties | ||
| gradlew | ||
| gradlew.bat | ||
| increment_version.sh | ||
| legacy_icons.sh | ||
| LICENSE | ||
| merge_helpers.sh | ||
| post_merge.sh | ||
| pre_merge.sh | ||
| PRIVACY.md | ||
| README.md | ||
| settings.gradle | ||
| tmp_sc_README.md | ||
| towncrier.toml | ||
Element Android
Element Android is an Android Matrix Client provided by Element.
It is a total rewrite of Riot-Android with a new user experience.
Nightly build:
New Android SDK
Element is based on a new Android SDK fully written in Kotlin (like Element). In order to make the early development as fast as possible, Element and the new SDK currently share the same git repository.
At each Element release, the SDK module is copied to a dedicated repository: https://github.com/matrix-org/matrix-android-sdk2. That way, third party apps can add a regular gradle dependency to use it. So more details on how to do that here: https://github.com/matrix-org/matrix-android-sdk2.
Roadmap
The version 1.0.0 of Element still misses some features which was previously included in Riot-Android. The team will work to add them on a regular basis.
Contributing
Please refer to CONTRIBUTING.md if you want to contribute on Matrix Android projects!
Come chat with the community in the dedicated Matrix room.