From 6332a1b3bc743c97d585eff92434dcc8ef79bdd3 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 6 Dec 2017 23:09:03 -0500 Subject: [PATCH] Use specific color for field --- qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt | 5 +++++ .../com/moez/QKSMS/presentation/compose/ComposeActivity.kt | 2 +- qksms/src/main/res/drawable/field_background.xml | 2 +- qksms/src/main/res/values/colors.xml | 7 +++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt index 46b05a90..d9d13f2b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt @@ -27,6 +27,11 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) { .map { res -> context.resources.getColor(res) } .distinctUntilChanged() + val field: Observable = prefs.dark.asObservable() + .map { dark -> if (dark) R.color.fieldDark else R.color.fieldLight } + .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() + val composeBackground: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.backgroundDark else R.color.backgroundLight } .map { res -> context.resources.getColor(res) } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index cebb9714..c028d2da 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -94,7 +94,7 @@ class ComposeActivity : QkActivity(), ComposeView { disposables += colors.composeBackground .subscribe { color -> window.decorView.setBackgroundColor(color) } - disposables += colors.bubble + disposables += colors.field .subscribe { color -> message.setBackgroundTint(color) } window.callback = ComposeWindowCallback(window.callback, this) diff --git a/qksms/src/main/res/drawable/field_background.xml b/qksms/src/main/res/drawable/field_background.xml index 7fb56286..a9bd8afc 100644 --- a/qksms/src/main/res/drawable/field_background.xml +++ b/qksms/src/main/res/drawable/field_background.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/qksms/src/main/res/values/colors.xml b/qksms/src/main/res/values/colors.xml index e48a6ffd..1438b7af 100644 --- a/qksms/src/main/res/values/colors.xml +++ b/qksms/src/main/res/values/colors.xml @@ -11,6 +11,9 @@ #F2F2F2 #192025 + #0C000000 + #0CFFFFFF + #49555F #70808D #B7B9C0 @@ -22,8 +25,8 @@ #FFFFFF #333333 - #F2F2F2 - #333333 + #0C000000 + #0CFFFFFF #F5F5F5