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
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
c257488ca8
Merge pull request #5513 from chagai95/add-presence-indicator-online
...
add presence indicator online
2022-03-15 17:58:02 +00:00
b72c87da44
Renaming "btn" into "button"
2022-03-15 17:09:31 +01:00
01aff36597
Using style attibute for locate button visibility
2022-03-15 17:09:30 +01:00
40e92842ea
Show icon to reset map to user location
2022-03-15 17:09:30 +01:00
3ef2f824e8
add presence indicator online
2022-03-11 11:10:11 +01:00
26617988f2
Add colors for shield vector drawable
2022-03-10 17:15:19 +01:00
f5afdefe2f
Merge tag 'v1.4.4' into sc
...
Change-Id: Ibfb35ec30a51abebb652044719417f62c8a6be50
Conflicts:
library/ui-styles/src/main/res/values/dimens.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.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/room/detail/RoomDetailViewState.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/res/drawable/bg_unread_notification.xml
vector/src/main/res/drawable/ic_add_reaction_small.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/xml/vector_settings_preferences.xml
2022-03-10 13:26:09 +01:00
d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all
...
Remove unused resources
2022-03-10 13:03:27 +01:00
0122d8f933
Make comment about ignoring UnusedResources more valuable
2022-03-10 10:23:18 +01:00
3f17cf595f
Remove unused resources
2022-03-09 14:55:40 +01:00
89db867ab3
Fix attributes style id conflicts
2022-03-09 09:46:52 +01:00
046d906f97
Moving view attributes into uikit dedicated file
2022-03-09 09:46:52 +01:00
f4b5353424
Fix live location color on light theme
2022-03-09 09:46:52 +01:00
8bcc594320
Changing color of the live location icon
2022-03-09 09:46:47 +01:00
3bbb7167f1
Adding icon for live location
2022-03-09 09:45:00 +01:00
b867e5f072
Iterate on badge / unread indicator color ( #5332 )
2022-03-08 14:52:10 +01:00
9a02543afd
FTUE - Choose a display picture ( #5323 )
...
* adding tests around the onboarding view model
- cases for the personalisation and display name actions
* adding base choose name fragment with UI
* add click handling for the display name actions
* adding tests around the onboarding view model
- cases for the personalisation and display name actions
* adding barebones profile picture fragment with ability to select a user avatar
* extracting uri filename resolving to a class which can be injected
- includes tests
* updating upstream avatar on profile picture save and continue step
- moves the personalisation state to a dedicated model to allow for back and forth state restoration
* adding test case for skipping profile picture setting
* taking the profile loading into account when rendering the onboarding loading
* extracting method for the handling of the profile picture selection
* adding dedicated camera icon for choosing profile picture
* adding toolbar to back to profile picture page
- this toolbar will fade in with the fragment as it sits at the fragment level, probably worth revisiting once more pages have a toolbar
* changing edit/add picture icon based on if we're already selected an image
* making use of debounced clicks to avoid potential extra clicks
* making the avatar height and camera icon relative percentage based
- also makes the avatar itself clicking, including a foreground ripple
* fixing formatting
* making use of fake session id for user id assertion
* using a real matrix id syntax for the fake session user id
* removing duplicated dimens
* using self closing imageview tag
2022-03-07 14:07:22 +00:00
3156410965
Code review fixes.
2022-03-07 15:52:19 +03:00
bcdf004082
Update the top bar in a room ( #5213 )
...
Remove typing message notification from room toolbar.
Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
2022-03-04 16:38:53 +01:00
2c611790db
Merge branch 'develop' into feature/ons/voice_message_scrubbing
2022-03-04 18:03:44 +03:00
2f5df9133f
Merge tag 'v1.4.2' into sc
...
Change-Id: I8a96211645ff31284897d818ce93c7b5571fbd0f
Conflicts:
library/ui-styles/src/main/res/values/styles_timeline.xml
library/ui-styles/src/main/res/values/theme_black.xml
library/ui-styles/src/main/res/values/theme_dark.xml
library/ui-styles/src/main/res/values/theme_light.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/timeline/TimelineEventController.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/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
vector/src/main/java/im/vector/app/features/html/PillImageSpan.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/res/layout/item_room.xml
vector/src/main/res/values/config.xml
2022-03-04 11:42:30 +01:00
ab2001cd7f
Create a custom audio waveform view.
2022-03-02 17:45:27 +03:00
ecd28447c9
Merge tag 'v1.4.0' into sc
...
Change-Id: If953d524434cd8a7073a16014f4ec6850b72a226
Conflicts:
library/ui-styles/src/main/res/values/styles_timeline.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/TimelineEventController.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/AbsMessageItem.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/MessageBlockCodeItem.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/item/MessageImageVideoItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.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/RoomListDisplayModeFilter.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
vector/src/main/res/drawable/ic_filter.xml
vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
vector/src/main/res/layout/fragment_timeline.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/layout/item_timeline_event_file_stub.xml
vector/src/main/res/layout/item_timeline_event_notice_stub.xml
vector/src/main/res/layout/item_timeline_event_voice_stub.xml
vector/src/main/res/layout/view_voice_message_recorder.xml
vector/src/main/res/menu/menu_timeline.xml
2022-02-19 10:55:47 +01:00
d29fc9f2d3
Replacing vctr_unread_room_badge by vctr_content_secondary
2022-02-18 17:04:02 +01:00
37a990368c
Fixing text color of pills in light theme
2022-02-17 11:23:00 +01:00
ea13f1c879
Merge pull request #5189 from vector-im/arb/issues/4640
...
#4640 : The notification badge jumps around
2022-02-11 14:18:41 +00:00
0a52651e40
Reactions: update after remarks
2022-02-11 13:01:34 +01:00
a9a1532e01
#4640
...
- change unread counter badge view in item_room to be in consistent place on the screen, to left of date/time.
- change unread badge color state for dark and light theme to align with iOS.
- add changelog file related to the issue.
Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
2022-02-11 11:45:39 +01:00
0244fea222
Reactions: more refinements
2022-02-10 17:51:49 +01:00
911ee97122
Reactions: start handling show more, show less and add more actions in timeline.
2022-02-09 21:29:03 +01:00
04234318e5
Bubble: get LayoutDirection (RTL) from current Locale
2022-02-03 17:53:25 +01:00
2e2da16a6b
Bubbles: merge develop
2022-02-03 17:10:13 +01:00
ba86834c6b
removing forced san fontFamily, fixes other weights being ignored
2022-02-02 16:58:19 +00:00
1bf2523437
Merge branch 'develop' into feature/fga/message_bubbles
2022-02-02 13:01:43 +01:00
825c2ca989
Merge branch 'develop' into feature/fga/message_bubbles
2022-02-01 10:05:51 +01:00
d509b3324c
Merge branch 'develop' into feature/aris/threads
2022-01-31 15:58:12 +02:00
a9d5700d2b
Merge tag 'v1.3.16' into sc
...
Change-Id: I8b3937f4ac30d3e72e2cb694eee2dc5bf034cb75
Conflicts:
gradle.properties
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.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/di/NetworkModule.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/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/TokenChunkEventPersistor.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.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/composer/ComposerEditText.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.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/helper/MatrixItemColorProvider.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.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/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
vector/src/main/res/layout/activity_call.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/item_timeline_event_base.xml
vector/src/main/res/layout/view_voice_message_recorder.xml
vector/src/main/res/values/config.xml
vector/src/main/res/xml/vector_settings_labs.xml
2022-01-29 12:18:19 +01:00
2ce3894562
Create a UrlMapProvider for a better handling of RTL languages, and build the URLs in the controllers
2022-01-28 22:46:58 +01:00
c14eb050b1
Merge branch 'develop' into feature/fga/message_bubbles
2022-01-27 18:59:10 +01:00
ed9adf8367
Bubbles: fix paddings
2022-01-27 18:18:39 +01:00
b2a2fe2710
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
# tools/check/forbidden_strings_in_code.txt
# vector/build.gradle
# vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
# vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
# vector/src/main/java/im/vector/app/features/command/Command.kt
# vector/src/main/java/im/vector/app/features/command/CommandParser.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/composer/MessageComposerViewModel.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
# vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
# vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
# vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
# vector/src/main/res/layout/fragment_timeline.xml
# vector/src/main/res/xml/vector_settings_labs.xml
2022-01-27 17:11:26 +02:00
608d8a5d54
Bubbles: change colors
2022-01-24 19:31:04 +01:00
8c4dff4db9
Bubbles: change again url preview
2022-01-21 16:00:58 +01:00
f7aedff418
toolbar management ( #4887 )
...
Toolbar management rework and toolbar style alignment
2022-01-21 13:38:27 +01:00
36a26fcfd0
replacing the dark carousel background with a solid colour as par design changes
2022-01-19 10:17:04 +00:00
5ee4984ec8
Bubbles: handle images and make small refactoring
2022-01-18 19:27:12 +01:00
636474b748
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
# vector/src/main/java/im/vector/app/features/command/Command.kt
# vector/src/main/java/im/vector/app/features/command/CommandParser.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
2022-01-18 12:41:40 +02:00
7ff8483592
Merge branch 'develop' into feature/fga/message_bubbles
2022-01-17 19:19:29 +01:00
81a1dfd66d
PR Remarks
2022-01-17 17:28:40 +02:00
256929b78f
Merge pull request #4880 from vector-im/feature/adm/carousel-images-update
...
Updated splash carousel images and copy
2022-01-17 15:11:08 +00:00
f4cacb2d16
applying percentage based heights to the carousel hero image and paddings
2022-01-17 09:24:53 +00:00
c0b855e7c7
adding non light mode carousel background which uses a vertical gradient
2022-01-17 09:24:53 +00:00
1108ef9fbe
Bubbles: make it works for file, voice and polls. Also add parity for "modern" layout.
2022-01-14 19:19:23 +01:00
9a42e1e8c3
Move this class to the correct folder
2022-01-13 20:32:59 +01:00
d06df45e85
Merge branch 'develop' into feature/fga/message_bubbles
2022-01-13 13:17:23 +01:00
b9cc795996
Bubbles : fix background colors
2022-01-13 12:33:36 +01:00
ce7a93bcae
locking phones to portait during the ftue auth onboarding flow
...
- uses a resource bucket flag for determining if the device is big enough to be considered a tablet and in turn, enable a landscape experience
2022-01-11 17:28:29 +00:00
3bd21d04d8
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
# tools/check/forbidden_strings_in_code.txt
2022-01-11 14:09:49 +02:00
f7c9b36cef
Bubbles: continue exploration
2022-01-11 11:57:35 +01:00
bdb41b253d
flipping the gradient ftue background for rtl locales, fixes the gradient starting from the wrong side
2022-01-07 14:44:21 +00:00
50e51cbe29
Merge branch 'develop' into feature/aris/threads
2022-01-07 16:36:48 +02:00
ac5caccdf9
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.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/EventEntity.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/TokenChunkEventPersistor.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
# tools/check/forbidden_strings_in_code.txt
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
# vector/src/main/res/menu/menu_timeline.xml
2022-01-07 13:29:43 +02:00
785a142720
moving the carousel backgrounds to the ui-styles module
2022-01-07 11:17:39 +00:00
6929c947b0
adding gradient backgrounds to the carousel pages
...
- also coverts the carousel pages to constraint layout and makes use of gutters to provide percentage based sizing
2022-01-06 19:54:48 +00:00
a2f780bef4
adding carousel content, images are temporary
2022-01-06 19:54:48 +00:00
ad63d3de1c
Bubbles: still R&D. Not sure how to handle every event types.
2022-01-06 19:07:28 +01:00
9e9b779186
moving the debug icon to the main source set
...
- the onboarding uses the icon and it can be displayed for developer mode users
2022-01-06 10:03:13 +00:00
bde1df0322
Bubbles: continue R&D on UI
2022-01-05 11:00:12 +01:00
e540b26112
Merge develop into feature/fga/message_bubbles
2022-01-04 15:13:42 +01:00
eb875823d5
Remove unused class and resource after new poll implementation
2022-01-04 13:02:17 +01:00
694b8de034
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# library/ui-styles/src/main/res/values/dimens.xml
2022-01-03 11:08:22 +02:00
464ac3bce2
Fix blink effect when opening the attachment popup, and improve clickability of the buttons
2021-12-30 16:36:36 +01:00
acdd4e24b9
Merge tag 'v1.3.12' into sc
...
Change-Id: I66c0120371c3f52295f033ec21702c08381b5b10
Conflicts:
build.gradle
vector/build.gradle
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/helper/TimelineEventVisibilityHelper.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.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/actions/RoomListQuickActionsEpoxyController.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/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/res/drawable/highlighted_message_background.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_selection.xml
vector/src/main/res/layout/fragment_room_detail.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_expandable_textview.xml
vector/src/main/res/layout/item_login_header.xml
vector/src/main/res/layout/item_radio.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
vector/src/main/res/layout/item_timeline_event_media_message_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_timeline_event_voice_stub.xml
vector/src/main/res/layout/view_stub_room_profile_header.xml
vector/src/main/res/layout/view_url_preview.xml
vector/src/main/res/xml/vector_settings_labs.xml
vector/src/main/res/xml/vector_settings_root.xml
2021-12-23 14:36:13 +01:00
9a5934dd33
Bubbles: R&D try to find the best way to provide dynamic layout
2021-12-16 20:57:05 +01:00
cd95fc41e4
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# library/ui-styles/src/main/res/values/dimens.xml
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.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/EventEntity.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
# vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
# vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
# vector/src/main/java/im/vector/app/features/command/Command.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.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/composer/MessageComposerViewEvents.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.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/factory/MessageItemFactory.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/notifications/NotificationUtils.kt
# vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
# vector/src/main/res/layout/fragment_room_detail.xml
2021-12-14 20:18:54 +02:00
a40e60ba8f
Merge branch 'develop' into feature/bma/posthog
2021-12-13 23:18:14 +01:00
e519e314fe
Limit width of content on tablets
2021-12-13 23:16:47 +01:00
004a51646b
Fix some more reaction colors on dark theme
...
Follow-up to 6048e1266984: Fix reaction color for non-emojis on dark theme
Hardcoding it to black is bad for dark themes. It was probably done
because the default color would make emojis look pale due to
transparency. If we use a primary text color which hopefully does not
feature transparency (it does not for SC themes, at least), everything
looks fine.
Change-Id: Icbc3b37f5535b98684c2225c0973a152e88d6b31
2021-12-13 09:15:37 +01:00
51756a9795
Message bubble as xml, and outlined bubble for notices
...
Change-Id: Ieb16e917456e2b8dd4fea9de8b88684be0c8bff4
2021-12-11 16:58:23 +01:00
0150d830d4
flattening preview url view layout with custom view to reduce view hierarchy
2021-12-07 11:32:50 +00:00
4b63a9f939
Merge tag 'v1.3.9' into sc
...
Change-Id: I26834af19e0b02887f288b6441ced6d993cb8861
Conflicts:
vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt
vector/src/main/java/im/vector/app/VectorApplication.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
vector/src/main/res/drawable/ic_shield_custom.xml
vector/src/main/res/drawable/ic_shield_trusted.xml
2021-12-05 13:46:55 +01:00
d1bb96cec0
Threads notification badge UI
2021-12-03 11:30:30 +00:00
6cb8a2458f
Remove extra new lines in XML
2021-12-01 23:06:49 +01:00
6d3df0d802
Use `@id` and not `@+id` when referencing ids in layouts - ConstraintLayout
2021-12-01 22:13:21 +01:00
e15c84129c
Use same values than for light theme, for a better rendering
...
See https://github.com/vector-im/element-android/issues/4285#issuecomment-974270998
2021-11-22 10:20:01 +01:00
c03c6867f7
Merge branch 'merge-v1.3.8' into sc
...
Change-Id: If000613462f3cd3b73c8de24f456dccc16fcde38
Conflicts:
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
2021-11-17 20:26:27 +01:00
d9a5991559
Merge tag 'v1.3.8' into HEAD
...
Change-Id: If3e3927755638ee38d8817f8504f09b0df14f309
Conflicts:
dependencies.gradle
vector/src/fdroid/AndroidManifest.xml
vector/src/gplay/AndroidManifest.xml
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
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/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
2021-11-17 20:17:45 +01:00
03b96a8a42
Update padding ( #4285 )
2021-11-16 16:33:28 +01:00
27d6e271ad
Add a debug layout to see social login buttons
...
For AS preview only
2021-11-16 16:33:04 +01:00
6f13fb1634
Create file for Toast style (more generic)
...
And improve fragment_create_poll.xml preview rendering
2021-11-15 14:23:32 +01:00
223b33fa65
Create CallToAction button style
2021-11-15 14:16:22 +01:00
2aab94acb4
Create dedicated file for TextInputLayout styles
...
And follow naming convention
2021-11-15 14:11:15 +01:00
6bca1bf18b
Change presence color to green for some accents
...
Closes https://github.com/SchildiChat/SchildiChat-android/issues/97
Change-Id: I31095c9677a5c00162d8cb2416a12c31ad77f372
2021-11-12 12:16:47 +01:00
a10253c003
Design review fixes.
2021-11-08 17:26:01 +03:00
c8d9e69c40
Fix presence theming
...
Change-Id: Ief37c2a6c3d1ed7270ec0a69da122b56614a2adf
2021-10-22 09:18:59 +02:00
978056e01f
Merge tag 'v1.3.4' into sc
...
Conflicts:
dependencies.gradle
gradle.properties
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/sync/parsing/RoomSyncAccountDataHandler.kt
vector/build.gradle
vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.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/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.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/SpaceListViewState.kt
Parts of conflict resolution taken from
commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
Merge: 06f52832b 1f74bc986
2021-10-21 17:31:11 +02:00
9ab59a543d
* Implement Presence Service:
...
- Get Presence Status
- Set Presence Status
* Integrate presence in room details screen
* Integrate presence in room people's view
* Update UI to support presence
* Fix bug when insertOrUpdate was called on RoomMemberEventHandler and override the correct presence value in RoomMemberSummaryEntity
* Improve performance on updateUserPresence in RoomMemberSummaryEntity entity
* Remarks & linter fixes
* Disable presence when there is no m.presence events. In some servers like matrix.org is disabled atm.
* Enhance UI Presence on DM room lists to support dark/light theme
* Restore missing lines in gradle.properties to speed up debugging
2021-10-06 18:00:02 +03:00
4f93eb041c
Merge tag 'v1.3.0' into sc
...
Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68
Conflicts:
gradle.properties
vector/build.gradle
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/pushers/VectorMessagingReceiver.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/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
vector/src/main/res/layout/reaction_button.xml
2021-09-29 09:55:02 +02:00
932a43ef58
Add subspace action
2021-09-17 09:22:10 +02:00
d87c03c505
Theme mxid-based username colors
...
TODO for follow-up commit: same for mxid-based room colors (maybe with
an extra setting?)
Change-Id: I827bd967e615f20e12f205c0ae5b24a777e90d45
2021-09-16 09:04:13 +02:00
1b8874e8cb
Expose and theme some upstream colors concerning video conferences
...
Change-Id: I8ed960c119c2b87a9e8af0bce60bbf60034f5a61
2021-09-10 12:26:56 +02:00
133579d066
Merge tag 'v1.2.1' into sc
...
Change-Id: I7446b0a3b8f2bbeee76e337e78eb722cbd05ef2a
Conflicts:
build.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.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/list/actions/RoomListQuickActionsEpoxyController.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
2021-09-09 10:51:12 +02:00
b985092613
Fix lint issues
2021-09-02 10:36:29 +02:00
5b2478a34f
Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings
...
Feature/dla/keyword notification settings
2021-08-27 18:19:17 +02:00
4518962658
New voip design: clean after benoit review
2021-08-26 11:08:34 +02:00
1d767d6e3f
Fix keyword style, preference persistence and add comment to keyword ruleid
2021-08-25 17:38:12 +01:00
238f772461
Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings
2021-08-24 15:51:23 +01:00
Olivér Falvai
Benoit Marty
Adam Brown
Maxime NATUREL
SpiritCroc
Benoit Marty
ariskotsomitopoulos
chagai95
Maxime NATUREL
Danny Seymour
Onuray Sahin
cfriedlander
Onuray Sahin
Ahmed Radhouane Belkilani
ganfra
Ahmed Radhouane Belkilani
fedrunov
Valere
David Langley