From 89f129c6575b7d98473406322419cc6eec9b941e Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 7 Jun 2022 18:21:14 +0200 Subject: [PATCH] Material red for warnings and errors in SC themes Change-Id: Ic7f8550f4a15b8128b4c6c83fb9f8aa3498c915e --- .../src/main/res/values/attrs_sc.xml | 3 +++ .../src/main/res/values/colors_sc.xml | 6 ++++++ .../src/main/res/values/theme_dark.xml | 2 ++ .../src/main/res/values/theme_light.xml | 2 ++ .../src/main/res/values/theme_sc.xml | 4 +++- .../src/main/res/values/theme_sc_light.xml | 4 +++- post_merge.sh | 2 ++ .../res/drawable-v24/ic_alert_triangle.xml | 14 +++++++++++++ .../main/res/drawable-v24/ic_check_off.xml | 20 +++++++++++++++++++ .../ic_sending_message_failed.xml | 10 ++++++++++ .../res/drawable-v24/ic_shield_warning.xml | 15 ++++++++++++++ .../ic_shield_warning_no_border.xml | 18 +++++++++++++++++ .../drawable-v24/ic_shield_warning_small.xml | 15 ++++++++++++++ .../res/drawable-v24/ic_warning_badge.xml | 15 ++++++++++++++ .../main/res/drawable/ic_alert_triangle.xml | 2 +- vector/src/main/res/drawable/ic_check_off.xml | 4 ++-- .../drawable/ic_sending_message_failed.xml | 2 +- .../main/res/drawable/ic_shield_warning.xml | 2 +- .../drawable/ic_shield_warning_no_border.xml | 4 ++-- .../res/drawable/ic_shield_warning_small.xml | 2 +- .../main/res/drawable/ic_warning_badge.xml | 2 +- 21 files changed, 137 insertions(+), 11 deletions(-) create mode 100644 vector/src/main/res/drawable-v24/ic_alert_triangle.xml create mode 100644 vector/src/main/res/drawable-v24/ic_check_off.xml create mode 100644 vector/src/main/res/drawable-v24/ic_sending_message_failed.xml create mode 100644 vector/src/main/res/drawable-v24/ic_shield_warning.xml create mode 100644 vector/src/main/res/drawable-v24/ic_shield_warning_no_border.xml create mode 100644 vector/src/main/res/drawable-v24/ic_shield_warning_small.xml create mode 100644 vector/src/main/res/drawable-v24/ic_warning_badge.xml 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 d48ac6bca2..3fd1d5ba23 100644 --- a/library/ui-styles/src/main/res/values/attrs_sc.xml +++ b/library/ui-styles/src/main/res/values/attrs_sc.xml @@ -48,6 +48,9 @@ + + + diff --git a/library/ui-styles/src/main/res/values/colors_sc.xml b/library/ui-styles/src/main/res/values/colors_sc.xml index 900fb8f8b1..41c7588b2c 100644 --- a/library/ui-styles/src/main/res/values/colors_sc.xml +++ b/library/ui-styles/src/main/res/values/colors_sc.xml @@ -101,4 +101,10 @@ @color/palette_kiwi @color/palette_element_green + #E53935 + @color/sc_alert + @color/sc_alert + @color/sc_alert + @color/color_warning_sc + 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 4bb237278c..44c5311748 100644 --- a/library/ui-styles/src/main/res/values/theme_dark.xml +++ b/library/ui-styles/src/main/res/values/theme_dark.xml @@ -157,6 +157,8 @@ @color/element_room_02 @color/element_room_03 ?vctr_content_tertiary + #FF4B55 + @color/shield_color_warning @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 651f93b7f1..a139c0a895 100644 --- a/library/ui-styles/src/main/res/values/theme_light.xml +++ b/library/ui-styles/src/main/res/values/theme_light.xml @@ -157,6 +157,8 @@ @color/element_room_02 @color/element_room_03 ?vctr_content_secondary + #FF4B55 + @color/shield_color_warning @color/android_status_bar_background_dark diff --git a/library/ui-styles/src/main/res/values/theme_sc.xml b/library/ui-styles/src/main/res/values/theme_sc.xml index b3e6180646..ce3aef5dfd 100644 --- a/library/ui-styles/src/main/res/values/theme_sc.xml +++ b/library/ui-styles/src/main/res/values/theme_sc.xml @@ -56,7 +56,7 @@ ?colorAccent ?colorAccent ?vctr_content_primary - @color/element_alert_dark + @color/sc_alert_dark ?vctr_content_primary @color/background_black_sc ?vctr_content_primary @@ -112,6 +112,8 @@ @color/user_color_sc_mxid_6 @color/user_color_sc_mxid_7 @color/user_color_sc_mxid_8 + @color/color_warning_sc + @color/shield_color_warning_sc @color/background_black_sc @color/background_black_sc diff --git a/library/ui-styles/src/main/res/values/theme_sc_light.xml b/library/ui-styles/src/main/res/values/theme_sc_light.xml index 2fd99bcb51..5a85a82f2e 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light.xml @@ -56,7 +56,7 @@ ?colorAccent ?colorAccent ?colorOnPrimary - @color/element_alert_light + @color/sc_alert_light @color/text_color_primary_sc @color/background_sc_light ?vctr_content_primary @@ -111,6 +111,8 @@ @color/user_color_sc_mxid_6 @color/user_color_sc_mxid_7 @color/user_color_sc_mxid_8 + @color/color_warning_sc + @color/shield_color_warning_sc @color/background_black_sc @color/background_black_sc diff --git a/post_merge.sh b/post_merge.sh index 691905a1ee..fd1dbbfa1f 100755 --- a/post_merge.sh +++ b/post_merge.sh @@ -12,6 +12,8 @@ require_clean_git sed -i 's|"@color/riotx_accent"|"?colorAccent"|g' vector/src/*/res/layout/* sed -i 's|"@style/VectorButtonStyle"|"?materialButtonStyle"|g' vector/src/*/res/layout/* sed -i 's|"@color/element_background_light"|"?backgroundColorLight"|g' vector/src/*/res/layout/* +sed -i 's|#FF4B55|#E53935|g' vector/src/*/res/drawable/* +sed -i 's|#ff4b55|#e53935|g' vector/src/*/res/drawable/* uncommitted=`git status --porcelain` if [ -z "$uncommitted" ]; then echo "Seems like colors are still fine :)" diff --git a/vector/src/main/res/drawable-v24/ic_alert_triangle.xml b/vector/src/main/res/drawable-v24/ic_alert_triangle.xml new file mode 100644 index 0000000000..c33957d4f8 --- /dev/null +++ b/vector/src/main/res/drawable-v24/ic_alert_triangle.xml @@ -0,0 +1,14 @@ + + + diff --git a/vector/src/main/res/drawable-v24/ic_check_off.xml b/vector/src/main/res/drawable-v24/ic_check_off.xml new file mode 100644 index 0000000000..e7dee4f090 --- /dev/null +++ b/vector/src/main/res/drawable-v24/ic_check_off.xml @@ -0,0 +1,20 @@ + + + + diff --git a/vector/src/main/res/drawable-v24/ic_sending_message_failed.xml b/vector/src/main/res/drawable-v24/ic_sending_message_failed.xml new file mode 100644 index 0000000000..08967276d0 --- /dev/null +++ b/vector/src/main/res/drawable-v24/ic_sending_message_failed.xml @@ -0,0 +1,10 @@ + + + diff --git a/vector/src/main/res/drawable-v24/ic_shield_warning.xml b/vector/src/main/res/drawable-v24/ic_shield_warning.xml new file mode 100644 index 0000000000..e4211a466b --- /dev/null +++ b/vector/src/main/res/drawable-v24/ic_shield_warning.xml @@ -0,0 +1,15 @@ + + + + diff --git a/vector/src/main/res/drawable-v24/ic_shield_warning_no_border.xml b/vector/src/main/res/drawable-v24/ic_shield_warning_no_border.xml new file mode 100644 index 0000000000..72da5fd08b --- /dev/null +++ b/vector/src/main/res/drawable-v24/ic_shield_warning_no_border.xml @@ -0,0 +1,18 @@ + + + + + diff --git a/vector/src/main/res/drawable-v24/ic_shield_warning_small.xml b/vector/src/main/res/drawable-v24/ic_shield_warning_small.xml new file mode 100644 index 0000000000..b3a40f2f0f --- /dev/null +++ b/vector/src/main/res/drawable-v24/ic_shield_warning_small.xml @@ -0,0 +1,15 @@ + + + + diff --git a/vector/src/main/res/drawable-v24/ic_warning_badge.xml b/vector/src/main/res/drawable-v24/ic_warning_badge.xml new file mode 100644 index 0000000000..333384a00e --- /dev/null +++ b/vector/src/main/res/drawable-v24/ic_warning_badge.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/vector/src/main/res/drawable/ic_alert_triangle.xml b/vector/src/main/res/drawable/ic_alert_triangle.xml index 0daaca920a..71be1e296a 100644 --- a/vector/src/main/res/drawable/ic_alert_triangle.xml +++ b/vector/src/main/res/drawable/ic_alert_triangle.xml @@ -9,6 +9,6 @@ android:strokeWidth="2" android:fillColor="#00000000" android:fillType="evenOdd" - android:strokeColor="#FF4B55" + android:strokeColor="#E53935" android:strokeLineCap="round"/> diff --git a/vector/src/main/res/drawable/ic_check_off.xml b/vector/src/main/res/drawable/ic_check_off.xml index 6faf291278..53041bb5df 100644 --- a/vector/src/main/res/drawable/ic_check_off.xml +++ b/vector/src/main/res/drawable/ic_check_off.xml @@ -7,14 +7,14 @@ android:fillColor="#00000000" android:pathData="M18,6L6,18" android:strokeWidth="2" - android:strokeColor="#ff4b55" + android:strokeColor="#e53935" android:strokeLineCap="round" android:strokeLineJoin="round" /> diff --git a/vector/src/main/res/drawable/ic_sending_message_failed.xml b/vector/src/main/res/drawable/ic_sending_message_failed.xml index c720a1cbbf..a837d8aab4 100644 --- a/vector/src/main/res/drawable/ic_sending_message_failed.xml +++ b/vector/src/main/res/drawable/ic_sending_message_failed.xml @@ -5,6 +5,6 @@ android:viewportHeight="16"> diff --git a/vector/src/main/res/drawable/ic_shield_warning.xml b/vector/src/main/res/drawable/ic_shield_warning.xml index 237f2aa5fd..f6109dc6f5 100644 --- a/vector/src/main/res/drawable/ic_shield_warning.xml +++ b/vector/src/main/res/drawable/ic_shield_warning.xml @@ -6,7 +6,7 @@ + android:fillColor="@color/shield_color_warning_sc"/> + android:fillColor="#E53935"/>