From a5e58aab0cc7cbcb6e3ed59a261bca163d48a8a2 Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Sun, 12 Jan 2020 12:50:09 +0300 Subject: [PATCH] customtheme: Solve spoiler and muted channel colors on 10.2.0 --- patches/customtheme/1020.patch | 41 ++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/patches/customtheme/1020.patch b/patches/customtheme/1020.patch index 2e36c5df8d..440e1e4996 100644 --- a/patches/customtheme/1020.patch +++ b/patches/customtheme/1020.patch @@ -1,6 +1,6 @@ -diff -crB from/res/drawable/drawable_overlay_channels_active_dark.xml to/res/drawable/drawable_overlay_channels_active_dark.xml -*** from/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-11 15:47:41.441380541 +0000 ---- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-11 15:50:12.057734973 +0000 +diff -crB com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml +*** com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 11:58:54.830668343 +0300 +--- com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 12:30:53.961941373 +0300 *************** *** 3,9 **** xmlns:android="http://schemas.android.com/apk/res/android"> @@ -18,9 +18,9 @@ diff -crB from/res/drawable/drawable_overlay_channels_active_dark.xml to/res/dra -diff -crB from/res/values/colors.xml to/res/values/colors.xml -*** from/res/values/colors.xml 2020-01-11 15:47:41.764713204 +0000 ---- to/res/values/colors.xml 2020-01-11 15:50:12.057734973 +0000 +diff -crB com.discord-1020-base/res/values/colors.xml com.discord-1020/res/values/colors.xml +*** com.discord-1020-base/res/values/colors.xml 2020-01-12 11:58:55.320671069 +0300 +--- com.discord-1020/res/values/colors.xml 2020-01-12 12:47:04.817926576 +0300 *************** *** 52,58 **** #37000000 @@ -116,7 +116,7 @@ diff -crB from/res/values/colors.xml to/res/values/colors.xml #ff72767d #4d72767d #9972767d -! #ff0f0f0f +! #ff333333 ! #330f0f0f ! #4d0f0f0f ! #510f0f0f @@ -171,9 +171,9 @@ diff -crB from/res/values/colors.xml to/res/values/colors.xml #e6ffffff @android:color/transparent #ff593695 -diff -crB from/res/values/styles.xml to/res/values/styles.xml -*** from/res/values/styles.xml 2020-01-11 15:47:42.174712356 +0000 ---- to/res/values/styles.xml 2020-01-11 15:50:12.057734973 +0000 +diff -crB com.discord-1020-base/res/values/styles.xml com.discord-1020/res/values/styles.xml +*** com.discord-1020-base/res/values/styles.xml 2020-01-12 11:58:55.240670624 +0300 +--- com.discord-1020/res/values/styles.xml 2020-01-12 12:46:14.510949392 +0300 *************** *** 392,398 **** @color/white_alpha_40 @@ -192,7 +192,7 @@ diff -crB from/res/values/styles.xml to/res/values/styles.xml @color/primary_630 @color/grey_account *************** -*** 404,415 **** +*** 404,418 **** @color/chat_input_button_tint_colors_dark @drawable/drawable_rect_rounded_dark @color/dark_grey_2_alpha_10 @@ -204,8 +204,11 @@ diff -crB from/res/values/styles.xml to/res/values/styles.xml ! #1afaa61a @drawable/drawable_bg_reaction_dark @drawable/drawable_reaction_text_color_dark - @color/primary_700 ---- 404,415 ---- +! @color/primary_700 + @color/white_alpha_10 + @color/primary_600 + @drawable/ic_emoji_activity_dark +--- 404,418 ---- @color/chat_input_button_tint_colors_dark @drawable/drawable_rect_rounded_dark @color/dark_grey_2_alpha_10 @@ -217,7 +220,10 @@ diff -crB from/res/values/styles.xml to/res/values/styles.xml ! @color/purple_brand_alpha_10 @drawable/drawable_bg_reaction_dark @drawable/drawable_reaction_text_color_dark - @color/primary_700 +! @color/primary_500 + @color/white_alpha_10 + @color/primary_600 + @drawable/ic_emoji_activity_dark *************** *** 471,477 **** @color/brand_500 @@ -252,9 +258,9 @@ diff -crB from/res/values/styles.xml to/res/values/styles.xml