From 6f2b0c4ac401536993d0f1ed1c2425e965a4192a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 5 Dec 2017 19:44:03 -0500 Subject: [PATCH] Separators respect dark mode --- .../com/moez/QKSMS/common/di/AppComponent.kt | 6 ++-- .../java/com/moez/QKSMS/common/util/Colors.kt | 4 +++ .../QKSMS/presentation/main/MainActivity.kt | 15 +++++---- .../moez/QKSMS/presentation/view/Separator.kt | 32 +++++++++++++++++++ .../src/main/res/drawable/chip_background.xml | 4 +-- .../main/res/drawable/field_background.xml | 2 +- .../src/main/res/layout/compose_activity.xml | 5 ++- qksms/src/main/res/layout/drawer_view.xml | 5 ++- qksms/src/main/res/values/colors.xml | 4 ++- 9 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/presentation/view/Separator.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt index b2403d9b..6f940993 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt @@ -9,10 +9,7 @@ import com.moez.QKSMS.presentation.main.MainActivity import com.moez.QKSMS.presentation.main.MainViewModel import com.moez.QKSMS.presentation.settings.SettingsActivity import com.moez.QKSMS.presentation.settings.SettingsViewModel -import com.moez.QKSMS.presentation.view.AvatarView -import com.moez.QKSMS.presentation.view.QkEditText -import com.moez.QKSMS.presentation.view.QkSwitch -import com.moez.QKSMS.presentation.view.QkTextView +import com.moez.QKSMS.presentation.view.* import com.moez.QKSMS.receiver.* import dagger.Component import javax.inject.Singleton @@ -39,6 +36,7 @@ interface AppComponent { fun inject(view: QkEditText) fun inject(view: QkSwitch) fun inject(view: QkTextView) + fun inject(view: Separator) fun inject(viewModel: MainViewModel) fun inject(viewModel: ComposeViewModel) 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 5c1e85e5..8d8771c4 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 @@ -25,6 +25,10 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) { .map { dark -> if (dark) R.color.backgroundDark else R.color.backgroundLight } .map { res -> context.resources.getColor(res) } + val separator: Observable = prefs.dark.asObservable() + .map { dark -> if (dark) R.color.separatorDark else R.color.separatorLight } + .map { res -> context.resources.getColor(res) } + val textPrimary: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.textPrimaryDark else R.color.textPrimary } .map { res -> context.resources.getColor(res) } 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 46a6c150..84dac51d 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 @@ -4,6 +4,7 @@ import android.Manifest import android.app.AlertDialog import android.content.Intent import android.content.res.ColorStateList +import android.graphics.drawable.ColorDrawable import android.graphics.drawable.StateListDrawable import android.os.Bundle import android.support.v7.app.ActionBarDrawerToggle @@ -76,9 +77,9 @@ class MainActivity : QkActivity(), MainView { intArrayOf(android.R.attr.state_selected), intArrayOf(-android.R.attr.state_selected)) - val rowBackground = { + val rowBackground = { separator: Int -> StateListDrawable().apply { - addState(intArrayOf(android.R.attr.state_selected), getDrawable(R.color.rowSelected)) + addState(intArrayOf(android.R.attr.state_selected), ColorDrawable(separator)) addState(intArrayOf(-android.R.attr.state_selected), getDrawable(R.drawable.ripple)) mutate() } @@ -99,10 +100,12 @@ class MainActivity : QkActivity(), MainView { .doOnNext { tintList -> settingsIcon.imageTintList = tintList } .subscribe() - inbox.background = rowBackground() - archived.background = rowBackground() - scheduled.background = rowBackground() - blocked.background = rowBackground() + disposables += colors.separator + .doOnNext { color -> inbox.background = rowBackground(color) } + .doOnNext { color -> archived.background = rowBackground(color) } + .doOnNext { color -> scheduled.background = rowBackground(color) } + .doOnNext { color -> blocked.background = rowBackground(color) } + .subscribe() conversationsAdapter.longClicks.subscribe { threadId -> AlertDialog.Builder(this) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/Separator.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/Separator.kt new file mode 100644 index 00000000..35cf8199 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/Separator.kt @@ -0,0 +1,32 @@ +package com.moez.QKSMS.presentation.view + +import android.content.Context +import android.util.AttributeSet +import android.view.View +import com.moez.QKSMS.common.di.appComponent +import com.moez.QKSMS.common.util.Colors +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxkotlin.plusAssign +import javax.inject.Inject + +class Separator @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : View(context, attrs) { + + @Inject lateinit var colors: Colors + + private val disposables = CompositeDisposable() + + init { + appComponent.inject(this) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + disposables += colors.separator.subscribe { color -> setBackgroundColor(color) } + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + disposables.dispose() + } + +} \ No newline at end of file diff --git a/qksms/src/main/res/drawable/chip_background.xml b/qksms/src/main/res/drawable/chip_background.xml index 3dbb5703..005f9226 100755 --- a/qksms/src/main/res/drawable/chip_background.xml +++ b/qksms/src/main/res/drawable/chip_background.xml @@ -4,13 +4,13 @@ - + - + diff --git a/qksms/src/main/res/drawable/field_background.xml b/qksms/src/main/res/drawable/field_background.xml index 78ca7473..7fb56286 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/layout/compose_activity.xml b/qksms/src/main/res/layout/compose_activity.xml index 6fdc0bf9..e26ab3a9 100644 --- a/qksms/src/main/res/layout/compose_activity.xml +++ b/qksms/src/main/res/layout/compose_activity.xml @@ -43,10 +43,9 @@ - + android:layout_height="1dp" /> - + android:layout_marginTop="8dp" /> #F2F2F2 #212121 - #F2F2F2 + #F2F2F2 + #333333 + #F5F5F5 #ECECEC