David Langley
1d767d6e3f
Fix keyword style, preference persistence and add comment to keyword ruleid
2021-08-25 17:38:12 +01:00
David Langley
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
SpiritCroc
1f64afd6bc
Fix crash for SC dark theme when trying to remove rooms from spaces
...
Change-Id: I835bc1e1f3ba96ebb8e5d39af2cbb722b821b609
2021-08-22 11:20:31 +02:00
SpiritCroc
b8b4ddf0d1
Fix light/dark confusion
...
Change-Id: I3f7a5df9cc202094d5b307dee0b1f99427c7a09e
2021-08-22 11:20:08 +02:00
SpiritCroc
387459ae6b
Fix material alert dialog brightening up the desired background color
...
Change-Id: I0b805d1605d80765631fdf093ed645b5be35c57b
2021-08-18 12:07:44 +02:00
ganfra
bcc9a75bdb
Merge branch 'develop' into feature/fga/new_voip_design
2021-08-11 12:37:54 +02:00
SpiritCroc
1590740981
Properly theme verification request popup background
...
Change-Id: Ia613b9cb6efe41a54cb9ec049828aac27f0968c7
2021-08-10 10:09:40 +02:00
David Langley
8d7e3b6544
add keyword checkbox preference and chip/edit text for modificying keywords
2021-08-03 09:52:36 +01:00
SpiritCroc
6399e71e25
[merge-features] Fix and properly style voice message recording for SC
...
Change-Id: Iba97f334b07e0fa1f4a4cc8fc92c97e53d919dd4
2021-08-01 11:42:17 +02:00
SpiritCroc
3959a838d1
[merge-features] Fix voice messsage bubble layout + SC themes
...
Change-Id: Idd2dddc8c8f6333ca90fa5411c69e084e3a4cdcf
2021-08-01 10:31:17 +02:00
SpiritCroc
25ba52115b
Merge tag 'v1.1.15' into sc
...
Change-Id: I6bc7a7c052ccaae6adec247889b37baac2672ba4
Conflicts:
vector/src/main/assets/open_source_licenses.html
vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
vector/src/main/res/drawable/ic_insert_emoji.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/fragment_room_detail.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/xml/vector_settings_labs.xml
2021-08-01 09:37:33 +02:00
Onuray Sahin
c6bd6e4961
Merge pull request #3598 from vector-im/feature/ons/voice_message
...
Voice Message
2021-07-30 17:24:17 +03:00
Onuray Sahin
4c8a8d8cfb
Design review fixes.
2021-07-27 15:32:35 +03:00
SpiritCroc
abccf99f55
Theme color of quotation bar
...
Change-Id: Ia9d9c34c1bb276fea42b00131ea1915f93f23263
2021-07-25 10:34:27 +02:00
SpiritCroc
3e95246908
Update light bottomsheet dialog style
...
Change-Id: Ic36059e93146eff2031dbd626cbe14f1ccfdf493
2021-07-25 10:18:16 +02:00
SpiritCroc
e785bcc1f1
Tweak accents
...
Change-Id: I3ccb799dd430c56fd4d27ef307618e255773d5fa
2021-07-25 10:02:53 +02:00
SpiritCroc
ac4fe57995
Add some more accents
...
Imported from AICP
Change-Id: Icce1c1d602bdf8a9d762448801df5cf57b221e60
2021-07-24 17:57:41 +02:00
SpiritCroc
d54a9302fc
Accent color theming
...
Change-Id: I31b19858d0e01e1427df91750875bc470e741bcd
2021-07-24 17:42:05 +02:00
SpiritCroc
acb12c2005
Merge tag 'v1.1.14' into sc
...
Change-Id: I7668fc7603c8f6e7aafa89886bb0fdf586e4a871
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.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/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
2021-07-24 10:12:48 +02:00
ganfra
4788630949
Merge branch 'develop' into feature/fga/new_voip_design
2021-07-23 12:17:05 +02:00
dependabot[bot]
a75ceee03f
Bump appcompat from 1.3.0 to 1.3.1
...
Bumps appcompat from 1.3.0 to 1.3.1.
---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-22 12:13:24 +00:00
SpiritCroc
8d0c133dde
Theme code backgrounds in markdown
...
Change-Id: Ia37dc51961e990e5b7a2c9c6890da01bcf076dd6
2021-07-21 13:02:20 +02:00
SpiritCroc
8497a307a1
Merge tag 'v1.1.13' into sc
...
Change-Id: Icc97ef8699b1cc96447369121f3c88582ac651bc
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.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/filtered/FilteredRoomFooterItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
2021-07-19 16:10:57 +02:00
Benoit Marty
6caa2b9ae0
Fix issue with RTL
...
Still a pb when Mic is on, margins are not correct
2021-07-16 17:12:08 +02:00
Benoit Marty
95bb796bad
Fix color
2021-07-13 17:19:11 +02:00
Benoit Marty
9e0f3a1517
Fix other color issue
2021-07-13 16:17:22 +02:00
Benoit Marty
cf4e603f09
Fix background color of voice message recorder
2021-07-13 16:14:02 +02:00
Benoit Marty
6530440069
Fix an issue in the color
2021-07-13 16:12:54 +02:00
Benoit Marty
14dbbee1e3
Fix background color of voice message item
2021-07-13 16:10:51 +02:00
Benoit Marty
4c5be39f46
Fix background color of Play/Pause button
2021-07-13 16:08:54 +02:00
SpiritCroc
15249ebe1b
Some RTL/LTR mixture alignment improvements
...
Change-Id: I2174b75f378cd09290d9d32bd39ebf15e577ab23
2021-07-11 12:24:29 +02:00
Benoit Marty
e391a1371c
Merge branch 'develop' into feature/ons/voice_message
2021-07-09 22:19:50 +02:00
Benoit Marty
2c1335a2f5
Theme for Toast
2021-07-09 21:06:13 +02:00
Benoit Marty
7a1c6b78d4
Move the style to the layout, for code clarity. Style are not reused, and it's better to have layout attr in the layout itself
2021-07-09 17:49:27 +02:00
Benoit Marty
558cd6f376
Cleanup
2021-07-09 17:18:56 +02:00
SpiritCroc
7d377ea418
Change power level username colors
...
Change-Id: If49dbc83268f04bba923838eda1fb7aa461c23cd
2021-07-08 20:11:45 +02:00
Onuray Sahin
7a1b138894
Merge branch 'develop' into feature/ons/voice_message
...
* develop: (286 commits)
Fix crash after video call
Fix issue on button styles
Clean after benoits review
Fix warning about implicit type, introduced in Kotlin 1.5.20. "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
Bump kotlin_version from 1.5.10 to 1.5.20
Bump libphonenumber from 8.12.25 to 8.12.26
Fix call invite processed after call is ended because of fastlane mode.
Jump to unread: removes unnecessary check which can cause scroll issue
Jump to unread: avoid blink when jumping
Clean after Benoits review
Delete unused drawable to avoid conflict on develop
Jump to unread: add towncrier file.
Read marker: fix some issues with jump to unread visibility.
Stop using ProgressDialog, there is a theme issue with it. It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
Reordering
Add text style for dialogs
Colored dialog button is now handled by the theme
Update theme for material dialog and create a destructive variant
Reorder buttons
Update doc
...
# Conflicts:
# library/ui-styles/src/main/res/values/theme_dark.xml
# library/ui-styles/src/main/res/values/theme_light.xml
# vector/build.gradle
# 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/TextComposerView.kt
# vector/src/main/res/values/strings.xml
2021-07-06 13:17:49 +03:00
SpiritCroc
566feaecc1
Make jump to unread better visible for SC dark theme
...
Change-Id: I9c95ab4348f4b4c2c77056b81a0e3de585d56cb0
2021-07-06 10:14:47 +02:00
ganfra
cdf97fc29f
Merge branch 'develop' into feature/fga/new_voip_design
2021-07-05 18:02:19 +02:00
SpiritCroc
0b8b9d3cad
Fix jump-to-unread style for non-Element themes
...
Change-Id: If203eb8af60542eff57269dfe318b754b1e83b10
2021-07-05 18:00:51 +02:00
SpiritCroc
37b729c1d1
Remove freshly added corner radius from Element
...
Change-Id: I966aeb01b0fdfd30f03b601beefa049d92a6b3ac
2021-07-05 16:59:52 +02:00
SpiritCroc
e5c9c33a0f
Merge tag 'v1.1.12' into sc
...
Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236
Conflicts:
library/ui-styles/src/main/res/values/text_appearances.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/home/room/detail/timeline/TimelineEventController.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/GroupRoomListSectionBuilder.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/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
vector/src/main/res/layout/dialog_export_e2e_keys.xml
vector/src/main/res/layout/dialog_import_e2e_keys.xml
2021-07-05 16:58:45 +02:00
SpiritCroc
24a61ee0ff
Display-name coloring setting
...
Based on whether a chat is
- DM
- Room
- Public room
allow to select whether to color usernames
- Uniformly (as previously done in SC themes)
- Based on Matrix ID (as previously seen in Element themes)
- Based on the user's power level in that room (new!)
The setting concerning rooms that are neither DM nor public is also used
for deciding whether to use mxid-based avatar coloring or uniform
coloring.
Change-Id: Ic68a24f4818a193f776a3b14232f887cd229929a
2021-07-04 17:01:27 +02:00
dependabot[bot]
9ff1e20f07
Bump material from 1.3.0 to 1.4.0
...
Bumps [material](https://github.com/material-components/material-components-android ) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/material-components/material-components-android/releases )
- [Commits](https://github.com/material-components/material-components-android/compare/1.3.0...1.4.0 )
---
updated-dependencies:
- dependency-name: com.google.android.material:material
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-02 23:07:53 +00:00
ganfra
f74a71001a
Change active call bar + some minor changes in call screen
2021-07-01 20:05:58 +02:00
SpiritCroc
4e9ab0c6f9
Fix message highlight color behind bubbles for SC themes
...
Change-Id: Ia115cba593c90682bbf4023d9161b1df6001f3c9
2021-06-29 16:46:23 +02:00
SpiritCroc
559016cd32
SC theme improvements after merge, pt. 3
...
Change-Id: I506d0bc3a320508268646ba86d93fb39e2ad8168
2021-06-29 15:06:45 +02:00
SpiritCroc
dab04d52fd
More SC theme improvements, including a reworked light theme
...
Change-Id: I373daedc45bee3aa9e24e09bb632b01e27754010
2021-06-28 18:28:41 +02:00
Benoit Marty
bca220f909
Fix issue on button styles
2021-06-28 17:02:06 +02:00
Benoit Marty
edd24de4c3
Merge pull request #3547 from vector-im/feature/fga/jump_to_unread_redesign
...
Jump to unread: implement new design
2021-06-28 16:45:06 +02:00
SpiritCroc
098d98926a
Fixup SchildiChat theming
...
Change-Id: I0c6f04ceb4c09be41d5879b6c6a4cee1d082c525
2021-06-27 12:01:35 +02:00
Benoit Marty
cd0c9b4e08
Merge pull request #3549 from vector-im/feature/bma/cleanup_styles
...
Fix styles issue
2021-06-25 19:11:54 +02:00
ganfra
1ba97fa9be
Clean after Benoits review
2021-06-24 17:40:45 +02:00
SpiritCroc
89ef62e1d5
Fix compile after v1.1.10 merge
...
Change-Id: I2c5395044d0a3d1cd8005c1f2f8fface38b45c22
2021-06-24 10:19:02 +02:00
Benoit Marty
885f5736c9
Stop using ProgressDialog, there is a theme issue with it.
...
It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
2021-06-23 16:46:15 +02:00
Benoit Marty
43cad8751d
Reordering
2021-06-23 16:12:38 +02:00
Benoit Marty
9ac0f6d86b
Add text style for dialogs
2021-06-23 15:38:01 +02:00
Benoit Marty
11b16ea065
Colored dialog button is now handled by the theme
2021-06-23 14:50:34 +02:00
SpiritCroc
72aa4bb999
Merge tag 'v1.1.10' into sc
...
Change-Id: I01e7b61adf9444e6894232235ee71ac8295b00ab
Conflicts:
library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
library/ui-styles/src/main/res/drawable/splash.xml
library/ui-styles/src/main/res/values/theme_light.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataTypes.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/res/drawable/ic_attachment.xml
vector/src/main/res/drawable/ic_insert_emoji.xml
vector/src/main/res/drawable/ic_keyboard.xml
vector/src/main/res/layout/composer_layout.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
vector/src/main/res/layout/fragment_home_detail.xml
vector/src/main/res/layout/fragment_login_server_url_form.xml
vector/src/main/res/layout/fragment_user_list.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_space_beta_header.xml
vector/src/main/res/layout/item_suggested_room.xml
vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/values/styles_riot.xml
2021-06-23 13:38:41 +02:00
Benoit Marty
67bdb75d80
Update theme for material dialog and create a destructive variant
2021-06-23 13:19:14 +02:00
ganfra
121fd9a19d
Jump to unread: implement new design
2021-06-22 16:29:19 +02:00
Benoit Marty
ed97cf7dac
Create dimens for text sizes
2021-06-22 14:39:24 +02:00
Benoit Marty
6289d640b4
Reveal password: use facility from com.google.android.material.textfield.TextInputLayout instead of manual handling
...
Also avoid repeating password on the change password dialog.
2021-06-22 11:31:45 +02:00
Benoit Marty
4ce71c8487
Create a style for password edit
2021-06-18 21:52:53 +02:00
Benoit Marty
9f101423e2
Add some TextViews
2021-06-18 15:08:51 +02:00
Benoit Marty
a619b0141a
Rename file
2021-06-18 15:02:18 +02:00
Benoit Marty
1ffe57ce94
Change vctr_header_background alias from vctr_content_quinary to vctr_system
2021-06-18 13:27:21 +02:00
Benoit Marty
9f96974e67
Rename some theme to follow naming convention
2021-06-18 10:25:37 +02:00
Benoit Marty
1a898f0404
Rename themes follow Android conventions
2021-06-16 12:34:14 +02:00
Benoit Marty
ece9d19d8c
Rename again the style to follow Android convention (G's review)
2021-06-16 11:59:08 +02:00
Benoit Marty
d7884fe4d2
Add doc and fix a small mistake on style
2021-06-16 10:40:22 +02:00
Benoit Marty
5e9b4e77bf
Rename a last time some style: M -> Medium
2021-06-16 09:02:03 +02:00
Benoit Marty
858bbfd8d2
Rename style to follow naming conventions
...
And move some files to the module
2021-06-15 21:37:27 +02:00
Benoit Marty
0590acd31a
Fix crash on default theme
2021-06-15 20:23:37 +02:00
Benoit Marty
a67f8ca4dc
Add some missing style. Default is not workong (?)
2021-06-15 19:00:07 +02:00
Benoit Marty
06cbbbe1e8
Fix errors
2021-06-15 18:40:58 +02:00
Benoit Marty
b3a547cd87
Move and rename some files
2021-06-15 18:36:09 +02:00
Benoit Marty
9c9d0a5d21
Add dep on ui_style to attachment viewer
2021-06-15 18:22:26 +02:00
Benoit Marty
bbbe76b91c
Move test style Activity and layout to the new ui-style module
2021-06-15 18:17:36 +02:00
Benoit Marty
000b524b34
Move style and theme to the dedicated module
2021-06-15 12:39:39 +02:00
Benoit Marty
f5f09224b1
Create module for ui-styles
2021-06-15 12:23:54 +02:00