From aea338c247d05c39ec51b243dcb1722de9e4bbff Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 5 Dec 2017 18:09:31 -0500 Subject: [PATCH] Background colour respects dark mode --- .../java/com/moez/QKSMS/common/util/Colors.kt | 36 +++++++------------ .../QKSMS/presentation/base/QkActivity.kt | 9 +++++ .../presentation/compose/ComposeActivity.kt | 7 +++- .../QKSMS/presentation/main/MainActivity.kt | 5 +++ .../presentation/settings/SettingsActivity.kt | 4 +++ .../src/main/res/layout/compose_activity.xml | 6 ++-- .../res/layout/conversation_list_item.xml | 2 +- .../layout/conversation_list_item_unread.xml | 2 +- .../main/res/layout/message_list_item_in.xml | 2 +- .../main/res/layout/message_list_item_out.xml | 2 +- qksms/src/main/res/values/colors.xml | 1 + qksms/src/main/res/values/styles.xml | 2 +- 12 files changed, 44 insertions(+), 34 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 eecfd1b0..e0ad3a1b 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 @@ -17,40 +17,28 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) { .map { it.last() } .observeOn(AndroidSchedulers.mainThread()) + val background: Observable = prefs.dark.asObservable() + .map { dark -> if (dark) R.color.backgroundDark else R.color.white } + .map { res -> context.resources.getColor(res) } + + val composeBackground: Observable = prefs.dark.asObservable() + .map { dark -> if (dark) R.color.backgroundDark else R.color.backgroundLight } + .map { res -> context.resources.getColor(res) } + val switchThumbEnabled: Observable = prefs.dark.asObservable() - .map { dark -> - when (dark) { - true -> R.color.switch_thumb_enabled_dark - false -> R.color.switch_thumb_enabled_light - } - } + .map { dark -> if (dark) R.color.switch_thumb_enabled_dark else R.color.switch_thumb_enabled_light } .map { res -> context.resources.getColor(res) } val switchThumbDisabled: Observable = prefs.dark.asObservable() - .map { dark -> - when (dark) { - true -> R.color.switch_thumb_disabled_dark - false -> R.color.switch_thumb_disabled_light - } - } + .map { dark -> if (dark) R.color.switch_thumb_disabled_dark else R.color.switch_thumb_disabled_light } .map { res -> context.resources.getColor(res) } val switchTrackEnabled: Observable = prefs.dark.asObservable() - .map { dark -> - when (dark) { - true -> R.color.switch_track_enabled_dark - false -> R.color.switch_track_enabled_light - } - } + .map { dark -> if (dark) R.color.switch_track_enabled_dark else R.color.switch_track_enabled_light } .map { res -> context.resources.getColor(res) } val switchTrackDisabled: Observable = prefs.dark.asObservable() - .map { dark -> - when (dark) { - true -> R.color.switch_track_disabled_dark - false -> R.color.switch_track_disabled_light - } - } + .map { dark -> if (dark) R.color.switch_track_disabled_dark else R.color.switch_track_disabled_light } .map { res -> context.resources.getColor(res) } val bubbleColor = 0xFFFFFFFF.toInt() diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt index 23386a3d..1e1f596d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt @@ -45,6 +45,15 @@ abstract class QkActivity> : AppCompatActivity() { } } + override fun onPostCreate(savedInstanceState: Bundle?) { + super.onPostCreate(savedInstanceState) + + disposables += colors.background + .doOnNext { color -> window.statusBarColor = color } + .doOnNext { color -> toolbar?.setBackgroundColor(color) } + .subscribe() + } + override fun onDestroy() { super.onDestroy() disposables.dispose() 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 dc1b308a..145d00fd 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 @@ -72,7 +72,6 @@ class ComposeActivity : QkActivity(), ComposeView { messageList.layoutManager = layoutManager messageList.adapter = messageAdapter - val states = arrayOf( intArrayOf(android.R.attr.state_enabled), intArrayOf(-android.R.attr.state_enabled)) @@ -81,6 +80,12 @@ class ComposeActivity : QkActivity(), ComposeView { .map { color -> ColorStateList(states, intArrayOf(color, colors.textTertiary)) } .subscribe { tintList -> send.imageTintList = tintList } + disposables += colors.background + .subscribe { color -> composeBar.setBackgroundColor(color) } + + disposables += colors.composeBackground + .subscribe { color -> window.decorView.setBackgroundColor(color) } + window.callback = ComposeWindowCallback(window.callback, this) } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index 08df4305..d3f961f7 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -66,6 +66,11 @@ class MainActivity : QkActivity(), MainView { // Don't allow clicks to pass through the drawer layout drawer.clicks().subscribe() + disposables += colors.background + .doOnNext { color -> window.decorView.setBackgroundColor(color) } + .doOnNext { color -> drawer.setBackgroundColor(color) } + .subscribe() + val states = arrayOf( intArrayOf(android.R.attr.state_selected), intArrayOf(-android.R.attr.state_selected)) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt index d85fed21..550f7fe0 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt @@ -10,6 +10,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.presentation.base.QkActivity import com.moez.QKSMS.presentation.view.PreferenceView +import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.settings_activity.* @@ -59,6 +60,9 @@ class SettingsActivity : QkActivity(), SettingsView { supportActionBar?.setDisplayHomeAsUpEnabled(true) viewModel.bindView(this) + disposables += colors.background + .subscribe { color -> window.decorView.setBackgroundColor(color) } + // Listen to clicks for all of the preferences (0 until preferences.childCount) .map { index -> preferences.getChildAt(index) } diff --git a/qksms/src/main/res/layout/compose_activity.xml b/qksms/src/main/res/layout/compose_activity.xml index 29b3e1e7..e2d26098 100644 --- a/qksms/src/main/res/layout/compose_activity.xml +++ b/qksms/src/main/res/layout/compose_activity.xml @@ -3,7 +3,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/backgroundLight" android:orientation="vertical"> @@ -85,7 +83,7 @@ android:id="@+id/send" android:layout_width="56dp" android:layout_height="56dp" - android:background="?selectableItemBackgroundBorderless" + android:background="@drawable/ripple" android:padding="16dp" android:src="@drawable/ic_send_black_24dp" android:tint="@color/textTertiary" /> diff --git a/qksms/src/main/res/layout/conversation_list_item.xml b/qksms/src/main/res/layout/conversation_list_item.xml index 073a46cf..80193733 100644 --- a/qksms/src/main/res/layout/conversation_list_item.xml +++ b/qksms/src/main/res/layout/conversation_list_item.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" + android:background="@drawable/ripple" android:gravity="center_vertical" android:orientation="horizontal" android:paddingBottom="8dp" diff --git a/qksms/src/main/res/layout/conversation_list_item_unread.xml b/qksms/src/main/res/layout/conversation_list_item_unread.xml index 4a5b6ecf..18c49e5e 100644 --- a/qksms/src/main/res/layout/conversation_list_item_unread.xml +++ b/qksms/src/main/res/layout/conversation_list_item_unread.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" + android:background="@drawable/ripple" android:gravity="center_vertical" android:orientation="horizontal" android:paddingBottom="8dp" diff --git a/qksms/src/main/res/layout/message_list_item_in.xml b/qksms/src/main/res/layout/message_list_item_in.xml index 321e93d7..86366386 100644 --- a/qksms/src/main/res/layout/message_list_item_in.xml +++ b/qksms/src/main/res/layout/message_list_item_in.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" + android:background="@drawable/ripple" android:orientation="vertical" android:paddingBottom="16dp"> diff --git a/qksms/src/main/res/layout/message_list_item_out.xml b/qksms/src/main/res/layout/message_list_item_out.xml index abc2ab4a..da46f10b 100644 --- a/qksms/src/main/res/layout/message_list_item_out.xml +++ b/qksms/src/main/res/layout/message_list_item_out.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" + android:background="@drawable/ripple" android:orientation="vertical" android:paddingBottom="16dp"> diff --git a/qksms/src/main/res/values/colors.xml b/qksms/src/main/res/values/colors.xml index 3c0e15c4..82805ff6 100644 --- a/qksms/src/main/res/values/colors.xml +++ b/qksms/src/main/res/values/colors.xml @@ -13,6 +13,7 @@ #F4F4F4 #F2F2F2 + #212121 #F1F1F1 #F2F2F2 diff --git a/qksms/src/main/res/values/styles.xml b/qksms/src/main/res/values/styles.xml index c5cb6b7f..132cdc4a 100644 --- a/qksms/src/main/res/values/styles.xml +++ b/qksms/src/main/res/values/styles.xml @@ -28,7 +28,7 @@