diff --git a/vector/src/main/res/drawable/vector_tabbar_background.xml b/vector/src/main/res/drawable/vector_tabbar_background.xml new file mode 100644 index 0000000000..a1e1e7ae1f --- /dev/null +++ b/vector/src/main/res/drawable/vector_tabbar_background.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vector/src/main/res/drawable/vector_tabbar_background_dark.xml b/vector/src/main/res/drawable/vector_tabbar_background_dark.xml deleted file mode 100644 index 74b4a8c4c3..0000000000 --- a/vector/src/main/res/drawable/vector_tabbar_background_dark.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/drawable/vector_tabbar_background_light.xml b/vector/src/main/res/drawable/vector_tabbar_background_light.xml deleted file mode 100644 index 432be45bbe..0000000000 --- a/vector/src/main/res/drawable/vector_tabbar_background_light.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/drawable/vector_tabbar_background_status.xml b/vector/src/main/res/drawable/vector_tabbar_background_status.xml deleted file mode 100644 index f0f38a6439..0000000000 --- a/vector/src/main/res/drawable/vector_tabbar_background_status.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background.xml new file mode 100644 index 0000000000..c4a7ae037c --- /dev/null +++ b/vector/src/main/res/drawable/vector_tabbar_selected_background.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background_dark.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background_dark.xml deleted file mode 100644 index ce8ba4eb8d..0000000000 --- a/vector/src/main/res/drawable/vector_tabbar_selected_background_dark.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background_light.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background_light.xml deleted file mode 100644 index 9625ac483f..0000000000 --- a/vector/src/main/res/drawable/vector_tabbar_selected_background_light.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background_status.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background_status.xml deleted file mode 100644 index ee338a5a39..0000000000 --- a/vector/src/main/res/drawable/vector_tabbar_selected_background_status.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/drawable/vector_tabbar_unselected_background_dark.xml b/vector/src/main/res/drawable/vector_tabbar_unselected_background.xml similarity index 65% rename from vector/src/main/res/drawable/vector_tabbar_unselected_background_dark.xml rename to vector/src/main/res/drawable/vector_tabbar_unselected_background.xml index cb302f5111..72fbda740c 100644 --- a/vector/src/main/res/drawable/vector_tabbar_unselected_background_dark.xml +++ b/vector/src/main/res/drawable/vector_tabbar_unselected_background.xml @@ -1,9 +1,8 @@ - - + \ No newline at end of file diff --git a/vector/src/main/res/drawable/vector_tabbar_unselected_background_light.xml b/vector/src/main/res/drawable/vector_tabbar_unselected_background_light.xml deleted file mode 100644 index a7a286e724..0000000000 --- a/vector/src/main/res/drawable/vector_tabbar_unselected_background_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/drawable/vector_tabbar_unselected_background_status.xml b/vector/src/main/res/drawable/vector_tabbar_unselected_background_status.xml deleted file mode 100644 index e2c7613c50..0000000000 --- a/vector/src/main/res/drawable/vector_tabbar_unselected_background_status.xml +++ /dev/null @@ -1,9 +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 d939b9ddc5..a606f880a1 100644 --- a/vector/src/main/res/values/colors_riot.xml +++ b/vector/src/main/res/values/colors_riot.xml @@ -53,13 +53,15 @@ #FF22262E - @color/primary_color_light - @color/primary_color_dark - @color/primary_color_status + + @color/riotx_android_secondary_light + @color/riotx_android_secondary_dark + @color/riotx_android_secondary_black - @color/primary_color_light - @color/primary_color_dark - @color/primary_color_status + + @color/riotx_background_light + @color/riotx_background_dark + @color/riotx_background_black #FFFFFF diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml index 1899084f69..b3430a59c8 100644 --- a/vector/src/main/res/values/styles_riot.xml +++ b/vector/src/main/res/values/styles_riot.xml @@ -371,4 +371,9 @@ ?vctr_message_text_color + + \ 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 @@ -