filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,178 Commits 6 Branches 119 Tags 221 MiB
Commit Graph

10178 Commits

Author SHA1 Message Date
Thor Arne Johansen 25b9547678 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 62.8% (1564 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
 2021-06-23 14:34:46 +00:00
libexus 3b31f3956c Translated using Weblate (German) 
Currently translated at 99.9% (2488 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-06-23 14:34:45 +00:00
Benoit Marty 43cad8751d Reordering 2021-06-23 16:12:38 +02:00
Benoit Marty 9ac0f6d86b Add text style for dialogs 2021-06-23 15:38:01 +02:00
Benoit Marty 11b16ea065 Colored dialog button is now handled by the theme 2021-06-23 14:50:34 +02:00
SpiritCroc 72aa4bb999 Merge tag 'v1.1.10' into sc 
Change-Id: I01e7b61adf9444e6894232235ee71ac8295b00ab

Conflicts:
	library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
	library/ui-styles/src/main/res/drawable/splash.xml
	library/ui-styles/src/main/res/values/theme_light.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataTypes.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/drawable/ic_attachment.xml
	vector/src/main/res/drawable/ic_insert_emoji.xml
	vector/src/main/res/drawable/ic_keyboard.xml
	vector/src/main/res/layout/composer_layout.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/fragment_home_detail.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_user_list.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_space_beta_header.xml
	vector/src/main/res/layout/item_suggested_room.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/values/styles_riot.xml
 2021-06-23 13:38:41 +02:00
Benoit Marty 67bdb75d80 Update theme for material dialog and create a destructive variant 2021-06-23 13:19:14 +02:00
Benoit Marty d0a7265975 Reorder buttons 2021-06-23 13:01:48 +02:00
SpiritCroc 9ba32bc5bb Rework SC theme and more fix merge conflicts to make it compile again 
Note: SC colors still need work, this is just to make the semi-merge compile.

Change-Id: Iaf144e1ce6f349d10759ba1c22c3dc404dee4768
 2021-06-23 12:38:27 +02:00
Benoit Marty a148d21cdb Update doc 2021-06-23 12:36:43 +02:00
SpiritCroc 7f84f79693 Re-enable crash report prompt onResume 
Change-Id: Id21aae4b2c24cdd3fd3ee0051a0369034c117cea
 2021-06-23 11:11:10 +02:00
SpiritCroc 0389084cb6 merge_helpers.sh: upstream renamed master -> main 
Change-Id: I7980f26bdc7f90399999d8b86536b92ca1683d10
 2021-06-23 11:09:09 +02:00
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
Ridhubharan 13ec7a500a Added translation using Weblate (Tamil) 2021-06-22 17:31:49 +00:00
ganfra 121fd9a19d Jump to unread: implement new design 2021-06-22 16:29:19 +02:00
Benoit Marty ed97cf7dac Create dimens for text sizes 2021-06-22 14:39:24 +02:00
Benoit Marty 0c88d11429 Version++ 2021-06-22 12:28:18 +02:00
Benoit Marty a3d54f1466 Merge branch 'release/1.1.11' into main 2021-06-22 12:27:44 +02:00
Benoit Marty 0dec46eb18 Merge branch 'release/1.1.11' into develop 2021-06-22 12:27:44 +02:00
Benoit Marty b76fd5dd4e Prepare release 1.1.11 2021-06-22 12:27:36 +02:00
Benoit Marty 48002e11b6
Merge pull request #3540 from vector-im/feature/bma/fix_composer 
Send button does not show up half of the time (#3535)
 2021-06-22 12:24:28 +02:00
Benoit Marty 6289d640b4 Reveal password: use facility from com.google.android.material.textfield.TextInputLayout instead of manual handling 
Also avoid repeating password on the change password dialog.
 2021-06-22 11:31:45 +02:00
dependabot[bot] e2e3e2de86
Bump kluent-android from 1.65 to 1.67 
Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent) from 1.65 to 1.67.
- [Release notes](https://github.com/MarkusAmshove/Kluent/releases)
- [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MarkusAmshove/Kluent/commits)

---
updated-dependencies:
- dependency-name: org.amshove.kluent:kluent-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-21 23:06:17 +00:00
Benoit Marty 5db0d75959 Remove dead code 2021-06-21 14:44:31 +02:00
Benoit Marty 434018074d
Merge pull request #3538 from vector-im/feature/fga/fix_signout 
Fix crash on signout: release session at the end of clean up
 2021-06-21 14:11:10 +02:00
Benoit Marty c21b19f49f Send button does not show up half of the time (#3535) 2021-06-21 14:06:43 +02:00
ganfra d8327a5161 Fix crash on signout: release session at the end so you clean up files first. 2021-06-21 11:10:10 +02:00
zeritti f7be5996e5 Translated using Weblate (Czech) 
Currently translated at 100.0% (21 of 21 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-06-21 00:34:49 +00:00
Jeff Huang efe0a1737e Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-06-21 00:34:49 +00:00
sr093906 061ab76c21 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2021-06-21 00:34:48 +00:00
LinAGKar 8e595a7605 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-06-21 00:34:48 +00:00
Besnik Bleta b5ff31b84e Translated using Weblate (Albanian) 
Currently translated at 99.5% (2479 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2021-06-21 00:34:48 +00:00
Szimszon e77cca4495 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2021-06-21 00:34:47 +00:00
Vancha f6dd07eb64 Translated using Weblate (Frisian) 
Currently translated at 25.7% (641 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
 2021-06-21 00:34:47 +00:00
Priit Jõerüüt 5555b0dbb7 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-06-21 00:34:45 +00:00
libexus b0c23426df Translated using Weblate (German) 
Currently translated at 99.7% (2485 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-06-21 00:34:44 +00:00
waclaw66 a64c7e5df2 Translated using Weblate (Czech) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-06-21 00:34:44 +00:00
SpiritCroc 6626c5b600 Merge commit '8b138e8ff' into sc 
Change-Id: Icbda29234a03a5498d1aa1b9bbf9bba386f7c2cc

Conflicts:
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
 2021-06-20 09:18:03 +02:00
SpiritCroc fb2551fc90 [TMP] Automatic upstream merge preparation 
Change-Id: Ia98cb8dfb432d851e1e2c6bc63449b2341c7e5ac
 2021-06-20 09:04:09 +02:00
SpiritCroc 5273656c34 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Id37357a895b6a6aca2f02c06b03d9bebb14e4739
 2021-06-20 09:04:08 +02:00
lvre e0a5241caf Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-06-20 00:03:04 +00:00
Benoit Marty 4ce71c8487 Create a style for password edit 2021-06-18 21:52:53 +02:00
Benoit Marty b30c27b7a6 Version++ 2021-06-18 21:50:12 +02:00
Benoit Marty c7fc3f0b42 Merge branch 'release/1.1.10' into main 2021-06-18 21:39:02 +02:00
Benoit Marty 729ce509d4 Merge branch 'release/1.1.10' into develop 2021-06-18 21:38:59 +02:00
Benoit Marty d737d81458 Release 1.1.10: fastlane 2021-06-18 21:38:38 +02:00
Benoit Marty dcce618fd5 Release 1.1.10: towncrier 2021-06-18 21:36:57 +02:00
Benoit Marty d6363a6e1b Update template and use a more power full configuration 2021-06-18 21:35:09 +02:00
Benoit Marty eea18fb71c Rename towncrier folder from newsfragment to changelog.d 2021-06-18 21:33:50 +02:00
Benoit Marty 71a8a948a6
Merge pull request #3530 from vector-im/feature/bma/prepare_release_1.1.10 
Prepare release 1.1.10
 2021-06-18 21:04:27 +02:00