214867ad0e
Merge pull request #7248 from vector-im/feature/bca/hotfix_1.5.1_merge
...
Feature/bca/hotfix 1.5.1 merge back from main
2022-09-29 11:58:36 +02:00
ce86e29122
Merge branch 'main' into develop
2022-09-28 18:16:39 +02:00
5c442296ef
Security fix CVE-2022-39246 CVE-2022-39248
2022-09-28 16:26:47 +02:00
87eaf85224
Security patch v1.5.1
...
Conflicts:
library/ui-styles/src/main/res/values/colors.xml
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
Change-Id: I0c8f5e098f92d0bf42e5ddc41bb6ad43c69bfdd2
2022-09-28 10:41:00 +02:00
b2b3ee1fe5
Adding button to trigger sign out
2022-09-27 15:04:33 +02:00
2c1eef7a59
Merge pull request #7142 from vector-im/feature/adm/dialpad-lib
...
Manually including `im.dlg:android-dialer:1.2.5`
2022-09-26 10:14:56 +01:00
f0fe636654
Fix file name for styles of session warning info view
2022-09-26 09:46:58 +02:00
5de097e251
Adding warning info view
2022-09-26 09:46:58 +02:00
bb6595110b
Merge tag 'v1.5.0' into merge-v1.5.0
...
Change-Id: Ifaa56941340ac1774d8b7bd470e32c5203d15f69
Conflicts:
library/ui-styles/src/main/res/values/colors.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt
vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
vector/build.gradle
vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteEmojiDataItem.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/home/room/list/home/HomeRoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/res/menu/menu_new_home.xml
vector/src/main/res/xml/vector_settings_labs.xml
2022-09-23 16:28:00 +02:00
1ff4a5f212
Ignore `AlwaysShowAction` lint issue. Also make it an error, so that developer has to explicitly disable the warning.
2022-09-22 16:32:14 +02:00
739a513f89
moving external library modules to an external directory
2022-09-16 15:15:32 +01:00
5058f942af
manually including the im.dlg:android-dialer:1.2.5
...
- avoids using appcompat
- avoids using an artifact without a source repository
2022-09-16 15:15:32 +01:00
61f5f81305
Merge branch 'develop' into feature/ons/device_manager_filter
...
# Conflicts:
# library/ui-strings/src/main/res/values/strings.xml
# vector/src/main/AndroidManifest.xml
# vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
# vector/src/main/res/layout/fragment_settings_devices.xml
2022-09-16 15:25:09 +03:00
e30721abbe
Add navigation bar divider to SC light themes
...
Change-Id: I805df24889e2509a4dc6d8cde8b5711c137c4724
2022-09-14 15:39:28 +02:00
b777c4bf03
Use light navigation bar in light SC themes
...
New app layout currently enforces this, so unbreak it there
Change-Id: I8885c18d839d715b4308a4abd9634a1130da13e2
2022-09-14 11:28:16 +02:00
6e32e0f90f
Fix some theming for Element's new layout
...
Change-Id: I9027d81a31f2a6a5393936ecf506099d38735b27
2022-09-14 10:37:56 +02:00
a661f9c3fb
Navigation from session overview to session details
2022-09-14 10:31:21 +02:00
bc1f3cb24d
Merge tag 'v1.4.36' into merge-v1.4.36
...
Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5
Conflicts:
library/ui-strings/src/main/res/values-bg/strings_sc.xml
library/ui-strings/src/main/res/values-cs/strings_sc.xml
library/ui-strings/src/main/res/values-de/strings_sc.xml
library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml
library/ui-strings/src/main/res/values-es/strings_sc.xml
library/ui-strings/src/main/res/values-et/strings_sc.xml
library/ui-strings/src/main/res/values-eu/strings_sc.xml
library/ui-strings/src/main/res/values-fa/strings_sc.xml
library/ui-strings/src/main/res/values-fr/strings_sc.xml
library/ui-strings/src/main/res/values-hu/strings_sc.xml
library/ui-strings/src/main/res/values-it/strings_sc.xml
library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml
library/ui-strings/src/main/res/values-nl/strings_sc.xml
library/ui-strings/src/main/res/values-pl/strings_sc.xml
library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml
library/ui-strings/src/main/res/values-ro/strings_sc.xml
library/ui-strings/src/main/res/values-ru/strings_sc.xml
library/ui-strings/src/main/res/values-sk/strings_sc.xml
library/ui-strings/src/main/res/values-sv/strings_sc.xml
library/ui-strings/src/main/res/values-tr/strings_sc.xml
library/ui-strings/src/main/res/values-vi/strings_sc.xml
library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml
library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml
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/sync/SyncResponseHandler.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml
vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png
vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png
vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png
vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png
vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png
vector/build.gradle
vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/MessageImageVideoItem.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/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.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/VectorSettingsAdvancedSettingsFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.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/spaces/SubSpaceSummaryItem.kt
vector/src/main/res/xml/vector_settings_labs.xml
vector/src/main/res/xml/vector_settings_preferences.xml
2022-09-10 15:24:40 +02:00
41ca662dcc
Update device list according to the filter type.
2022-09-08 18:28:17 +03:00
6e9b2baf6f
Rendering inactive status in SessionInfoView
2022-09-07 09:32:48 +02:00
969663786b
Renaming header list view to be consistent
2022-09-07 09:32:09 +02:00
7cc7444bd5
applayout release experience ( #7003 )
2022-09-06 11:32:11 +02:00
e6c9409156
Create generic security recommendations view.
2022-09-02 14:28:01 +02:00
7e8bbda856
Create security recommendations view layout.
2022-09-02 14:28:01 +02:00
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
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
e0e21d4282
filtered room list at home ( #6724 )
2022-08-11 16:26:24 +02:00
8f218ce773
Custom header view without "Learn more"
2022-08-11 12:11:14 +02:00
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
1bf36dce92
Merge remote-tracking branch 'origin/develop' into feature/eric/new_fab
2022-08-05 17:11:00 +02:00
6972622bc6
Handling map loading error in timeline
2022-08-04 16:58:28 +02:00
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
c616229d53
Missing renaming of stylable file
2022-08-02 09:09:19 +02:00
be696f5a5c
Align naming of components for the live location feature
2022-08-02 09:09:19 +02:00
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
d49f104332
Adds fab buttons
2022-07-28 15:09:57 +02:00
7334d909d5
Adds options menu
2022-07-26 16:00:46 +02:00
5958559186
Styles collapsed title text
2022-07-26 14:31:02 +02:00
3df337fa07
Adds new layout toolbar
2022-07-26 12:38:29 +02:00
e1ea10e0a2
Adding attribute to set the start margin of icon
2022-07-25 14:17:07 +02:00
5e59eb474a
Adding attribute to control alpha of the banner background
2022-07-25 10:36:28 +02:00
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
79762d9133
font scale setting screen ( #6453 )
2022-07-18 09:49:57 +02:00
cda100e596
Using same string key for stop + fix insets in button styles
2022-07-18 09:43:33 +02:00
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
9ef870b927
[merge] Live location theming
...
Change-Id: Ia10af41b946cb5913ce6805095354d23ac3ca251
2022-07-09 21:20:25 +02:00
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
aae6e20f9c
Migration to activity 1.5.0. Rework menu management
2022-07-01 17:06:02 +02:00
c603b780cf
extracting common breaker background selection to ftue extensions
2022-06-29 17:47:28 +01:00
29d4916a2e
Cleanup of #5187 ( #6326 )
...
Update design and behaviour on widget permission bottom sheet
2022-06-22 15:04:02 +02:00
b5aedd4626
Re-implement lock screen feature using our own implementation.
2022-06-20 17:38:05 +02:00
89f129c657
Material red for warnings and errors in SC themes
...
Change-Id: Ic7f8550f4a15b8128b4c6c83fb9f8aa3498c915e
2022-06-07 18:28:03 +02:00
b455bf04aa
Create new styles for map view copyright text.
2022-06-07 15:07:41 +03:00
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
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
453aa28380
Add required resources.
2022-05-27 15:25:59 +03:00
9ce9ad6d3a
Merge remote-tracking branch 'origin/develop' into dependency-cleanup
2022-05-26 14:04:39 +02:00
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
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
f036d35829
Merge branch 'develop' into dependency-cleanup
2022-05-19 12:27:09 +02:00
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
2dcc120cf7
Merge remote-tracking branch 'origin/develop' into dependency-cleanup
...
# Conflicts:
# build.gradle
# dependencies.gradle
2022-05-18 11:47:21 +02:00
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
57ae714cbe
Merge pull request #6072 from vector-im/feature/bma/fix_typing
...
Feature/bma/fix typing
2022-05-17 15:34:15 +02:00
2e189a1ab0
Fix typing rendering #6063
2022-05-17 11:53:44 +02:00
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
afd2804ed3
Merge branch 'develop' into feature/mna/PSF-884-location-view
2022-05-16 14:42:38 +02:00
72a945ac13
PR remarks
2022-05-16 13:32:30 +03:00
9f033ed623
add presence indicator busy and away
2022-05-13 13:55:10 +02:00
bbec3a7c2e
Integration into location message item
2022-05-09 15:15:33 +02:00
df1ba8ec88
Custom view for the banner
2022-05-09 15:15:33 +02:00
c5fc1e579d
Add badge in thread list filtering
2022-05-04 19:24:31 +03:00
4b746ee345
Reduce thread list menu icon size
2022-05-04 13:55:53 +03:00
042ec3628f
Extract text size to style
2022-04-28 19:02:48 +02:00
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
51aec8551b
Use Schildi-blue for notifications, unread marker, links
...
Change-Id: I84eff79001020ceba6c4eb42e36093d25b09330c
2022-04-24 10:46:45 +02:00
2bbecd4cc5
Fix regressions
2022-04-17 11:35:30 +02:00
4305b21ba8
Remove unused resource to make lint happy
2022-04-16 20:36:43 +02:00
2138ec0799
Remove unused resource to make lint happy
2022-04-16 11:14:04 +02:00
cdd7db4174
Fix unused resource references properly
2022-04-16 09:40:15 +02:00
a8bbf29b42
Remove unused dependencies
2022-04-15 22:50:54 +02:00
1f6068976d
updating terms ids and applying design specified colours to the checkbox
2022-04-13 14:50:11 +01:00
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
3267a0410a
fix: tweak styling of message bubbles
...
* Decreases the size of rounded corners
* Increases the maximum width of message bubbles to help avoid unnecessary unused space on screen
Signed-off-by: Danny Seymour <danny@seymour.family>
2022-04-07 02:36:07 -07:00
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
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
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
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
7e5c3df7a7
adding combined server selection/sign up fragment
2022-03-31 17:50:20 +01:00
265dd4a0c3
Using resource dimensions for margins
2022-03-31 14:44:40 +02:00
128b532b51
[merge] Fix presence indicator color for SC default accent
...
Change-Id: I484051c41f59f4d613849ae45592b6201b151f38
2022-03-31 08:09:33 +02:00
cb3658859e
Improve unread line color on light theme
...
Change-Id: I3b4c54354555433fd9b3e6a53ff8440c8c05f359
2022-03-30 16:40:41 +02:00
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
58cc3931b9
Add beta feedback for threads
2022-03-28 13:53:44 +03:00
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
3c6dbd0843
Reduce timeline menu thread icon padding
2022-03-22 12:55:50 +02:00
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
840a224c9f
Fixing coding style issue
2022-03-18 15:01:44 +01:00
6b060bf1bb
Increase toolbar subtitle text size a little
...
Change-Id: I3990d59a431fb3b35520a8862e0ff911f6cb4011
2022-03-16 15:58:54 +01:00
4a7646a7ba
providing online indicator color from the colors file instead of the element palette
2022-03-15 17:59:37 +00:00
Benoit Marty
Valere
SpiritCroc
Maxime NATUREL
Adam Brown
Benoit Marty
Onuray Sahin
Onuray Sahin
Nikita Fedrunov
ericdecanini
Maxime NATUREL
Jorge Martín
Olivér Falvai
ariskotsomitopoulos
chagai95
Danny Seymour