Go to file
SpiritCroc 43b99a2a9a Merge remote-tracking branch 'upstream/master' into sc
Change-Id: Id1192801aa01317d36af3d0619ab281200ecfc80

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	vector/src/main/java/im/vector/app/core/utils/UserColor.kt
	vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
	vector/src/main/res/layout/activity_signed_out.xml
	vector/src/main/res/layout/fragment_login.xml
	vector/src/main/res/layout/fragment_login_captcha.xml
	vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
	vector/src/main/res/layout/fragment_login_reset_password.xml
	vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
	vector/src/main/res/layout/fragment_login_reset_password_success.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/fragment_login_terms.xml
	vector/src/main/res/layout/fragment_login_wait_for_email.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values-land/styles_login.xml
	vector/src/main/res/values/styles_login.xml
2020-09-27 13:55:40 +02:00
.github Update issue templates 2020-09-17 16:58:43 +02:00
.idea
attachment-viewer Merge branch 'develop' into feature/enhance_big_files 2020-09-03 17:09:40 +02:00
diff-match-patch
docs Improve wording and fix typo 2020-09-04 14:23:56 +02:00
gradle/wrapper
graphics
matrix-sdk-android Merge remote-tracking branch 'upstream/master' into sc 2020-09-27 13:55:40 +02:00
matrix-sdk-android-rx
multipicker
resources/img
tmp_sc_fastlane/metadata/android [TMP] Automatic upstream merge preparation 2020-09-27 10:41:07 +02:00
tools Fix false positive from code quality analysis 2020-09-10 17:13:11 +02:00
vector Merge remote-tracking branch 'upstream/master' into sc 2020-09-27 13:55:40 +02:00
.editorconfig
.gitignore
.travis.yml
alternative_package.sh alternative_package.sh: Don't run twice 2020-09-02 13:15:16 +02:00
AUTHORS.md
build.gradle Update of Buildkite configuration: 2020-09-01 18:52:03 +02:00
CHANGES.md Prepare release 1.0.8 2020-09-25 14:08:15 +02:00
CONTRIBUTING.md
correct_strings.sh
gradle.properties
gradlew
gradlew.bat
increment_version.sh increment_version.sh: Tag pre-release 2020-09-22 10:21:24 +02:00
legacy_icons.sh
LICENSE
merge_helpers.sh merge_helpers.sh: Fix some tagging logic 2020-09-10 11:11:22 +02:00
post_merge.sh Update merge helpers 2020-09-08 19:17:15 +02:00
pre_merge.sh Update merge helpers 2020-09-08 19:17:15 +02: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-09-27 10:41:07 +02:00
settings.gradle
tmp_sc_README.md [TMP] Automatic upstream merge preparation 2020-09-27 10:41:07 +02: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.