Commit Graph

460 Commits

Author SHA1 Message Date
Maxime NATUREL eb59a534e0 Fix unused string warning 2022-09-05 10:54:38 +02:00
Maxime NATUREL af484813b5 Rendering inactive status in SessionInfoView 2022-09-05 09:40:02 +02:00
Maxime NATUREL 1c501a0083 Adding comment with examples of some parametrized strings 2022-09-05 09:19:14 +02:00
Maxime NATUREL bbe238e9c6 Adding last seen details + fix observation of wrong deviceId in ViewModel 2022-09-05 09:13:13 +02:00
Maxime NATUREL b626a1e4f9 Show info in overview screen 2022-09-05 09:13:12 +02:00
Maxime NATUREL ba1549048d Navigation from current session 2022-09-05 09:13:12 +02:00
Maxime NATUREL ed3bd871ea Renaming header list view to be consistent 2022-09-05 09:13:12 +02:00
Jozef Gaal 511c6a2ae1 Translated using Weblate (Slovak)
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
2022-09-04 14:32:50 +00:00
lvre a147d8623b Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2022-09-04 14:32:49 +00:00
random 34a424678d Translated using Weblate (Italian)
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
2022-09-04 14:32:48 +00:00
Linerly b13546b096 Translated using Weblate (Indonesian)
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
2022-09-04 14:32:47 +00:00
Emese Tóth db29ebb93d Translated using Weblate (Hungarian)
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
2022-09-04 14:32:46 +00:00
Glandos 287e890f60 Translated using Weblate (French)
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
2022-09-04 14:32:43 +00:00
Danial Behzadi c3bac2f0cf Translated using Weblate (Persian)
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2022-09-04 14:32:42 +00:00
Vri 054802c02b Translated using Weblate (German)
Currently translated at 99.3% (2346 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2022-09-04 14:32:41 +00:00
Maxime NATUREL 5791a4d3cd Using plurals when needed 2022-09-02 15:00:53 +02:00
Onuray Sahin 8d378408c5 Code review fixes. 2022-09-02 14:28:28 +02:00
Onuray Sahin ed1244aa8f Fix description of inactive sessions. 2022-09-02 14:28:27 +02:00
Onuray Sahin e6c9409156 Create generic security recommendations view. 2022-09-02 14:28:01 +02:00
Onuray Sahin 7e8bbda856 Create security recommendations view layout. 2022-09-02 14:28:01 +02:00
Onuray Sahin 55d0a06fc1 Create security recommendations section header. 2022-09-02 14:27:59 +02:00
Jeff Huang e0e9fbc820 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
2022-09-02 08:38:01 +00:00
phardyle ec260fac16 Translated using Weblate (Chinese (Simplified))
Currently translated at 99.7% (2356 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
2022-09-02 08:38:00 +00:00
Ihor Hordiichuk cad23d1477 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2022-09-02 08:37:59 +00:00
Priit Jõerüüt 578ff6bd44 Translated using Weblate (Estonian)
Currently translated at 99.6% (2353 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
2022-09-02 08:37:57 +00:00
Auri B. P 8535e30937 Translated using Weblate (Catalan)
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
2022-09-02 08:37:56 +00:00
Adam Brown 22ce829645 moving all the strings to a dedicated libray/strings module 2022-09-01 14:58:07 +01:00
SpiritCroc e6023c6bae Merge tag 'v1.4.34' into sc
Change-Id: I7e1939f6c87e14d1497433a9bad4f97e074bb838

Conflicts:
	vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
	vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/layout/fragment_login_server_url_form_2.xml
	vector/src/main/res/layout/fragment_room_list.xml
2022-08-24 10:14:36 +02:00
Onuray Sahin 6c65b0a9e0
Merge pull request #6807 from vector-im/feature/mna/device-management-header-list
[Devices Management] Header view for sessions lists in new layout (PSG-668)
2022-08-15 23:09:53 +03:00
Nikita Fedrunov e0e21d4282
filtered room list at home (#6724) 2022-08-11 16:26:24 +02:00
Maxime NATUREL 8f218ce773 Custom header view without "Learn more" 2022-08-11 12:11:14 +02:00
SpiritCroc 5d1722054e Merge tag 'v1.4.32' into sc
Change-Id: Ib3724625b1aada2541e030f9fdaf47a032538c85

Conflicts:
	.gitignore
	library/ui-styles/src/main/res/values/styles_toolbar.xml
	vector/build.gradle
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/VectorApplication.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/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_timeline.xml
2022-08-10 17:07:09 +02:00
ericdecanini 1bf36dce92 Merge remote-tracking branch 'origin/develop' into feature/eric/new_fab 2022-08-05 17:11:00 +02:00
Maxime NATUREL 6972622bc6 Handling map loading error in timeline 2022-08-04 16:58:28 +02:00
Eric Decanini e2ed4b4ae1
Merge pull request #6655 from vector-im/feature/eric/app-layout-toolbar
New App Layout Toolbar
2022-08-02 17:44:53 +02:00
Maxime NATUREL c616229d53 Missing renaming of stylable file 2022-08-02 09:09:19 +02:00
Maxime NATUREL be696f5a5c Align naming of components for the live location feature 2022-08-02 09:09:19 +02:00
SpiritCroc 9b44975635 Merge tag 'v1.4.30' into sc
Change-Id: Ia43ff3781ad84699eb36fba937f7213d47fc0510

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.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/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultLiveLocationShareStatusItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/res/xml/vector_settings_labs.xml
2022-07-29 16:55:28 +02:00
ericdecanini d49f104332 Adds fab buttons 2022-07-28 15:09:57 +02:00
ericdecanini 7334d909d5 Adds options menu 2022-07-26 16:00:46 +02:00
ericdecanini 5958559186 Styles collapsed title text 2022-07-26 14:31:02 +02:00
ericdecanini 3df337fa07 Adds new layout toolbar 2022-07-26 12:38:29 +02:00
Maxime NATUREL e1ea10e0a2 Adding attribute to set the start margin of icon 2022-07-25 14:17:07 +02:00
Maxime NATUREL 5e59eb474a Adding attribute to control alpha of the banner background 2022-07-25 10:36:28 +02:00
Maxime NATUREL 6b403ec224
Merge pull request #6542 from vector-im/feature/mna/lls-standardise-stop-text
[Location Share] - Standardise "Stop" texts for live (PSG-622)
2022-07-18 10:43:43 +02:00
Nikita Fedrunov 79762d9133
font scale setting screen (#6453) 2022-07-18 09:49:57 +02:00
Maxime NATUREL cda100e596 Using same string key for stop + fix insets in button styles 2022-07-18 09:43:33 +02:00
SpiritCroc dec61e7a35 Merge tag 'v1.4.28' into merge-v1.4.28
Change-Id: I623898b2034f132f23d2ac2dfeedb02fee16cd10

Conflicts:
	fastlane/README.md
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.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/list/RoomCategoryItem.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/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
2022-07-17 18:52:55 +02:00
SpiritCroc 9ef870b927 [merge] Live location theming
Change-Id: Ia10af41b946cb5913ce6805095354d23ac3ca251
2022-07-09 21:20:25 +02:00
SpiritCroc 204e111c1c Merge tag 'v1.4.27-RC2' into merge-v1.4.27
Change-Id: I6fba3a97a37a4e0a908289272ea9dec2efc85d00

Conflicts:
	.gitignore
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
	tmp_sc_fastlane/README.md
	vector-config/src/main/res/values/config.xml
	vector/build.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
	vector/src/gplay/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt
	vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.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/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/ChronologicalRoomComparator.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/RoomListSectionBuilderGroup.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
	vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.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/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
	vector/src/main/res/xml/vector_settings_notifications.xml
2022-07-09 18:16:33 +02:00
Benoit Marty e3b3617b1a Add dependency to opusencoder and remove module from this project 2022-07-06 17:54:57 +02:00
Benoit Marty 7616912411
Merge pull request #6436 from vector-im/feature/bma/activity_fragment_1_5_0
Upgrade androidx activity and fragment to 1.5.0
2022-07-06 11:44:22 +02:00
Cadence Ember b8734a23a9 Gallery picker can pick external images 2022-07-04 16:42:43 +12:00
Benoit Marty aae6e20f9c Migration to activity 1.5.0. Rework menu management 2022-07-01 17:06:02 +02:00
Adam Brown 72c4af0026
Merge pull request #6263 from vector-im/feature/adm/ftue-forgot-password
[FTUE] Forgot password
2022-06-30 15:40:09 +01:00
Adam Brown c603b780cf extracting common breaker background selection to ftue extensions 2022-06-29 17:47:28 +01:00
Adam Brown d2fbe26182 removing no longer needed butterknife dependency 2022-06-29 17:22:57 +01:00
Adam Brown 33ca5753f1 replacing epoxy item annotation layout references with getDefaultLayoutId override 2022-06-29 17:21:05 +01:00
Benoit Marty 29d4916a2e
Cleanup of #5187 (#6326)
Update design and behaviour on widget permission bottom sheet
2022-06-22 15:04:02 +02:00
Jorge Martín b5aedd4626 Re-implement lock screen feature using our own implementation. 2022-06-20 17:38:05 +02:00
Jorge Martín 2fbec133b6 Address review comments, fix quality check issues. 2022-06-15 11:34:23 +02:00
Jorge Martín 155842f8bc Add some doc comments 2022-06-15 11:34:23 +02:00
Jorge Martín fa2d9e90ed Fix copyright in C++ files 2022-06-15 11:34:23 +02:00
Jorge Martín 6fc278eb2b Replace ffmpeg-kit with libopus and libopusenc. 2022-06-15 11:34:23 +02:00
Benoit Marty 990a6832bd
Merge pull request #6247 from vector-im/feature/ons/fix_static_map_copyright_size
Fix copyright attributions of map views [PSF-1058] - [PSF-1072]
2022-06-10 13:56:24 +02:00
SpiritCroc 89f129c657 Material red for warnings and errors in SC themes
Change-Id: Ic7f8550f4a15b8128b4c6c83fb9f8aa3498c915e
2022-06-07 18:28:03 +02:00
Onuray Sahin b455bf04aa Create new styles for map view copyright text. 2022-06-07 15:07:41 +03:00
ericdecanini 5cc7deea4e Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
#	vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
#	vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
#	vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
#	vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.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/RoomListSectionBuilderSpace.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
#	vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
#	vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
2022-06-03 12:06:23 +02:00
SpiritCroc 49663a1154 Merge tag 'v1.4.18' into sc
Change-Id: I58667aa99a8eb99b0b1e7f0784d811061c2086a5

Conflicts:
	dependencies.gradle
	library/attachment-viewer/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	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/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.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/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/res/xml/vector_settings_labs.xml
2022-06-01 13:54:34 +02:00
ericdecanini e6e05317e1 Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
#	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
2022-05-31 14:21:16 +02:00
Onuray Sahin 4ccd242cbf
Merge pull request #6170 from vector-im/feature/ons/live_location_bottom_sheet
Live Location Sharing - User List Bottom Sheet [PSF-890]
2022-05-30 21:07:25 +03:00
Onuray Sahin 453aa28380 Add required resources. 2022-05-27 15:25:59 +03:00
Olivér Falvai 9ce9ad6d3a Merge remote-tracking branch 'origin/develop' into dependency-cleanup 2022-05-26 14:04:39 +02:00
ericdecanini 8647400dda Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
2022-05-25 17:35:31 +02:00
Benoit Marty fd252dbaff
Merge pull request #5856 from ofalvai/bugfix/ofa/read-recept-text-scale
Use fixed text size in read receipt counter
2022-05-23 13:41:03 +02:00
ericdecanini b3fdb5ed17 Changes code style when arrow alignment 2022-05-23 12:57:57 +02:00
ericdecanini 3f3662e605 Changes code style method parameters new line around parentheses to true 2022-05-23 12:30:42 +02:00
Adam Brown 8a53eafa72 adding gradient background to the waiting for verification screen, matching designs
- renames drawable which redirects to the attribute colorBackground
2022-05-20 12:11:44 +01:00
Olivér Falvai f036d35829 Merge branch 'develop' into dependency-cleanup 2022-05-19 12:27:09 +02:00
Benoit Marty 38641c88b7 Fix usage of System.currentTimeMillis().
This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
2022-05-18 20:51:41 +02:00
Benoit Marty 12644e9915
Merge pull request #5947 from vector-im/feature/bma/renaming
Small changes
2022-05-18 16:27:48 +02:00
Maxime NATUREL 738ce18a2f
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view
[Location sharing] - Message for live sharing in timeline (PSF-884)
2022-05-18 15:39:51 +02:00
Olivér Falvai 388e35e828 Remove even more deps 2022-05-18 14:19:11 +02:00
Olivér Falvai 2dcc120cf7 Merge remote-tracking branch 'origin/develop' into dependency-cleanup
# Conflicts:
#	build.gradle
#	dependencies.gradle
2022-05-18 11:47:21 +02:00
SpiritCroc 4f60963741 Merge tag 'v1.4.16' into sc
Change-Id: Ibfb03ebf80dc1403fa438a390f609f2201602ba9

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2022-05-18 09:59:01 +02:00
Benoit Marty 57ae714cbe
Merge pull request #6072 from vector-im/feature/bma/fix_typing
Feature/bma/fix typing
2022-05-17 15:34:15 +02:00
Benoit Marty 2e189a1ab0 Fix typing rendering #6063 2022-05-17 11:53:44 +02:00
ariskotsomitopoulos 324856d700 Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
2022-05-17 11:55:07 +03:00
Benoit Marty afd2804ed3
Merge branch 'develop' into feature/mna/PSF-884-location-view 2022-05-16 14:42:38 +02:00
Benoit Marty 12eb23b198
Merge branch 'develop' into feature/bma/detekt_end_period 2022-05-16 13:14:37 +02:00
ariskotsomitopoulos 72a945ac13 PR remarks 2022-05-16 13:32:30 +03:00
Benoit Marty 90035de5f2
Merge pull request #6047 from chagai95/add-presence-indicator-busy-and-away
add presence indicator busy and away
2022-05-16 11:26:11 +02:00
Benoit Marty 4c95aafe10 Detekt: enable and fix EndOfSentenceFormat 2022-05-16 08:54:07 +02:00
chagai95 9f033ed623
add presence indicator busy and away 2022-05-13 13:55:10 +02:00
Benoit Marty c19563bed2 Detekt: fix UtilityClassWithPublicConstructor 2022-05-12 17:26:11 +02:00
ariskotsomitopoulos 40de685f1a Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
2022-05-12 14:41:38 +03:00
Benoit Marty 04cadb94cf
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
2022-05-10 18:23:51 +02:00
Benoit Marty c04655cd36 Fix warning: w: '-Xopt-in' is deprecated and will be removed in a future release, please use -opt-in instead 2022-05-09 22:08:24 +02:00
Maxime NATUREL bbec3a7c2e Integration into location message item 2022-05-09 15:15:33 +02:00
Maxime NATUREL df1ba8ec88 Custom view for the banner 2022-05-09 15:15:33 +02:00
Benoit Marty e35ee03178 Try to workaround Dependabot issue #5961 2022-05-09 11:40:53 +02:00
Marcel 3f56dad1eb
Fixed dependabot 2022-05-06 18:23:58 +02:00
SpiritCroc 4617d2d698 Merge tag 'v1.4.14' into sc
v1.4.14

Change-Id: I3667009380f1e35ce05c75c3769e62e3446212db

Conflicts:
	.editorconfig
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/receiver/BackgroundSyncStarter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
2022-05-05 17:41:26 +02:00
Benoit Marty 26edf79aa2 Fix detected issues 2022-05-05 15:04:43 +02:00
ariskotsomitopoulos c5fc1e579d Add badge in thread list filtering 2022-05-04 19:24:31 +03:00
ariskotsomitopoulos 4b746ee345 Reduce thread list menu icon size 2022-05-04 13:55:53 +03:00
Olivér Falvai 042ec3628f Extract text size to style 2022-04-28 19:02:48 +02:00
SpiritCroc d44cb85dc7 Merge tag 'v1.4.12' into sc
Change-Id: I499d1a654345d59b01881da90e8f5b529ef4dfd2

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	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/room/detail/RoomDetailViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/res/layout/item_space_beta_header.xml
2022-04-24 11:15:52 +02:00
SpiritCroc 51aec8551b Use Schildi-blue for notifications, unread marker, links
Change-Id: I84eff79001020ceba6c4eb42e36093d25b09330c
2022-04-24 10:46:45 +02:00
Eric Decanini c21ec983e8
Merge pull request #5805 from vector-im/task/eric/format-project
Formats project with new code style
2022-04-21 12:43:28 +02:00
Eric Decanini aebdee1070
Merge pull request #5652 from vector-im/bugfix/eric/sending-images-crashes
Potentially fixes intermittent crashing from sending gallery images
2022-04-21 11:54:59 +02:00
ericdecanini de899bbb18 Formats entire project 2022-04-21 11:50:15 +02:00
ericdecanini 6aa0be22c9 Makes MediaType internal 2022-04-21 10:42:08 +02:00
ericdecanini 0556a3d088 Makes MediaFileUtils function internal 2022-04-19 13:31:37 +02:00
Olivér Falvai 2bbecd4cc5 Fix regressions 2022-04-17 11:35:30 +02:00
Olivér Falvai 2c84f234a6 Cleanup 2022-04-17 11:09:10 +02:00
Olivér Falvai 4305b21ba8 Remove unused resource to make lint happy 2022-04-16 20:36:43 +02:00
Olivér Falvai 2138ec0799 Remove unused resource to make lint happy 2022-04-16 11:14:04 +02:00
Olivér Falvai cdd7db4174 Fix unused resource references properly 2022-04-16 09:40:15 +02:00
Olivér Falvai b3cfc88773 Fix androidTest 2022-04-15 23:36:42 +02:00
Olivér Falvai a8bbf29b42 Remove unused dependencies 2022-04-15 22:50:54 +02:00
ericdecanini b76ec78c5d Fixes build error in CameraVideoPicker 2022-04-14 11:46:59 +02:00
ericdecanini da843443ef Convert MediaFileUtils to a non-object 2022-04-14 11:28:14 +02:00
Adam Brown 1f6068976d updating terms ids and applying design specified colours to the checkbox 2022-04-13 14:50:11 +01:00
ericdecanini 8b66034af5 Adds mkdirs fix to CameraPicker and CameraVideoPicker 2022-04-13 15:16:34 +02:00
Benoit Marty 23d2a290ab Global import optimization 2022-04-12 16:06:27 +02:00
SpiritCroc 7c35f5fda5 Merge tag 'v1.4.11' into sc
Change-Id: I454f1ec4f1df6366065d5690d9704eb1bd573c2d

Conflicts:
	dependencies_groups.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/assets/open_source_licenses.html
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/res/menu/menu_timeline.xml
2022-04-12 11:57:16 +02:00
Benoit Marty fac317d122
Merge pull request #5647 from vector-im/feature/aris/threads_beta_feedback
Feature/aris/threads beta feedback
2022-04-05 17:25:29 +02:00
Benoit Marty ca418afcbb
Merge pull request #5614 from vector-im/feature/aris/threads_ui_enhancements
Feature/aris/threads UI enhancements
2022-04-05 17:21:53 +02:00
Maxime NATUREL bebe819c54
Merge pull request #5671 from vector-im/feature/mna/PSF-673-live-loc-share-duration
#5667: [Location Sharing] - Set duration of live sharing
2022-04-05 16:13:26 +02:00
ariskotsomitopoulos 6e06aed627 Merge branch 'develop' into feature/aris/threads_ui_enhancements
# Conflicts:
#	vector/src/main/res/menu/menu_timeline.xml
2022-04-05 16:32:49 +03:00
Adam Brown 7e5c3df7a7 adding combined server selection/sign up fragment 2022-03-31 17:50:20 +01:00
Maxime NATUREL 265dd4a0c3 Using resource dimensions for margins 2022-03-31 14:44:40 +02:00
SpiritCroc 128b532b51 [merge] Fix presence indicator color for SC default accent
Change-Id: I484051c41f59f4d613849ae45592b6201b151f38
2022-03-31 08:09:33 +02:00
SpiritCroc cb3658859e Improve unread line color on light theme
Change-Id: I3b4c54354555433fd9b3e6a53ff8440c8c05f359
2022-03-30 16:40:41 +02:00
SpiritCroc d5d555d07f Merge tag 'v1.4.8' into merge-v1.4.8
Change-Id: Ic6338fef4f27ca95016eb11ab07a10d3f3a8986e

Conflicts:
	library/ui-styles/src/main/res/values/dimens.xml
	library/ui-styles/src/main/res/values/styles_buttons.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.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/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.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/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
	vector/src/main/res/drawable/ic_home_bottom_catchup.xml
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml
	vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
	vector/src/main/res/layout/fragment_ftue_account_created.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
	vector/src/main/res/layout/view_attachment_type_selector.xml
	vector/src/main/res/layout/view_room_detail_toolbar.xml
	vector/src/main/res/menu/menu_submit.xml
2022-03-30 15:53:51 +02:00
ariskotsomitopoulos 58cc3931b9 Add beta feedback for threads 2022-03-28 13:53:44 +03:00
Onuray Sahin c478503c13 Merge branch 'develop' into feature/ons/voice_message_scrubbing
* develop: (429 commits)
  fixing the onboarding sanity test failing - adds tapping the new take me home button within the sanity test
  Fix lint issues on weblate sync
  fixing view model tests not collecting flow results - the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
  Do not suggest collapse if there is only one section
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  runBlocking -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  runBlockingTest -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  Small cleanup
  The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
  Also upgrade the coroutine lib
  Fix compilation warning (exhaustive when)
  Fix compilation warning (exhaustive when)
  Format file (no other change)
  Fix compilation warning (exhaustive when)
  Bump moshi from 1.12.0 to 1.13.0
  Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
  fixing presence icon anchoring to the middle of the room icon - creates a secondary verification shield and aligns to the start of the room title when presence is present
  PR remarks
  Increase the thread summaries limit
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
2022-03-23 13:32:36 +03:00
Benoit Marty ed62a2f1c9 Format file (no other change) 2022-03-22 16:13:06 +01:00
Benoit Marty f07c9bf105 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
ariskotsomitopoulos 3c6dbd0843 Reduce timeline menu thread icon padding 2022-03-22 12:55:50 +02:00
dependabot[bot] c2e3c63100
Bump json from 20211205 to 20220320
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20211205 to 20220320.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-21 23:09:06 +00:00
Benoit Marty 579e6164d6
Merge pull request #5550 from vector-im/feature/adm/presence-theme-patch
Presence indicator theme attribute
2022-03-21 15:45:36 +01:00
Maxime Naturel 840a224c9f Fixing coding style issue 2022-03-18 15:01:44 +01:00
SpiritCroc 6b060bf1bb Increase toolbar subtitle text size a little
Change-Id: I3990d59a431fb3b35520a8862e0ff911f6cb4011
2022-03-16 15:58:54 +01:00
Adam Brown 4a7646a7ba providing online indicator color from the colors file instead of the element palette 2022-03-15 17:59:37 +00:00
Adam Brown c257488ca8
Merge pull request #5513 from chagai95/add-presence-indicator-online
add  presence indicator online
2022-03-15 17:58:02 +00:00
Maxime Naturel b72c87da44 Renaming "btn" into "button" 2022-03-15 17:09:31 +01:00
Maxime Naturel 01aff36597 Using style attibute for locate button visibility 2022-03-15 17:09:30 +01:00
Maxime Naturel 40e92842ea Show icon to reset map to user location 2022-03-15 17:09:30 +01:00