forked from upstream-mirrors/quik
Use specific color for field
This commit is contained in:
@@ -27,6 +27,11 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) {
|
||||
.map { res -> context.resources.getColor(res) }
|
||||
.distinctUntilChanged()
|
||||
|
||||
val field: Observable<Int> = prefs.dark.asObservable()
|
||||
.map { dark -> if (dark) R.color.fieldDark else R.color.fieldLight }
|
||||
.map { res -> context.resources.getColor(res) }
|
||||
.distinctUntilChanged()
|
||||
|
||||
val composeBackground: Observable<Int> = prefs.dark.asObservable()
|
||||
.map { dark -> if (dark) R.color.backgroundDark else R.color.backgroundLight }
|
||||
.map { res -> context.resources.getColor(res) }
|
||||
|
||||
@@ -94,7 +94,7 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), 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)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="@color/separatorLight" />
|
||||
<solid android:color="@color/white" />
|
||||
<corners android:radius="4dp" />
|
||||
</shape>
|
||||
@@ -11,6 +11,9 @@
|
||||
<color name="backgroundLight">#F2F2F2</color>
|
||||
<color name="backgroundDark">#192025</color>
|
||||
|
||||
<color name="fieldLight">#0C000000</color>
|
||||
<color name="fieldDark">#0CFFFFFF</color>
|
||||
|
||||
<color name="textPrimary">#49555F</color>
|
||||
<color name="textSecondary">#70808D</color>
|
||||
<color name="textTertiary">#B7B9C0</color>
|
||||
@@ -22,8 +25,8 @@
|
||||
<color name="bubbleLight">#FFFFFF</color>
|
||||
<color name="bubbleDark">#333333</color>
|
||||
|
||||
<color name="separatorLight">#F2F2F2</color>
|
||||
<color name="separatorDark">#333333</color>
|
||||
<color name="separatorLight">#0C000000</color>
|
||||
<color name="separatorDark">#0CFFFFFF</color>
|
||||
|
||||
<color name="rowSelected">#F5F5F5</color>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user