From 188aec9fc4fbc0c3049cf2e5771c82e77a28b005 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 4 Aug 2020 17:22:05 +0200 Subject: [PATCH 01/14] Remove unused attrs --- .../res/drawable/direct_chat_circle_black.xml | 11 ----- .../res/drawable/direct_chat_circle_dark.xml | 11 ----- .../res/drawable/direct_chat_circle_light.xml | 11 ----- .../drawable/direct_chat_circle_status.xml | 11 ----- vector/src/main/res/values/attrs.xml | 37 --------------- vector/src/main/res/values/theme_black.xml | 8 ---- vector/src/main/res/values/theme_dark.xml | 47 ------------------- vector/src/main/res/values/theme_light.xml | 47 ------------------- vector/src/main/res/values/theme_status.xml | 44 ----------------- 9 files changed, 227 deletions(-) delete mode 100644 vector/src/main/res/drawable/direct_chat_circle_black.xml delete mode 100644 vector/src/main/res/drawable/direct_chat_circle_dark.xml delete mode 100644 vector/src/main/res/drawable/direct_chat_circle_light.xml delete mode 100644 vector/src/main/res/drawable/direct_chat_circle_status.xml diff --git a/vector/src/main/res/drawable/direct_chat_circle_black.xml b/vector/src/main/res/drawable/direct_chat_circle_black.xml deleted file mode 100644 index 3c45c0231f..0000000000 --- a/vector/src/main/res/drawable/direct_chat_circle_black.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/drawable/direct_chat_circle_dark.xml b/vector/src/main/res/drawable/direct_chat_circle_dark.xml deleted file mode 100644 index 1e9a4500f4..0000000000 --- a/vector/src/main/res/drawable/direct_chat_circle_dark.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/drawable/direct_chat_circle_light.xml b/vector/src/main/res/drawable/direct_chat_circle_light.xml deleted file mode 100644 index 88bb178a9b..0000000000 --- a/vector/src/main/res/drawable/direct_chat_circle_light.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/drawable/direct_chat_circle_status.xml b/vector/src/main/res/drawable/direct_chat_circle_status.xml deleted file mode 100644 index 2d527d0b4d..0000000000 --- a/vector/src/main/res/drawable/direct_chat_circle_status.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml index dd2fbfce7a..c6a81b8948 100644 --- a/vector/src/main/res/values/attrs.xml +++ b/vector/src/main/res/values/attrs.xml @@ -15,25 +15,17 @@ - - - - - - - - @@ -42,51 +34,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml index 0c78469c3d..f3844b7baa 100644 --- a/vector/src/main/res/values/theme_black.xml +++ b/vector/src/main/res/values/theme_black.xml @@ -73,16 +73,10 @@ #FF090A0C - - @color/primary_color_black - - @color/primary_color_dark_black @color/riotx_list_bottom_sheet_divider_color_black @color/riotx_header_panel_background_black - @color/list_divider_color_black - #FF4D4D4D @drawable/pill_receipt_black @@ -91,8 +85,6 @@ @color/riot_primary_background_color_black @color/riotx_bottom_nav_background_color_black @color/riotx_bottom_nav_background_border_color_black - - @drawable/direct_chat_circle_black - - - - - - - - - - + + \ No newline at end of file diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml index 64855223ee..3e3cc8bbac 100644 --- a/vector/src/main/res/values/theme_dark.xml +++ b/vector/src/main/res/values/theme_dark.xml @@ -147,13 +147,16 @@ @null - @style/Vector.TabView.Dark - @style/Vector.TabView.Dark + @style/Vector.TabView + @style/Vector.TabView @style/Vector.TabText @style/Vector.TabText + @color/tab_bar_selected_background_color_dark + @color/tab_bar_unselected_background_color_dark + @style/PreferenceThemeOverlay.v14.Material @@ -180,9 +183,4 @@ - diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml index 88510e526a..943f2dc8c2 100644 --- a/vector/src/main/res/values/theme_light.xml +++ b/vector/src/main/res/values/theme_light.xml @@ -147,13 +147,16 @@ @null - @style/Vector.TabView.Light - @style/Vector.TabView.Light + @style/Vector.TabView + @style/Vector.TabView @style/Vector.TabText @style/Vector.TabText + @color/tab_bar_selected_background_color_light + @color/tab_bar_unselected_background_color_light + @style/PreferenceThemeOverlay.v14.Material @@ -180,9 +183,4 @@ - diff --git a/vector/src/main/res/values/theme_status.xml b/vector/src/main/res/values/theme_status.xml index 97e546d239..c127baf3ca 100644 --- a/vector/src/main/res/values/theme_status.xml +++ b/vector/src/main/res/values/theme_status.xml @@ -85,14 +85,13 @@ @null - - @style/Vector.TabView.Status - @style/Vector.TabView.Status - @style/Vector.TabText @style/Vector.TabText + @color/tab_bar_selected_background_color_status + @color/tab_bar_unselected_background_color_status + @style/PreferenceThemeOverlay.v14.Material @@ -101,9 +100,4 @@ - From b833198a3a7d4964e0e65172016c0463dc7839b8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 5 Aug 2020 19:34:19 +0200 Subject: [PATCH 13/14] Rework text selector --- vector/src/main/res/color/primary_text_color_selector.xml | 5 +++++ .../src/main/res/color/primary_text_color_selector_dark.xml | 5 ----- .../src/main/res/color/primary_text_color_selector_light.xml | 5 ----- .../main/res/color/primary_text_color_selector_status.xml | 5 ----- vector/src/main/res/values/colors_riot.xml | 3 +++ vector/src/main/res/values/theme_black.xml | 1 + vector/src/main/res/values/theme_dark.xml | 3 +++ vector/src/main/res/values/theme_light.xml | 3 +++ vector/src/main/res/values/theme_status.xml | 5 ++++- 9 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 vector/src/main/res/color/primary_text_color_selector.xml delete mode 100644 vector/src/main/res/color/primary_text_color_selector_dark.xml delete mode 100644 vector/src/main/res/color/primary_text_color_selector_light.xml delete mode 100644 vector/src/main/res/color/primary_text_color_selector_status.xml diff --git a/vector/src/main/res/color/primary_text_color_selector.xml b/vector/src/main/res/color/primary_text_color_selector.xml new file mode 100644 index 0000000000..3ad723c976 --- /dev/null +++ b/vector/src/main/res/color/primary_text_color_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/vector/src/main/res/color/primary_text_color_selector_dark.xml b/vector/src/main/res/color/primary_text_color_selector_dark.xml deleted file mode 100644 index 7c4c853b58..0000000000 --- a/vector/src/main/res/color/primary_text_color_selector_dark.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/vector/src/main/res/color/primary_text_color_selector_light.xml b/vector/src/main/res/color/primary_text_color_selector_light.xml deleted file mode 100644 index 8d4c0d06c4..0000000000 --- a/vector/src/main/res/color/primary_text_color_selector_light.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/vector/src/main/res/color/primary_text_color_selector_status.xml b/vector/src/main/res/color/primary_text_color_selector_status.xml deleted file mode 100644 index 9bbc84c321..0000000000 --- a/vector/src/main/res/color/primary_text_color_selector_status.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/vector/src/main/res/values/colors_riot.xml b/vector/src/main/res/values/colors_riot.xml index a606f880a1..5b85b71dd5 100644 --- a/vector/src/main/res/values/colors_riot.xml +++ b/vector/src/main/res/values/colors_riot.xml @@ -71,6 +71,9 @@ #CCDDDDDD + + + #FF2E2F32 #FF9E9E9E diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml index 1decca7f9d..b39ef440c3 100644 --- a/vector/src/main/res/values/theme_black.xml +++ b/vector/src/main/res/values/theme_black.xml @@ -80,6 +80,7 @@ @color/riot_primary_background_color_black @color/riotx_bottom_nav_background_color_black @color/riotx_bottom_nav_background_border_color_black +