From 33f57d35ab562d30271a3d7c544f6b5daa5ba115 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 24 Nov 2019 03:06:55 -0500 Subject: [PATCH] Refine background/bubble colours --- .../com/moez/QKSMS/feature/widget/WidgetProvider.kt | 4 ++-- presentation/src/main/res/values-night/themes.xml | 13 +++++++------ presentation/src/main/res/values-v23/themes.xml | 2 +- presentation/src/main/res/values-v27/themes.xml | 2 +- presentation/src/main/res/values/colors.xml | 6 ++---- presentation/src/main/res/values/themes.xml | 8 ++++---- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt index 3c3960d8..0bb09316 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt @@ -120,8 +120,8 @@ class WidgetProvider : AppWidgetProvider() { remoteViews.setInt(R.id.toolbar, "setColorFilter", context.getColorCompat(when { night && black -> R.color.black - night && !black -> R.color.toolbarDark - else -> R.color.toolbarLight + night && !black -> R.color.backgroundDark + else -> R.color.backgroundLight })) remoteViews.setTextColor(R.id.title, context.getColorCompat(when (night) { diff --git a/presentation/src/main/res/values-night/themes.xml b/presentation/src/main/res/values-night/themes.xml index cf5054e5..b26faa8b 100644 --- a/presentation/src/main/res/values-night/themes.xml +++ b/presentation/src/main/res/values-night/themes.xml @@ -25,7 +25,7 @@ @color/separatorDark @color/backgroundDark @color/bubbleDark - @color/statusBarDark + @color/backgroundDark @color/text_primary @color/text_secondary @color/text_tertiary @@ -33,8 +33,8 @@ true @style/PopupTheme @color/bubbleDark - @color/toolbarDark - @color/statusBarDark + @color/backgroundDark + @color/backgroundDark @drawable/ripple_dark @color/switchThumbEnabledDark @color/switchThumbDisabledDark @@ -50,8 +50,8 @@ @color/backgroundDark @style/PopupTheme @color/bubbleDark - @color/toolbarDark - @color/statusBarDark + @color/backgroundDark + @color/backgroundDark @drawable/ripple_dark false @@ -66,6 +66,7 @@ @color/black @color/black @color/black + @color/bubbleBlack @color/black @color/black @@ -79,7 +80,7 @@ diff --git a/presentation/src/main/res/values-v23/themes.xml b/presentation/src/main/res/values-v23/themes.xml index b789222d..c27a31ed 100644 --- a/presentation/src/main/res/values-v23/themes.xml +++ b/presentation/src/main/res/values-v23/themes.xml @@ -21,7 +21,7 @@ diff --git a/presentation/src/main/res/values-v27/themes.xml b/presentation/src/main/res/values-v27/themes.xml index 6acad9c9..1a7fd8ca 100644 --- a/presentation/src/main/res/values-v27/themes.xml +++ b/presentation/src/main/res/values-v27/themes.xml @@ -22,7 +22,7 @@ diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml index 0193967e..46f6941e 100644 --- a/presentation/src/main/res/values/colors.xml +++ b/presentation/src/main/res/values/colors.xml @@ -24,9 +24,6 @@ #1f000000 #33ffffff - #FFFFFF - #1d262b - #FFFFFF #1d262b #88000000 @@ -47,7 +44,8 @@ #80ffffff #ECEFF1 - #242a2f + #151B1F + #0F1113 #0C000000 #1AFFFFFF diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml index 4252e6b4..16db6916 100644 --- a/presentation/src/main/res/values/themes.xml +++ b/presentation/src/main/res/values/themes.xml @@ -44,8 +44,8 @@ true @style/PopupTheme @color/bubbleLight - @color/toolbarLight - @color/statusBarLight + @color/backgroundLight + @color/backgroundLight @drawable/ripple @color/switchThumbEnabledLight @color/switchThumbDisabledLight @@ -61,8 +61,8 @@ @color/backgroundLight @style/PopupTheme @color/bubbleLight - @color/toolbarLight - @color/statusBarLight + @color/backgroundLight + @color/backgroundLight @drawable/ripple false