SpiritCroc
|
89ef62e1d5
|
Fix compile after v1.1.10 merge
Change-Id: I2c5395044d0a3d1cd8005c1f2f8fface38b45c22
|
2021-06-24 10:19:02 +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
|
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 |
|