Matrix client / Element Android fork
Find a file
SpiritCroc 0b4f56d7a0 Merge remote-tracking branch 'upstream/master' into sc
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/res/layout/fragment_known_users.xml
	vector/src/main/res/layout/fragment_user_list.xml
2020-11-29 12:51:43 +01:00
.github [TMP] Automatic upstream merge preparation 2020-11-29 12:32:30 +01:00
.idea Merge remote-tracking branch 'upstream/master' into sc 2020-10-17 15:28:18 +02:00
attachment-viewer Do not use deprecated Fragment.startActivityForResult anymore 2020-10-07 16:02:01 +02:00
diff-match-patch Use diff_match_patch sources as dependency 2019-12-11 10:51:09 +01:00
docs PR Review 2020-09-29 15:12:25 +02:00
fastlane Merge remote-tracking branch 'upstream/master' into sc 2020-11-29 12:51:43 +01:00
gradle/wrapper Merge remote-tracking branch 'upstream/master' into sc 2020-11-29 12:51:43 +01:00
graphics Add initial fastlane store description 2020-07-24 11:24:33 +02:00
matrix-sdk-android Merge remote-tracking branch 'upstream/master' into sc 2020-11-29 12:51:43 +01:00
matrix-sdk-android-rx Room member: add methods to get directly from session 2020-11-04 18:09:51 +01:00
multipicker Move some method to the companion 2020-11-05 15:41:52 +01:00
resources/img put F-Droid and GPlay badges locally 2020-06-20 19:42:31 +03:00
tmp_sc_.github/ISSUE_TEMPLATE [TMP] Automatic upstream merge preparation 2020-11-29 12:32:30 +01:00
tmp_sc_fastlane/metadata/android [TMP] Automatic upstream merge preparation 2020-11-29 12:32:30 +01:00
tools Un configure the template, to be able to upgrade Android Studio 2020-11-13 18:25:25 +01:00
vector Merge remote-tracking branch 'upstream/master' into sc 2020-11-29 12:51:43 +01:00
.editorconfig prevent wildcard for import 2020-02-26 17:01:38 +01:00
.gitignore Remove .idea exclusion 2020-04-15 13:00:03 +02:00
.travis.yml Add missing changes of SDK version and build tools 2020-04-15 12:53:28 +02:00
alternative_package.sh alternative_package.sh: Auto-commit, check, if git is clean 2020-11-05 16:11:32 +01:00
AUTHORS.md Add ability to share profile by QR code 2020-11-20 14:49:39 +01:00
build.gradle Fix allWarningsAsErrors mistake... Strange behaviour of Elvis operator in Groovy... 2020-10-22 17:23:45 +02:00
CHANGES.md Prepare version 1.0.11 2020-11-27 13:59:23 +01:00
CONTRIBUTING.md Weblate is now hosted at https://translate.element.io 2020-10-15 15:55:55 +02:00
correct_strings.sh correct_strings.sh: Add manual intervention required warning 2020-08-24 15:45:01 +02:00
gradle.properties Enable file system watch to reduce compilation time 2020-10-15 15:55:55 +02:00
gradlew Update Gradle Wrapper from 5.6.4 to 6.6.1. 2020-10-01 00:53:05 +00:00
gradlew.bat Update Gradle Wrapper from 5.6.4 to 6.6.1. 2020-10-01 00:53:05 +00:00
increment_version.sh increment_version.sh: Add preview mode 2020-11-05 15:48:16 +01:00
legacy_icons.sh Theme legacy icons as well 2020-08-12 13:35:31 +02:00
LICENSE Update README.md & Create LICENSE 2019-03-04 19:18:15 +01:00
merge_helpers.sh merge_helpers.sh: downstream_latest_tag: Refer to HEAD instead of sc 2020-11-06 14:24:10 +01:00
post_merge.sh Customize github templates 2020-11-25 09:29:16 +01:00
pre_merge.sh Customize github templates 2020-11-25 09:29:16 +01:00
PRIVACY.md README: Add link to play version 2020-09-03 19:51:34 +02:00
README.md [TMP] Automatic upstream merge preparation 2020-11-29 12:32:30 +01:00
settings.gradle Format 2020-07-10 12:52:54 +02:00
tmp_sc_README.md [TMP] Automatic upstream merge preparation 2020-11-29 12:32:30 +01:00

Buildkite Weblate Element Android Matrix room #element-android:matrix.org Quality Gate Vulnerabilities Bugs

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.

Get it on Google Play Get it on F-Droid

Nightly build: Buildkite

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.