From ed2ed5bef4e4cd9b99afdf4b2302a7f3d29ae803 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 5 Feb 2021 12:15:52 +0100 Subject: [PATCH] Fix some accent colors - Buttons in debug options (debug build only) - Play button for video previews Change-Id: I3de5a41ae93d0293e3322dae03a7da4593baee95 --- post_merge.sh | 3 ++- .../src/debug/res/layout/activity_debug_menu.xml | 14 +++++++------- .../drawable-hdpi/ic_material_play_circle.png | Bin 2170 -> 0 bytes .../drawable-mdpi/ic_material_play_circle.png | Bin 1374 -> 0 bytes .../drawable-xhdpi/ic_material_play_circle.png | Bin 2891 -> 0 bytes .../drawable-xxhdpi/ic_material_play_circle.png | Bin 4484 -> 0 bytes .../ic_material_folder_green_vector.png | Bin 921 -> 0 bytes .../drawable-xxxhdpi/ic_material_play_circle.png | Bin 6134 -> 0 bytes .../res/drawable/ic_material_play_circle.xml | 7 +++++++ vector/src/main/res/values/attrs_sc.xml | 1 + vector/src/main/res/values/colors_sc.xml | 6 ++++++ vector/src/main/res/values/theme_dark.xml | 1 + vector/src/main/res/values/theme_light.xml | 1 + vector/src/main/res/values/theme_sc.xml | 2 ++ vector/src/main/res/values/theme_sc_light.xml | 1 + 15 files changed, 28 insertions(+), 8 deletions(-) delete mode 100644 vector/src/main/res/drawable-hdpi/ic_material_play_circle.png delete mode 100644 vector/src/main/res/drawable-mdpi/ic_material_play_circle.png delete mode 100644 vector/src/main/res/drawable-xhdpi/ic_material_play_circle.png delete mode 100644 vector/src/main/res/drawable-xxhdpi/ic_material_play_circle.png delete mode 100644 vector/src/main/res/drawable-xxxhdpi/ic_material_folder_green_vector.png delete mode 100644 vector/src/main/res/drawable-xxxhdpi/ic_material_play_circle.png create mode 100644 vector/src/main/res/drawable/ic_material_play_circle.xml diff --git a/post_merge.sh b/post_merge.sh index dbe9a46cf8..bc711e8797 100755 --- a/post_merge.sh +++ b/post_merge.sh @@ -9,7 +9,8 @@ source "$mydir/merge_helpers.sh" require_clean_git # Color corrections | TODO more? -sed -i 's|@color/riotx_accent|?colorAccent|g' vector/src/main/res/layout/* +sed -i 's|"@color/riotx_accent"|"?colorAccent"|g' vector/src/*/res/layout/* +sed -i 's|"@style/VectorButtonStyle"|"?materialButtonStyle"|g' vector/src/*/res/layout/* uncommitted=`git status --porcelain` if [ -z "$uncommitted" ]; then echo "Seems like colors are still fine :)" diff --git a/vector/src/debug/res/layout/activity_debug_menu.xml b/vector/src/debug/res/layout/activity_debug_menu.xml index 6a41488987..27735c61ac 100644 --- a/vector/src/debug/res/layout/activity_debug_menu.xml +++ b/vector/src/debug/res/layout/activity_debug_menu.xml @@ -22,49 +22,49 @@ diff --git a/vector/src/main/res/drawable-hdpi/ic_material_play_circle.png b/vector/src/main/res/drawable-hdpi/ic_material_play_circle.png deleted file mode 100644 index 425a1cd00034251faf06ce5ea686bff645a28a8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2170 zcmV-=2!;2FP)8e=z4ttRh&uar_vP-nn}o^l+d21~=Xv&j&pmJV+y&;CV-5$QQafxL9=sDKZxx!X zXNlVcQMF_)Cy>SF56jb&| zmuJ(66E2hs)D{WdB?!*|@Tj(J2?HefT|r{!es|NGDoraBsN>DPYO~DsO8~1?*|Z1$ zE!}a%%+cjZZpq9v>TPJw}zHEm7rmm1%;Q`^=f7Kn!K)`^EO z$_l+lE8;7h1ERN38vH=xZeK8WeTz z(|}}&Z*q9>3lih_6|Prt0D#CPh4G7QMJxqs ziN4rCjJuQt!x#h52f)$&n?fPN`n}P?^HKz{&Osqtcv zWFE4*mQkR#;lVo@s8t#TO|_iv+Qy4PZ_{d>u%4OzrqqXBn0&26p*u2N$|#U9&8O9G zH72*1$34x*x_wQbCCEJ>TvP6@Ky;lBX39?!sFOPdKn>1^G)0$pYjEPjswyVDglX)b zn0fu?a9B&tPZQ|s+1nohsUNwBgk`7m)P46&c6|52;UyY020x9L+Pcptzq zC*sKnvpY2_NuZX>j^dewm0KAh6vgo1{T<9DWV%-q4k(f>qgC+s4D9(iiZ2OK{(h&*Q7%*NTm}^woWWr=(I%Sy0WmS$+QK}BJ z2%H%>Xd?a*5tNAo00fLCrjuF_6W%Ar=TtiUzimZ!+9RPR5gjcD{4uQ~;iX#4cp1PFC&xnuzm=Fy5@^z843-)CPaJW~_9jA|L$A)8 z(607z%=ivUaBNwY>qipPNqx|h%eJ2b(Igz9@ZYv4GVr5u?O&G}yvde^(DhkA&=F=37eZnbVHxr3oYjzd)>BpnPtBYovd%Ch&@6vu+x` zk^nUETxwR@p7agw_n!tKuG%+e`Ng}2hFpPY=y^@x0+^;p9Kbj=dh_$Cnd$Gvs8cdS z@g56c^`isB{f|~@AB+Kb5KPl{w2#1V9ACH2NX^fBKwwzqeWa9`Ps2V;>FJ_?0_GgcqNST<<_J*@J+ z^3?L+S(D-y3ADk1Nw94+qMcUPvW6LmhE8Bce1G8}%)bx%n%7!g&e|zzd~G9uw2te# zff3g#D>r5izHKTce<fS}UKYOyYp(2n#G}I2lPr;Zek6avtj-bciQ>-Cn zOUAutf4z{+D`5sUsIplw41jP_tB8MV|B~-!ogwFo@-_7jhX;KIn}?@%22092ri|_A zsoQZ{rBTN=9a=}iOGVsxikR0pHQF&DE|`z8kdFr4+s@~%Q8G0^J0l0)PghssC1*+T)KC wc#=Vv2)MxD)02kTcW}8gEoF{5=9m`#1I>rK;&`=YD*ylh07*qoM6N<$f=tOE%>V!Z diff --git a/vector/src/main/res/drawable-mdpi/ic_material_play_circle.png b/vector/src/main/res/drawable-mdpi/ic_material_play_circle.png deleted file mode 100644 index dbdf8e5dcda306cc8af500d091330bd9a2a26253..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1374 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 F{vXy(nYI7` diff --git a/vector/src/main/res/drawable/ic_material_play_circle.xml b/vector/src/main/res/drawable/ic_material_play_circle.xml new file mode 100644 index 0000000000..ca46cbbbdd --- /dev/null +++ b/vector/src/main/res/drawable/ic_material_play_circle.xml @@ -0,0 +1,7 @@ + + + diff --git a/vector/src/main/res/values/attrs_sc.xml b/vector/src/main/res/values/attrs_sc.xml index 89423e68ec..40bab78f60 100644 --- a/vector/src/main/res/values/attrs_sc.xml +++ b/vector/src/main/res/values/attrs_sc.xml @@ -6,6 +6,7 @@ + diff --git a/vector/src/main/res/values/colors_sc.xml b/vector/src/main/res/values/colors_sc.xml index e02f6d47b3..70954b28e0 100644 --- a/vector/src/main/res/values/colors_sc.xml +++ b/vector/src/main/res/values/colors_sc.xml @@ -7,7 +7,10 @@ #689F38 #F1F8E9 #DCEDC8 + #C5E1A5 + #AED581 #33691E + @color/accent_sc_300 @color/accent_sc_dark @color/accent_sc @@ -31,4 +34,7 @@ @color/accent_sc_50 @color/accent_sc_900 + + + #76cfa6 diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml index 09d7f436be..085c0c8751 100644 --- a/vector/src/main/res/values/theme_dark.xml +++ b/vector/src/main/res/values/theme_dark.xml @@ -194,6 +194,7 @@ @color/riotx_unread_room_badge_dark @color/timestamp_overlay_fg @color/timestamp_overlay_bg + @color/element_accent_pale @color/riotx_header_panel_background_dark @color/riotx_header_panel_background_dark diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml index 49ce3868b6..65b1e36ed4 100644 --- a/vector/src/main/res/values/theme_light.xml +++ b/vector/src/main/res/values/theme_light.xml @@ -194,6 +194,7 @@ @color/riotx_unread_room_badge_light @color/timestamp_overlay_fg @color/timestamp_overlay_bg + @color/element_accent_pale @color/riotx_header_panel_background_dark diff --git a/vector/src/main/res/values/theme_sc.xml b/vector/src/main/res/values/theme_sc.xml index 52bf7cbdbd..f2e19af5ed 100644 --- a/vector/src/main/res/values/theme_sc.xml +++ b/vector/src/main/res/values/theme_sc.xml @@ -166,12 +166,14 @@ @style/VectorSnackBarText + @color/background_floating_sc @color/background_sc @color/accent_sc @color/accent_sc_alpha12 ?riotx_background @color/background_floating_sc + @color/accent_sc_pale @color/background_black_sc @color/background_black_sc diff --git a/vector/src/main/res/values/theme_sc_light.xml b/vector/src/main/res/values/theme_sc_light.xml index a7140d8707..31d42e265a 100644 --- a/vector/src/main/res/values/theme_sc_light.xml +++ b/vector/src/main/res/values/theme_sc_light.xml @@ -32,6 +32,7 @@ @color/accent_sc_alpha12 ?riotx_background ?riotx_header_panel_text_secondary + @color/accent_sc_pale @style/Vector.BottomSheet.SC.Light