Refine background/bubble colours

This commit is contained in:
Moez Bhatti
2019-11-24 03:06:55 -05:00
parent fbf10d6e6e
commit 33f57d35ab
6 changed files with 17 additions and 18 deletions
@@ -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) {
@@ -25,7 +25,7 @@
<item name="android:divider">@color/separatorDark</item>
<item name="android:navigationBarColor">@color/backgroundDark</item>
<item name="android:queryBackground">@color/bubbleDark</item>
<item name="android:statusBarColor">@color/statusBarDark</item>
<item name="android:statusBarColor">@color/backgroundDark</item>
<item name="android:textColorPrimary">@color/text_primary</item>
<item name="android:textColorSecondary">@color/text_secondary</item>
<item name="android:textColorTertiary">@color/text_tertiary</item>
@@ -33,8 +33,8 @@
<item name="android:windowContentTransitions">true</item>
<item name="actionBarPopupTheme">@style/PopupTheme</item>
<item name="bubbleColor">@color/bubbleDark</item>
<item name="colorPrimary">@color/toolbarDark</item>
<item name="colorPrimaryDark">@color/statusBarDark</item>
<item name="colorPrimary">@color/backgroundDark</item>
<item name="colorPrimaryDark">@color/backgroundDark</item>
<item name="selectableItemBackground">@drawable/ripple_dark</item>
<item name="switchThumbEnabled">@color/switchThumbEnabledDark</item>
<item name="switchThumbDisabled">@color/switchThumbDisabledDark</item>
@@ -50,8 +50,8 @@
<item name="android:windowBackground">@color/backgroundDark</item>
<item name="actionBarPopupTheme">@style/PopupTheme</item>
<item name="bubbleColor">@color/bubbleDark</item>
<item name="colorPrimary">@color/toolbarDark</item>
<item name="colorPrimaryDark">@color/statusBarDark</item>
<item name="colorPrimary">@color/backgroundDark</item>
<item name="colorPrimaryDark">@color/backgroundDark</item>
<item name="selectableItemBackground">@drawable/ripple_dark</item>
<item name="windowActionBar">false</item>
</style>
@@ -66,6 +66,7 @@
<item name="android:navigationBarColor">@color/black</item>
<item name="android:statusBarColor">@color/black</item>
<item name="android:windowBackground">@color/black</item>
<item name="bubbleColor">@color/bubbleBlack</item>
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
</style>
@@ -79,7 +80,7 @@
<style name="PopupTheme.Black">
<item name="android:colorBackground">@color/black</item>
<item name="android:textColor">@color/textPrimaryDark</item>
<item name="bubbleColor">@color/bubbleBlack</item>
</style>
</resources>
@@ -21,7 +21,7 @@
<!-- On Marshmallow, use the light status bar -->
<style name="AppTheme" parent="AppBaseTheme">
<item name="android:statusBarColor">@color/statusBarLight</item>
<item name="android:statusBarColor">@color/backgroundLight</item>
<item name="android:windowLightStatusBar">true</item>
</style>
@@ -22,7 +22,7 @@
<!-- On Oreo, use the light status and navigation bars -->
<style name="AppTheme" parent="AppBaseTheme">
<item name="android:navigationBarColor">@color/white</item>
<item name="android:statusBarColor">@color/statusBarLight</item>
<item name="android:statusBarColor">@color/backgroundLight</item>
<item name="android:windowLightNavigationBar">true</item>
<item name="android:windowLightStatusBar">true</item>
</style>
+2 -4
View File
@@ -24,9 +24,6 @@
<color name="rippleLight">#1f000000</color>
<color name="rippleDark">#33ffffff</color>
<color name="statusBarLight">#FFFFFF</color>
<color name="statusBarDark">#1d262b</color>
<color name="toolbarLight">#FFFFFF</color>
<color name="toolbarDark">#1d262b</color>
<color name="toolbarTranslucent">#88000000</color>
@@ -47,7 +44,8 @@
<color name="textTertiaryDark">#80ffffff</color>
<color name="bubbleLight">#ECEFF1</color>
<color name="bubbleDark">#242a2f</color>
<color name="bubbleDark">#151B1F</color>
<color name="bubbleBlack">#0F1113</color>
<color name="separatorLight">#0C000000</color>
<color name="separatorDark">#1AFFFFFF</color>
+4 -4
View File
@@ -44,8 +44,8 @@
<item name="android:windowContentTransitions">true</item>
<item name="actionBarPopupTheme">@style/PopupTheme</item>
<item name="bubbleColor">@color/bubbleLight</item>
<item name="colorPrimary">@color/toolbarLight</item>
<item name="colorPrimaryDark">@color/statusBarLight</item>
<item name="colorPrimary">@color/backgroundLight</item>
<item name="colorPrimaryDark">@color/backgroundLight</item>
<item name="selectableItemBackground">@drawable/ripple</item>
<item name="switchThumbEnabled">@color/switchThumbEnabledLight</item>
<item name="switchThumbDisabled">@color/switchThumbDisabledLight</item>
@@ -61,8 +61,8 @@
<item name="android:windowBackground">@color/backgroundLight</item>
<item name="actionBarPopupTheme">@style/PopupTheme</item>
<item name="bubbleColor">@color/bubbleLight</item>
<item name="colorPrimary">@color/toolbarLight</item>
<item name="colorPrimaryDark">@color/statusBarLight</item>
<item name="colorPrimary">@color/backgroundLight</item>
<item name="colorPrimaryDark">@color/backgroundLight</item>
<item name="selectableItemBackground">@drawable/ripple</item>
<item name="windowActionBar">false</item>
</style>