Benoit Marty
060e9d7a7e
Merge pull request #3568 from vector-im/dependabot/gradle/kotlin_version-1.5.20
...
Bump kotlin_version from 1.5.10 to 1.5.20
2021-06-25 19:11:34 +02:00
Benoit Marty
631e7881ef
Fix warning about implicit type, introduced in Kotlin 1.5.20.
...
"Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
2021-06-25 17:42:38 +02:00
Benoit Marty
2e37b5efa3
Merge pull request #3565 from vector-im/feature/fga/fix_call_notification
...
Fix call invite processed after call is ended because of fastlane mode.
2021-06-25 16:47:54 +02:00
Benoit Marty
6b82e8d55a
Merge pull request #3567 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.26
...
Bump libphonenumber from 8.12.25 to 8.12.26
2021-06-25 16:45:16 +02:00
Thibault Martin
473259f150
Translated using Weblate (French)
...
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/fr/
2021-06-25 09:34:50 +00:00
BramvdnHeuvel
7c04391037
Translated using Weblate (Dutch)
...
Currently translated at 52.1% (1298 of 2490 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
2021-06-25 09:34:49 +00:00
Thibault Martin
bafd01c0f4
Translated using Weblate (French)
...
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/fr/
2021-06-25 09:34:45 +00:00
dependabot[bot]
b1a1b4651e
Bump kotlin_version from 1.5.10 to 1.5.20
...
Bumps `kotlin_version` from 1.5.10 to 1.5.20.
Updates `kotlin-gradle-plugin` from 1.5.10 to 1.5.20
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.20/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.10...v1.5.20 )
Updates `kotlin-stdlib-jdk7` from 1.5.10 to 1.5.20
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.20/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.10...v1.5.20 )
Updates `kotlin-stdlib` from 1.5.10 to 1.5.20
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.20/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.10...v1.5.20 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk7
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-24 23:09:29 +00:00
dependabot[bot]
9e2f2f2372
Bump libphonenumber from 8.12.25 to 8.12.26
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.25 to 8.12.26.
- [Release notes](https://github.com/google/libphonenumber/releases )
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md )
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.25...v8.12.26 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-24 23:05:19 +00:00
ganfra
a2c8680d7a
Fix call invite processed after call is ended because of fastlane mode.
2021-06-24 20:49:35 +02:00
ganfra
cccf5de015
Jump to unread: removes unnecessary check which can cause scroll issue
2021-06-24 18:50:44 +02:00
ganfra
ab37984beb
Jump to unread: avoid blink when jumping
2021-06-24 18:33:30 +02:00
ganfra
1ba97fa9be
Clean after Benoits review
2021-06-24 17:40:45 +02:00
Benoit Marty
ca3e5cdf90
Merge pull request #3544 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.67
...
Bump kluent-android from 1.65 to 1.67
2021-06-24 14:49:53 +02:00
Benoit Marty
f5ecaa0339
Merge pull request #3520 from vector-im/feature/fga/timeline_virtual_room
...
Feature/fga/timeline virtual room
2021-06-24 14:43:00 +02:00
Benoit Marty
5eb0097fb2
Delete unused drawable to avoid conflict on develop
2021-06-24 14:40:38 +02:00
Benoit Marty
14184aae6f
Merge pull request #3506 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.25
...
Bump libphonenumber from 8.12.24 to 8.12.25
2021-06-24 14:34:45 +02:00
Benoit Marty
f0fd40b189
Merge pull request #3505 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.6.0
...
Bump realm-gradle-plugin from 10.5.0 to 10.6.0
2021-06-24 14:32:35 +02:00
Benoit Marty
bbb51f31f3
Merge pull request #3512 from vector-im/gradlew-update-7.1
...
Update Gradle Wrapper from 7.0.2 to 7.1
2021-06-24 14:31:50 +02:00
Benoit Marty
ed90f376e6
Merge pull request #3518 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.5
...
Bump fragment-ktx from 1.3.4 to 1.3.5
2021-06-24 14:31:04 +02:00
Benoit Marty
7257736691
Merge pull request #3545 from vector-im/feature/bma/password_reveal
...
Password reveal
2021-06-24 14:30:34 +02:00
ganfra
919ebaa82e
Fix some issues with timeline cache invalidation and visibility.
2021-06-24 12:41:23 +02:00
Valere
846c5d52b8
Fix unused parameter
2021-06-24 11:54:06 +02:00
SpiritCroc
5a1e7c8c74
Automatic SchildiChat string correction
...
Change-Id: I97f141d77c393c13cdd5e2e7a2def918aace93e9
2021-06-24 10:19:46 +02:00
SpiritCroc
d1f51abbcd
Automatic upstream merge postprocessing
...
Change-Id: I8d5fd7af5b04c9e19e925fe37114ec72e152d559
2021-06-24 10:19:45 +02:00
SpiritCroc
d11c1fcc62
Merge tag 'v1.1.11' into sc
...
Change-Id: I15d6e584f1594764f956c129003b2a459b5d24a6
2021-06-24 10:19:24 +02:00
SpiritCroc
89ef62e1d5
Fix compile after v1.1.10 merge
...
Change-Id: I2c5395044d0a3d1cd8005c1f2f8fface38b45c22
2021-06-24 10:19:02 +02:00
Valere
43a1e283c5
Merge pull request #3514 from vector-im/feature/bca/fix_join_errors
...
Add error feedback when joining space rooms
2021-06-24 09:56:32 +02:00
Valere
ef5c552a3b
Update change log
2021-06-24 09:52:53 +02:00
Valere
57c75f8039
Ugrade unstable room notice in settings
...
default update parent, clean migrate bottomsheet layout
2021-06-24 09:38:52 +02:00
ganfra
d1ab116b1d
Jump to unread: add towncrier file.
2021-06-23 17:13:46 +02:00
ganfra
c3ef036dca
Read marker: fix some issues with jump to unread visibility.
2021-06-23 16:59:58 +02:00
Benoit Marty
885f5736c9
Stop using ProgressDialog, there is a theme issue with it.
...
It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
2021-06-23 16:46:15 +02:00
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
Valere
171793d190
room version cap support + room upgrade
2021-06-22 17:35:39 +02: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