From 4fcb8c47923a6ef76d606ca03aebf2a8531136fa Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 27 Mar 2023 16:22:40 +0530 Subject: ui: introduce a fresh set of Material3 themes and migrate to them Signed-off-by: Harsh Shandilya --- ui/src/main/res/values/attrs.xml | 4 -- ui/src/main/res/values/colors.xml | 81 +++++++++++++++++++++++++++--------- ui/src/main/res/values/styles.xml | 51 ++++++----------------- ui/src/main/res/values/themes.xml | 31 ++++++++++++++ ui/src/main/res/values/tv_colors.xml | 1 + ui/src/main/res/values/tv_styles.xml | 8 +--- 6 files changed, 108 insertions(+), 68 deletions(-) create mode 100644 ui/src/main/res/values/themes.xml (limited to 'ui/src/main/res/values') diff --git a/ui/src/main/res/values/attrs.xml b/ui/src/main/res/values/attrs.xml index b5b614e9..903ac008 100644 --- a/ui/src/main/res/values/attrs.xml +++ b/ui/src/main/res/values/attrs.xml @@ -4,8 +4,4 @@ - - - - diff --git a/ui/src/main/res/values/colors.xml b/ui/src/main/res/values/colors.xml index 989c6fc1..41dee2fa 100644 --- a/ui/src/main/res/values/colors.xml +++ b/ui/src/main/res/values/colors.xml @@ -1,24 +1,67 @@ - - - - #ffffffff - #ffffffff - #ffcccccc - #ff1a73e8 - #ff1a73e8 - #ff1a73e8 - #ff000000 - #ffffffff + + #1a73e8 + #005BC0 + #FFFFFF + #D8E2FF + #001A41 + #565E71 + #FFFFFF + #DBE2F9 + #131B2C + #715574 + #FFFFFF + #FBD7FC + #29132D + #BA1A1A + #FFDAD6 + #FFFFFF + #410002 + #FEFBFF + #1B1B1F + #FEFBFF + #1B1B1F + #E1E2EC + #44474F + #74777F + #F2F0F4 + #303033 + #ADC7FF + #000000 + #005BC0 + #C4C6D0 + #000000 + #ADC7FF + #002E68 + #004493 + #D8E2FF + #BFC6DC + #283041 + #3F4759 + #DBE2F9 + #DEBCDF + #402843 + #583E5B + #FBD7FC + #FFB4AB + #93000A + #690005 + #FFDAD6 + #1B1B1F + #E3E2E6 + #1B1B1F + #E3E2E6 + #44474F + #C4C6D0 + #8E9099 + #1B1B1F + #E3E2E6 + #005BC0 + #000000 + #ADC7FF + #44474F + #000000 - - @color/primary_text_color - @color/primary_color - #aaffffff #ffeeeeee - - @color/secondary_color - - #ffffffff #444444 diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml index e9a174cf..019cb300 100644 --- a/ui/src/main/res/values/styles.xml +++ b/ui/src/main/res/values/styles.xml @@ -1,49 +1,28 @@ - - - - - diff --git a/ui/src/main/res/values/themes.xml b/ui/src/main/res/values/themes.xml new file mode 100644 index 00000000..e8d36cdd --- /dev/null +++ b/ui/src/main/res/values/themes.xml @@ -0,0 +1,31 @@ + + + + diff --git a/ui/src/main/res/values/tv_colors.xml b/ui/src/main/res/values/tv_colors.xml index f330bedc..40fb45a0 100644 --- a/ui/src/main/res/values/tv_colors.xml +++ b/ui/src/main/res/values/tv_colors.xml @@ -1,6 +1,7 @@ #ff212121 + #ff0059c1 @color/tv_primary_color #b00020 diff --git a/ui/src/main/res/values/tv_styles.xml b/ui/src/main/res/values/tv_styles.xml index 536ca752..a78f2d63 100644 --- a/ui/src/main/res/values/tv_styles.xml +++ b/ui/src/main/res/values/tv_styles.xml @@ -10,7 +10,6 @@ #ff0059c1 @color/tv_primary_color #fffafafa - @color/tv_primary_color @color/list_multiselect_background #fffafafa false @@ -25,15 +24,10 @@