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 e0ad3a1b..9abcbd64 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 bubble: Observable = prefs.dark.asObservable() + .map { dark -> if (dark) R.color.bubbleDark else R.color.bubbleLight } + .map { res -> context.resources.getColor(res) } + val switchThumbEnabled: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.switch_thumb_enabled_dark else R.color.switch_thumb_enabled_light } .map { res -> context.resources.getColor(res) } @@ -41,8 +45,6 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) { .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() - val textPrimary = 0xFF49555F.toInt() val textSecondary = 0xFF70808D.toInt() val textTertiary = 0xFFB7B9C0.toInt() diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt index 65b604ed..a1bf885a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt @@ -8,8 +8,8 @@ import android.view.ViewGroup import com.jakewharton.rxbinding2.view.RxView import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent -import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.util.extensions.dpToPx import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setPadding @@ -54,7 +54,8 @@ class MessagesAdapter : RealmRecyclerViewAdapter(null, tr when (viewType) { VIEWTYPE_ME -> { view = layoutInflater.inflate(R.layout.message_list_item_out, parent, false) - view.body.setBackgroundTint(colors.bubbleColor) + disposables += colors.bubble + .subscribe { color -> view.body.setBackgroundTint(color) } } else -> { view = layoutInflater.inflate(R.layout.message_list_item_in, parent, false) diff --git a/qksms/src/main/res/values/colors.xml b/qksms/src/main/res/values/colors.xml index 82805ff6..42895dcc 100644 --- a/qksms/src/main/res/values/colors.xml +++ b/qksms/src/main/res/values/colors.xml @@ -10,10 +10,12 @@ #ccffffff #80ffffff - #F4F4F4 + #FFFFFF + #333333 #F2F2F2 #212121 + #F1F1F1 #F2F2F2