Matrix client / Element Android fork
Find a file
SpiritCroc f66747e972 Merge commit '0f4e546e1e96c76219649d27eca38a98e6c04c5f' into sc
Change-Id: I782ef7ae26d7a3c168d26a1458f84fbfe80e9767

Conflicts:
	vector/src/debug/res/layout/activity_debug_menu.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.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/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
	vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
	vector/src/main/res/color/button_positive_background_selector.xml
	vector/src/main/res/color/button_positive_text_color_selector.xml
	vector/src/main/res/color/checked_accent_color_selector.xml
	vector/src/main/res/color/login_button_tint.xml
	vector/src/main/res/drawable/bg_breadcrumbs_typing.xml
	vector/src/main/res/drawable/bg_login_server_checked.xml
	vector/src/main/res/drawable/bg_send.xml
	vector/src/main/res/drawable/highlighted_message_background.xml
	vector/src/main/res/drawable/ic_settings_root_advanced.xml
	vector/src/main/res/drawable/ic_settings_root_call.xml
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/drawable/ic_settings_root_general.xml
	vector/src/main/res/drawable/ic_settings_root_help_about.xml
	vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
	vector/src/main/res/drawable/ic_settings_root_labs.xml
	vector/src/main/res/drawable/ic_settings_root_notification.xml
	vector/src/main/res/drawable/ic_settings_root_preferences.xml
	vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
	vector/src/main/res/drawable/reaction_rounded_rect_shape.xml
	vector/src/main/res/drawable/splash.xml
	vector/src/main/res/drawable/vector_tabbar_selected_background.xml
	vector/src/main/res/layout/alerter_incoming_call_layout.xml
	vector/src/main/res/layout/custom_action_item_layout_badge.xml
	vector/src/main/res/layout/dialog_export_e2e_keys.xml
	vector/src/main/res/layout/dialog_import_e2e_keys.xml
	vector/src/main/res/layout/fragment_home_drawer.xml
	vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
	vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
	vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step3.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_server_url_form_2.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/fragment_public_rooms.xml
	vector/src/main/res/layout/fragment_qr_code_scanner.xml
	vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
	vector/src/main/res/layout/fragment_review_terms.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/fragment_space_add_rooms.xml
	vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_form_submit_button.xml
	vector/src/main/res/layout/item_generic_list.xml
	vector/src/main/res/layout/item_generic_with_value.xml
	vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
	vector/src/main/res/layout/item_notification_troubleshoot.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_settings_centered_image.xml
	vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/item_verification_action.xml
	vector/src/main/res/layout/view_attachment_type_selector.xml
	vector/src/main/res/layout/view_bottom_sheet_action_button.xml
	vector/src/main/res/layout/view_call_controls.xml
	vector/src/main/res/menu/menu_submit.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/styles_riot.xml
	vector/src/main/res/values/theme_dark.xml
2021-06-23 11:08:10 +02:00
.github [TMP] Automatic upstream merge preparation 2021-06-20 09:04:09 +02:00
.idea Merge commit '0f4e546e1e96c76219649d27eca38a98e6c04c5f' into sc 2021-06-23 11:08:10 +02:00
attachment-viewer Bump core-ktx from 1.3.2 to 1.5.0 2021-05-20 13:08:12 +00:00
diff-match-patch Use diff_match_patch sources as dependency 2019-12-11 10:51:09 +01:00
docs Rework colors management 2021-06-09 15:36:20 +02:00
fastlane [TMP] Automatic upstream merge preparation 2021-06-20 09:04:09 +02:00
fastlane_testing alternative_package.sh: Patch store description for test releases 2020-12-20 13:11:16 +01:00
gradle/wrapper Update Gradle Wrapper from 7.0.1 to 7.0.2. 2021-05-17 11:13:05 +02:00
graphics Update third party license notice for notification icon 2021-04-20 14:33:03 +02:00
matrix-sdk-android Merge commit '0f4e546e1e96c76219649d27eca38a98e6c04c5f' into sc 2021-06-23 11:08:10 +02:00
matrix-sdk-android-rx VoIP: add protocols checks and third party lookups 2021-05-27 10:28:32 +02:00
multipicker Bump fragment-ktx from 1.3.3 to 1.3.4 2021-05-20 13:08:13 +00:00
newsfragment Rework colors management 2021-06-09 15:36:20 +02: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 2021-06-20 09:04:09 +02:00
tmp_sc_fastlane/metadata/android [TMP] Automatic upstream merge preparation 2021-06-20 09:04:09 +02:00
tools Rework colors management 2021-06-09 15:36:20 +02:00
vector Merge commit '0f4e546e1e96c76219649d27eca38a98e6c04c5f' into sc 2021-06-23 11:08:10 +02:00
.editorconfig prevent wildcard for import 2020-02-26 17:01:38 +01:00
.gitignore Enable semi-automatic correct_strings.sh-patching 2021-02-21 10:35:55 +01:00
.travis.yml Cleanup Travis config. 2021-05-12 16:24:20 +02:00
alternative_package.sh alternative_package.sh: Allow replacing the name 2021-05-09 16:06:16 +02:00
AUTHORS.md Add ability to share profile by QR code 2020-11-20 14:49:39 +01:00
build.gradle Also upgrade coroutine library to 1.5.0 2021-05-25 10:56:36 +02:00
CHANGES.md Prepare release 1.1.9 - towncrier 2021-06-02 11:43:27 +02:00
CONTRIBUTING.md Rework colors management 2021-06-09 15:36:20 +02:00
correct_strings.sh correct_strings.sh: matrix-sdk strings were deleted 2021-03-14 11:06:25 +01:00
correct_strings_de.sh Update string correction 2021-04-19 11:20:29 +02:00
FEATURES.md Sticker picker: pass dark/light theme 2021-01-19 19:46:30 +01:00
gradle.properties Log HTTP requests and responses in production (level BASIC, i.e. without any private data) 2020-12-08 13:44:42 +01: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: Exclude translation updates 2021-06-04 11:30:11 +02: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: Fix spaces for upstream_previous_tag 2021-04-12 16:01:39 +02:00
post_merge.sh Fix some accent colors 2021-02-05 12:40:32 +01:00
pre_merge.sh pre_merge.sh: Fix when last merge was not tagged 2021-04-09 11:55:15 +02:00
PRIVACY.md Privacy policy: moved to website 2021-04-25 11:09:04 +02:00
README.md [TMP] Automatic upstream merge preparation 2021-06-20 09:04:09 +02:00
settings.gradle Format 2020-07-10 12:52:54 +02:00
tmp_sc_README.md [TMP] Automatic upstream merge preparation 2021-06-20 09:04:09 +02:00
towncrier.toml Configure towncrier tool 2021-05-20 16:41:29 +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.