diff --git a/generate_themes.sh b/generate_themes.sh index 81e2c6d03d..9314a58abf 100755 --- a/generate_themes.sh +++ b/generate_themes.sh @@ -22,6 +22,7 @@ function theme_file() { local file="$1" local name="$2" local color="$3" + local presence_color="$4" local name_lc=`echo "$name" | tr '[:upper:]' '[:lower:]'` local color_alpha25=`add_alpha_to_color "$color" "3f"` local color_noalpha12=`add_noalpha_to_color "$color" '0.12'` @@ -31,6 +32,8 @@ function theme_file() { fi cp "$file" "$target_file" sed -i "s|BlueLight|$name|g;s|bluelight|$name_lc|g;s|#03a9f4|$color|g;s|#3f03a9f4|$color_alpha25|g;s|#e0f4f3|$color_noalpha12|g" "$target_file" + # Note: following might reference accent_sc again, without it being changed back + sed -i "s|\\(\\).*\\(\\)|\\1$presence_color\\2|g" "$target_file" } function insert_above_comment() { @@ -63,10 +66,11 @@ function generate_accent_common() { function generate_accent_light() { # Usage: - # generate_accent + # generate_accent local name="$1" local name_str="$2" local color_lt="$3" + local color_presence_lt="$4" local name_lc=`echo "$name" | tr '[:upper:]' '[:lower:]'` # String @@ -88,7 +92,7 @@ function generate_accent_light() { # Actual theming for f in **/"theme_sc_light_accent_bluelight.xml"; do - theme_file "$f" "$name" "$color_lt" \; + theme_file "$f" "$name" "$color_lt" "$color_presence_lt" \; done # Selection code @@ -100,10 +104,11 @@ function generate_accent_light() { function generate_accent_dark() { # Usage: - # generate_accent + # generate_accent local name="$1" local name_str="$2" local color_dk="$3" + local color_presence_dk="$4" local name_lc=`echo "$name" | tr '[:upper:]' '[:lower:]'` # String @@ -125,7 +130,7 @@ function generate_accent_dark() { # Actual theming for f in **/"theme_sc_accent_bluelight.xml"; do - theme_file "$f" "$name" "$color_dk" \; + theme_file "$f" "$name" "$color_dk" "$color_presence_dk" \; done # Selection code @@ -149,41 +154,51 @@ function generate_accent_dark() { function generate_accent() { # Usage: - # generate_accent + # generate_accent [ []] local name="$1" local color_lt="$2" local color_dk="$3" - local name_str="$4" + local color_presence="$4" + local name_str="$5" + if [ -z "$color_presence" ]; then + color_presence_lt="?colorAccent" + color_presence_dk="?colorAccent" + else + color_presence_lt="$color_presence" + color_presence_dk="$color_presence" + fi if [ -z "$name_str" ]; then name_str="$name" fi - generate_accent_light "$name" "$name_str" "$color_lt" - generate_accent_dark "$name" "$name_str" "$color_dk" + generate_accent_light "$name" "$name_str" "$color_lt" "$color_presence_lt" + generate_accent_dark "$name" "$name_str" "$color_dk" "$color_presence_dk" } -generate_accent "Amber" "#ffa000" "#ffab00" -generate_accent "BlueLight" "#03a9f4" "#03a9f4" "Light blue" -generate_accent "Blue" "#2196F3" "#2196F3" -generate_accent "Carnation" "#fb83b2" "#ffa6c9" -generate_accent "Cyan" "#00bcd4" "#00bcd4" -generate_accent "Denim" "#1560BD" "#1560BD" -generate_accent "Gold" "#CFB53B" "#CFB53B" -#generate_accent "GreenLight" "#8bc34a" "#8bc34a" "Light green" -generate_accent "GreenDark" "#4CAF50" "#4CAF50" "Dark green" -#generate_accent "Grey" "#808080" "#808080" -#generate_accent "Hope" "#5fc72d" "#59ff3a" -generate_accent "Indigo" "#5C6BC0" "#5C6BC0" -generate_accent "Lava" "#B20120" "#EB0028" -generate_accent "Lime" "#C0CA33" "#AFB42B" -generate_accent "Orange" "#ff9800" "#ff9800" -#generate_accent "Oxygen" "#53ADEF" "#53ADEF" -generate_accent "Pink" "#e91e63" "#f48fb1" -#generate_accent "Pixel" "#4285f4" "#3367d6" -generate_accent "Purple" "#673ab7" "#9575CD" -generate_accent "Red" "#ff0000" "#ff0000" -generate_accent "Teal" "#008577" "#80cbc4" -generate_accent "Turquoise" "#00C1C1" "#00C1C1" -generate_accent "Yellow" "#FBC02D" "#FBC02D" +default_accent="@color/accent_sc" + +generate_accent "Amber" "#ffa000" "#ffab00" "$default_accent" +generate_accent "BlueLight" "#03a9f4" "#03a9f4" "" "Light blue" +generate_accent "Blue" "#2196F3" "#2196F3" "" +generate_accent "Carnation" "#fb83b2" "#ffa6c9" "" +generate_accent "Cyan" "#00bcd4" "#00bcd4" "" +generate_accent "Denim" "#1560BD" "#1560BD" "" +generate_accent "Gold" "#CFB53B" "#CFB53B" "" +#generate_accent "GreenLight" "#8bc34a" "#8bc34a" "" "Light green" +generate_accent "GreenDark" "#4CAF50" "#4CAF50" "" "Dark green" +#generate_accent "Grey" "#808080" "#808080" "" +#generate_accent "Hope" "#5fc72d" "#59ff3a" "" +generate_accent "Indigo" "#5C6BC0" "#5C6BC0" "" +generate_accent "Lava" "#B20120" "#EB0028" "$default_accent" +generate_accent "Lime" "#C0CA33" "#AFB42B" "" +generate_accent "Orange" "#ff9800" "#ff9800" "$default_accent" +#generate_accent "Oxygen" "#53ADEF" "#53ADEF" "" +generate_accent "Pink" "#e91e63" "#f48fb1" "" +#generate_accent "Pixel" "#4285f4" "#3367d6" "" +generate_accent "Purple" "#673ab7" "#9575CD" "" +generate_accent "Red" "#ff0000" "#ff0000" "$default_accent" +generate_accent "Teal" "#008577" "#80cbc4" "" +generate_accent "Turquoise" "#00C1C1" "#00C1C1" "" +generate_accent "Yellow" "#FBC02D" "#FBC02D" "$default_accent" # We have foreground on accent colors, better skip these #generate_accent "Grey" "#808080" "#808080" diff --git a/library/ui-styles/src/main/res/values/attrs_sc.xml b/library/ui-styles/src/main/res/values/attrs_sc.xml index 4a660c4422..a33bea8210 100644 --- a/library/ui-styles/src/main/res/values/attrs_sc.xml +++ b/library/ui-styles/src/main/res/values/attrs_sc.xml @@ -44,6 +44,8 @@ + + diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml index d97220c2dc..03a47f55bf 100644 --- a/library/ui-styles/src/main/res/values/theme_dark.xml +++ b/library/ui-styles/src/main/res/values/theme_dark.xml @@ -125,6 +125,7 @@ @color/vctr_unread_room_badge_dark @color/timestamp_overlay_fg @color/timestamp_overlay_bg + ?colorPrimary @color/element_accent_pale @style/Widget.Vector.TextInputLayout.Dense.ExposedDropdownMenu.Dark.SC ?vctr_header_background @@ -152,6 +153,7 @@ @color/element_room_01 @color/element_room_02 @color/element_room_03 + ?colorAccent @color/android_status_bar_background_dark @color/android_navigation_bar_background_dark diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml index 86e5a68707..c8f0629313 100644 --- a/library/ui-styles/src/main/res/values/theme_light.xml +++ b/library/ui-styles/src/main/res/values/theme_light.xml @@ -125,6 +125,7 @@ @color/vctr_unread_room_badge_light @color/timestamp_overlay_fg @color/timestamp_overlay_bg + ?colorPrimary @color/element_accent_pale @style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu ?vctr_header_background @@ -152,6 +153,7 @@ @color/element_room_01 @color/element_room_02 @color/element_room_03 + ?colorAccent @color/android_status_bar_background_dark diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_amber.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_amber.xml index c0d2d3a38d..cf4328cc59 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_amber.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_amber.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_amber_pale @color/accent_sc_dark_amber_alpha25 @style/Vector.BottomSheet.SC.Amber + @color/accent_sc @@ -53,6 +56,7 @@ @color/accent_sc_dark_amber @color/accent_sc_dark_amber_pale @style/Vector.BottomSheet.SC.Amber + @color/accent_sc @color/accent_sc_dark_amber_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_blue.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_blue.xml index 105394db5f..382bf0752b 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_blue.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_blue.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_blue_pale @color/accent_sc_dark_blue_alpha25 @style/Vector.BottomSheet.SC.Blue + ?colorAccent @@ -53,6 +56,7 @@ @color/accent_sc_dark_blue @color/accent_sc_dark_blue_pale @style/Vector.BottomSheet.SC.Blue + ?colorAccent @color/accent_sc_dark_blue_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_bluelight.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_bluelight.xml index 8e8df89a8c..d600c7e095 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_bluelight.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_bluelight.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_bluelight_pale @color/accent_sc_dark_bluelight_alpha25 @style/Vector.BottomSheet.SC.BlueLight + ?colorAccent @@ -53,6 +56,7 @@ @color/accent_sc_dark_bluelight @color/accent_sc_dark_bluelight_pale @style/Vector.BottomSheet.SC.BlueLight + ?colorAccent @color/accent_sc_dark_bluelight_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_carnation.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_carnation.xml index e6224d2b76..5a18927194 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_carnation.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_carnation.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_carnation_pale @color/accent_sc_dark_carnation_alpha25 @style/Vector.BottomSheet.SC.Carnation + ?colorAccent @@ -53,6 +56,7 @@ @color/accent_sc_dark_carnation @color/accent_sc_dark_carnation_pale @style/Vector.BottomSheet.SC.Carnation + ?colorAccent @color/accent_sc_dark_carnation_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_cyan.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_cyan.xml index e99bcf91e2..a73dbb4283 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_cyan.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_cyan.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_cyan_pale @color/accent_sc_dark_cyan_alpha25 @style/Vector.BottomSheet.SC.Cyan + ?colorAccent @@ -53,6 +56,7 @@ @color/accent_sc_dark_cyan @color/accent_sc_dark_cyan_pale @style/Vector.BottomSheet.SC.Cyan + ?colorAccent @color/accent_sc_dark_cyan_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_denim.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_denim.xml index 1d2401e582..bb7cc54bac 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_denim.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_denim.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_denim_pale @color/accent_sc_dark_denim_alpha25 @style/Vector.BottomSheet.SC.Denim + ?colorAccent @@ -53,6 +56,7 @@ @color/accent_sc_dark_denim @color/accent_sc_dark_denim_pale @style/Vector.BottomSheet.SC.Denim + ?colorAccent @color/accent_sc_dark_denim_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_gold.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_gold.xml index e540c18bee..7bd266dc32 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_gold.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_gold.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_gold_pale @color/accent_sc_dark_gold_alpha25 @style/Vector.BottomSheet.SC.Gold + ?colorAccent @@ -53,6 +56,7 @@ @color/accent_sc_dark_gold @color/accent_sc_dark_gold_pale @style/Vector.BottomSheet.SC.Gold + ?colorAccent @color/accent_sc_dark_gold_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_greendark.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_greendark.xml index 7df6dcdf93..4969e5db60 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_greendark.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_greendark.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_greendark_pale @color/accent_sc_dark_greendark_alpha25 @style/Vector.BottomSheet.SC.GreenDark + ?colorAccent @@ -53,6 +56,7 @@ @color/accent_sc_dark_greendark @color/accent_sc_dark_greendark_pale @style/Vector.BottomSheet.SC.GreenDark + ?colorAccent @color/accent_sc_dark_greendark_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_indigo.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_indigo.xml index 0ccbc84d2c..6eef90a8cd 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_indigo.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_indigo.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_indigo_pale @color/accent_sc_dark_indigo_alpha25 @style/Vector.BottomSheet.SC.Indigo + ?colorAccent @@ -53,6 +56,7 @@ @color/accent_sc_dark_indigo @color/accent_sc_dark_indigo_pale @style/Vector.BottomSheet.SC.Indigo + ?colorAccent @color/accent_sc_dark_indigo_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_lava.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_lava.xml index 87dcec983c..8b9a4bb1ab 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_lava.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_lava.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_lava_pale @color/accent_sc_dark_lava_alpha25 @style/Vector.BottomSheet.SC.Lava + @color/accent_sc @@ -53,6 +56,7 @@ @color/accent_sc_dark_lava @color/accent_sc_dark_lava_pale @style/Vector.BottomSheet.SC.Lava + @color/accent_sc @color/accent_sc_dark_lava_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_lime.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_lime.xml index 31759cecdf..c7fed7f302 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_lime.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_lime.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_lime_pale @color/accent_sc_dark_lime_alpha25 @style/Vector.BottomSheet.SC.Lime + ?colorAccent @@ -53,6 +56,7 @@ @color/accent_sc_dark_lime @color/accent_sc_dark_lime_pale @style/Vector.BottomSheet.SC.Lime + ?colorAccent @color/accent_sc_dark_lime_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_orange.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_orange.xml index 960dc31939..b9c4a7febe 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_orange.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_orange.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_orange_pale @color/accent_sc_dark_orange_alpha25 @style/Vector.BottomSheet.SC.Orange + @color/accent_sc @@ -53,6 +56,7 @@ @color/accent_sc_dark_orange @color/accent_sc_dark_orange_pale @style/Vector.BottomSheet.SC.Orange + @color/accent_sc @color/accent_sc_dark_orange_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_pink.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_pink.xml index 1c17ceecbf..a38e767665 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_pink.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_pink.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_pink_pale @color/accent_sc_dark_pink_alpha25 @style/Vector.BottomSheet.SC.Pink + ?colorAccent @@ -53,6 +56,7 @@ @color/accent_sc_dark_pink @color/accent_sc_dark_pink_pale @style/Vector.BottomSheet.SC.Pink + ?colorAccent @color/accent_sc_dark_pink_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_purple.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_purple.xml index f04002be8e..5f8d35afc0 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_purple.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_purple.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_purple_pale @color/accent_sc_dark_purple_alpha25 @style/Vector.BottomSheet.SC.Purple + ?colorAccent @@ -53,6 +56,7 @@ @color/accent_sc_dark_purple @color/accent_sc_dark_purple_pale @style/Vector.BottomSheet.SC.Purple + ?colorAccent @color/accent_sc_dark_purple_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_red.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_red.xml index b643d51296..d9678db9d9 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_red.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_red.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_red_pale @color/accent_sc_dark_red_alpha25 @style/Vector.BottomSheet.SC.Red + @color/accent_sc @@ -53,6 +56,7 @@ @color/accent_sc_dark_red @color/accent_sc_dark_red_pale @style/Vector.BottomSheet.SC.Red + @color/accent_sc @color/accent_sc_dark_red_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_teal.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_teal.xml index c88c351b97..e24af5dae5 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_teal.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_teal.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_teal_pale @color/accent_sc_dark_teal_alpha25 @style/Vector.BottomSheet.SC.Teal + ?colorAccent @@ -53,6 +56,7 @@ @color/accent_sc_dark_teal @color/accent_sc_dark_teal_pale @style/Vector.BottomSheet.SC.Teal + ?colorAccent @color/accent_sc_dark_teal_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_turquoise.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_turquoise.xml index 8b543bc6a7..30fb2a69c2 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_turquoise.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_turquoise.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_turquoise_pale @color/accent_sc_dark_turquoise_alpha25 @style/Vector.BottomSheet.SC.Turquoise + ?colorAccent @@ -53,6 +56,7 @@ @color/accent_sc_dark_turquoise @color/accent_sc_dark_turquoise_pale @style/Vector.BottomSheet.SC.Turquoise + ?colorAccent @color/accent_sc_dark_turquoise_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_yellow.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_yellow.xml index 3563f5b2c8..88560c75e9 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_accent_yellow.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_accent_yellow.xml @@ -26,6 +26,7 @@ @color/accent_sc_dark_yellow_pale @color/accent_sc_dark_yellow_alpha25 @style/Vector.BottomSheet.SC.Yellow + @color/accent_sc @@ -53,6 +56,7 @@ @color/accent_sc_dark_yellow @color/accent_sc_dark_yellow_pale @style/Vector.BottomSheet.SC.Yellow + @color/accent_sc @color/accent_sc_dark_yellow_alpha25 diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_amber.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_amber.xml index 60137ad43b..9b0dc26723 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_amber.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_amber.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_amber_pale @color/accent_sc_light_amber_noalpha12 @style/Vector.BottomSheet.SC.Light.Amber + @color/accent_sc diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_blue.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_blue.xml index fa95429c30..61dedbfd6b 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_blue.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_blue.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_blue_pale @color/accent_sc_light_blue_noalpha12 @style/Vector.BottomSheet.SC.Light.Blue + ?colorAccent diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_bluelight.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_bluelight.xml index c10ecd5699..02ce626166 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_bluelight.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_bluelight.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_bluelight_pale @color/accent_sc_light_bluelight_noalpha12 @style/Vector.BottomSheet.SC.Light.BlueLight + ?colorAccent diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_carnation.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_carnation.xml index 0e7b68f606..f9394fb55e 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_carnation.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_carnation.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_carnation_pale @color/accent_sc_light_carnation_noalpha12 @style/Vector.BottomSheet.SC.Light.Carnation + ?colorAccent diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_cyan.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_cyan.xml index cd481c5d63..1f9c935448 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_cyan.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_cyan.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_cyan_pale @color/accent_sc_light_cyan_noalpha12 @style/Vector.BottomSheet.SC.Light.Cyan + ?colorAccent diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_denim.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_denim.xml index f1b8ff98a6..ebea9081e4 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_denim.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_denim.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_denim_pale @color/accent_sc_light_denim_noalpha12 @style/Vector.BottomSheet.SC.Light.Denim + ?colorAccent diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_gold.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_gold.xml index cff5dbe3ac..454533ebe7 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_gold.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_gold.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_gold_pale @color/accent_sc_light_gold_noalpha12 @style/Vector.BottomSheet.SC.Light.Gold + ?colorAccent diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_greendark.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_greendark.xml index 8fa8d36e75..ac72f73448 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_greendark.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_greendark.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_greendark_pale @color/accent_sc_light_greendark_noalpha12 @style/Vector.BottomSheet.SC.Light.GreenDark + ?colorAccent diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_indigo.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_indigo.xml index 8fb98b11a2..c9f22a9e79 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_indigo.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_indigo.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_indigo_pale @color/accent_sc_light_indigo_noalpha12 @style/Vector.BottomSheet.SC.Light.Indigo + ?colorAccent diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_lava.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_lava.xml index 236fd64a78..20045414f7 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_lava.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_lava.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_lava_pale @color/accent_sc_light_lava_noalpha12 @style/Vector.BottomSheet.SC.Light.Lava + @color/accent_sc diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_lime.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_lime.xml index d66629b690..f85c860399 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_lime.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_lime.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_lime_pale @color/accent_sc_light_lime_noalpha12 @style/Vector.BottomSheet.SC.Light.Lime + ?colorAccent diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_orange.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_orange.xml index 355132abc2..a46c30e44a 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_orange.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_orange.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_orange_pale @color/accent_sc_light_orange_noalpha12 @style/Vector.BottomSheet.SC.Light.Orange + @color/accent_sc diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_pink.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_pink.xml index 5b483d3f84..e49d27af2b 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_pink.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_pink.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_pink_pale @color/accent_sc_light_pink_noalpha12 @style/Vector.BottomSheet.SC.Light.Pink + ?colorAccent diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_purple.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_purple.xml index 9fe9cf1717..1938ec0b5e 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_purple.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_purple.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_purple_pale @color/accent_sc_light_purple_noalpha12 @style/Vector.BottomSheet.SC.Light.Purple + ?colorAccent diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_red.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_red.xml index 78c26b3fc7..b93b4118a5 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_red.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_red.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_red_pale @color/accent_sc_light_red_noalpha12 @style/Vector.BottomSheet.SC.Light.Red + @color/accent_sc diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_teal.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_teal.xml index 28f41aa3fa..70a33ff396 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_teal.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_teal.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_teal_pale @color/accent_sc_light_teal_noalpha12 @style/Vector.BottomSheet.SC.Light.Teal + ?colorAccent diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_turquoise.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_turquoise.xml index 117f962f26..005388c9e7 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_turquoise.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_turquoise.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_turquoise_pale @color/accent_sc_light_turquoise_noalpha12 @style/Vector.BottomSheet.SC.Light.Turquoise + ?colorAccent diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_yellow.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_yellow.xml index 25fb51739b..f6ec951de1 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_yellow.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_yellow.xml @@ -27,6 +27,7 @@ @color/accent_sc_light_yellow_pale @color/accent_sc_light_yellow_noalpha12 @style/Vector.BottomSheet.SC.Light.Yellow + @color/accent_sc diff --git a/vector/src/main/res/drawable/ic_presence_online.xml b/vector/src/main/res/drawable/ic_presence_online.xml index 8e63ac67c1..e5229de3fd 100644 --- a/vector/src/main/res/drawable/ic_presence_online.xml +++ b/vector/src/main/res/drawable/ic_presence_online.xml @@ -16,7 +16,7 @@