mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-21 13:18:52 +01:00
Separators respect dark mode
This commit is contained in:
@@ -9,10 +9,7 @@ import com.moez.QKSMS.presentation.main.MainActivity
|
|||||||
import com.moez.QKSMS.presentation.main.MainViewModel
|
import com.moez.QKSMS.presentation.main.MainViewModel
|
||||||
import com.moez.QKSMS.presentation.settings.SettingsActivity
|
import com.moez.QKSMS.presentation.settings.SettingsActivity
|
||||||
import com.moez.QKSMS.presentation.settings.SettingsViewModel
|
import com.moez.QKSMS.presentation.settings.SettingsViewModel
|
||||||
import com.moez.QKSMS.presentation.view.AvatarView
|
import com.moez.QKSMS.presentation.view.*
|
||||||
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.receiver.*
|
import com.moez.QKSMS.receiver.*
|
||||||
import dagger.Component
|
import dagger.Component
|
||||||
import javax.inject.Singleton
|
import javax.inject.Singleton
|
||||||
@@ -39,6 +36,7 @@ interface AppComponent {
|
|||||||
fun inject(view: QkEditText)
|
fun inject(view: QkEditText)
|
||||||
fun inject(view: QkSwitch)
|
fun inject(view: QkSwitch)
|
||||||
fun inject(view: QkTextView)
|
fun inject(view: QkTextView)
|
||||||
|
fun inject(view: Separator)
|
||||||
|
|
||||||
fun inject(viewModel: MainViewModel)
|
fun inject(viewModel: MainViewModel)
|
||||||
fun inject(viewModel: ComposeViewModel)
|
fun inject(viewModel: ComposeViewModel)
|
||||||
|
|||||||
@@ -25,6 +25,10 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) {
|
|||||||
.map { dark -> if (dark) R.color.backgroundDark else R.color.backgroundLight }
|
.map { dark -> if (dark) R.color.backgroundDark else R.color.backgroundLight }
|
||||||
.map { res -> context.resources.getColor(res) }
|
.map { res -> context.resources.getColor(res) }
|
||||||
|
|
||||||
|
val separator: Observable<Int> = prefs.dark.asObservable()
|
||||||
|
.map { dark -> if (dark) R.color.separatorDark else R.color.separatorLight }
|
||||||
|
.map { res -> context.resources.getColor(res) }
|
||||||
|
|
||||||
val textPrimary: Observable<Int> = prefs.dark.asObservable()
|
val textPrimary: Observable<Int> = prefs.dark.asObservable()
|
||||||
.map { dark -> if (dark) R.color.textPrimaryDark else R.color.textPrimary }
|
.map { dark -> if (dark) R.color.textPrimaryDark else R.color.textPrimary }
|
||||||
.map { res -> context.resources.getColor(res) }
|
.map { res -> context.resources.getColor(res) }
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import android.Manifest
|
|||||||
import android.app.AlertDialog
|
import android.app.AlertDialog
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.res.ColorStateList
|
import android.content.res.ColorStateList
|
||||||
|
import android.graphics.drawable.ColorDrawable
|
||||||
import android.graphics.drawable.StateListDrawable
|
import android.graphics.drawable.StateListDrawable
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.support.v7.app.ActionBarDrawerToggle
|
import android.support.v7.app.ActionBarDrawerToggle
|
||||||
@@ -76,9 +77,9 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
|
|||||||
intArrayOf(android.R.attr.state_selected),
|
intArrayOf(android.R.attr.state_selected),
|
||||||
intArrayOf(-android.R.attr.state_selected))
|
intArrayOf(-android.R.attr.state_selected))
|
||||||
|
|
||||||
val rowBackground = {
|
val rowBackground = { separator: Int ->
|
||||||
StateListDrawable().apply {
|
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))
|
addState(intArrayOf(-android.R.attr.state_selected), getDrawable(R.drawable.ripple))
|
||||||
mutate()
|
mutate()
|
||||||
}
|
}
|
||||||
@@ -99,10 +100,12 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
|
|||||||
.doOnNext { tintList -> settingsIcon.imageTintList = tintList }
|
.doOnNext { tintList -> settingsIcon.imageTintList = tintList }
|
||||||
.subscribe()
|
.subscribe()
|
||||||
|
|
||||||
inbox.background = rowBackground()
|
disposables += colors.separator
|
||||||
archived.background = rowBackground()
|
.doOnNext { color -> inbox.background = rowBackground(color) }
|
||||||
scheduled.background = rowBackground()
|
.doOnNext { color -> archived.background = rowBackground(color) }
|
||||||
blocked.background = rowBackground()
|
.doOnNext { color -> scheduled.background = rowBackground(color) }
|
||||||
|
.doOnNext { color -> blocked.background = rowBackground(color) }
|
||||||
|
.subscribe()
|
||||||
|
|
||||||
conversationsAdapter.longClicks.subscribe { threadId ->
|
conversationsAdapter.longClicks.subscribe { threadId ->
|
||||||
AlertDialog.Builder(this)
|
AlertDialog.Builder(this)
|
||||||
|
|||||||
@@ -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()
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -4,13 +4,13 @@
|
|||||||
<item>
|
<item>
|
||||||
<shape android:shape="rectangle">
|
<shape android:shape="rectangle">
|
||||||
<solid android:color="@color/white" />
|
<solid android:color="@color/white" />
|
||||||
<corners android:radius="16dp" />
|
<corners android:radius="18dp" />
|
||||||
</shape>
|
</shape>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<shape
|
<shape
|
||||||
android:shape="rectangle">
|
android:shape="rectangle">
|
||||||
<solid android:color="@color/listSeparator"/>
|
<solid android:color="@color/separatorLight"/>
|
||||||
<corners android:radius="18dp"/>
|
<corners android:radius="18dp"/>
|
||||||
</shape>
|
</shape>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:shape="rectangle">
|
android:shape="rectangle">
|
||||||
<solid android:color="@color/listSeparator" />
|
<solid android:color="@color/separatorLight" />
|
||||||
<corners android:radius="4dp" />
|
<corners android:radius="4dp" />
|
||||||
</shape>
|
</shape>
|
||||||
@@ -43,10 +43,9 @@
|
|||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
<View
|
<com.moez.QKSMS.presentation.view.Separator
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1dp"
|
android:layout_height="1dp" />
|
||||||
android:background="@color/listSeparator" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/composeBar"
|
android:id="@+id/composeBar"
|
||||||
|
|||||||
@@ -66,12 +66,11 @@
|
|||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<View
|
<com.moez.QKSMS.presentation.view.Separator
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1dp"
|
android:layout_height="1dp"
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp" />
|
||||||
android:background="@color/listSeparator" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/settings"
|
android:id="@+id/settings"
|
||||||
|
|||||||
@@ -16,7 +16,9 @@
|
|||||||
<color name="backgroundLight">#F2F2F2</color>
|
<color name="backgroundLight">#F2F2F2</color>
|
||||||
<color name="backgroundDark">#212121</color>
|
<color name="backgroundDark">#212121</color>
|
||||||
|
|
||||||
<color name="listSeparator">#F2F2F2</color>
|
<color name="separatorLight">#F2F2F2</color>
|
||||||
|
<color name="separatorDark">#333333</color>
|
||||||
|
|
||||||
<color name="rowSelected">#F5F5F5</color>
|
<color name="rowSelected">#F5F5F5</color>
|
||||||
|
|
||||||
<color name="switchThumbEnabledLight">#ECECEC</color>
|
<color name="switchThumbEnabledLight">#ECECEC</color>
|
||||||
|
|||||||
Reference in New Issue
Block a user