diff --git a/presentation/src/main/java/feature/settings/SettingsActivity.kt b/presentation/src/main/java/feature/settings/SettingsActivity.kt index 64e8234c..2c84d1ea 100644 --- a/presentation/src/main/java/feature/settings/SettingsActivity.kt +++ b/presentation/src/main/java/feature/settings/SettingsActivity.kt @@ -32,6 +32,7 @@ import com.uber.autodispose.kotlin.autoDisposable import common.MenuItemAdapter import common.base.QkThemedActivity import common.util.extensions.dpToPx +import common.util.extensions.setBackgroundTint import common.util.extensions.setVisible import common.widget.PreferenceView import injection.appComponent @@ -39,6 +40,7 @@ import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.settings_activity.* import kotlinx.android.synthetic.main.settings_switch_widget.view.* +import kotlinx.android.synthetic.main.settings_theme_widget.* import util.Preferences import javax.inject.Inject @@ -109,6 +111,7 @@ class SettingsActivity : QkThemedActivity(), SettingsView { else -> R.string.settings_default_sms_summary_false }) + themePreview.setBackgroundTint(state.theme) night.summary = state.nightModeSummary nightStart.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO) nightStart.summary = state.nightStart diff --git a/presentation/src/main/java/feature/settings/SettingsState.kt b/presentation/src/main/java/feature/settings/SettingsState.kt index 3fb7970d..72511c2f 100644 --- a/presentation/src/main/java/feature/settings/SettingsState.kt +++ b/presentation/src/main/java/feature/settings/SettingsState.kt @@ -25,6 +25,7 @@ data class SettingsState( val syncing: Boolean = false, val isDefaultSmsApp: Boolean = false, + val theme: Int = 0, val nightModeSummary: String = "", val nightModeId: Int = Preferences.NIGHT_MODE_OFF, val nightStart: String = "", diff --git a/presentation/src/main/java/feature/settings/SettingsViewModel.kt b/presentation/src/main/java/feature/settings/SettingsViewModel.kt index 712c0b01..3fce36b8 100644 --- a/presentation/src/main/java/feature/settings/SettingsViewModel.kt +++ b/presentation/src/main/java/feature/settings/SettingsViewModel.kt @@ -25,6 +25,7 @@ import com.uber.autodispose.kotlin.autoDisposable import common.Navigator import common.base.QkViewModel import common.util.BillingManager +import common.util.Colors import common.util.DateFormatter import common.util.NightModeManager import injection.appComponent @@ -40,6 +41,7 @@ class SettingsViewModel : QkViewModel(SettingsState @Inject lateinit var context: Context @Inject lateinit var billingManager: BillingManager + @Inject lateinit var colors: Colors @Inject lateinit var dateFormatter: DateFormatter @Inject lateinit var navigator: Navigator @Inject lateinit var nightModeManager: NightModeManager @@ -55,6 +57,9 @@ class SettingsViewModel : QkViewModel(SettingsState newState { it.copy(isDefaultSmsApp = isDefaultSmsApp) } } + disposables += colors.theme + .subscribe { color -> newState { it.copy(theme = color) } } + val nightModeLabels = context.resources.getStringArray(R.array.night_modes) disposables += prefs.nightMode.asObservable() .subscribe { nightMode -> diff --git a/presentation/src/main/res/layout/settings_activity.xml b/presentation/src/main/res/layout/settings_activity.xml index 84130fe2..7d81fac2 100644 --- a/presentation/src/main/res/layout/settings_activity.xml +++ b/presentation/src/main/res/layout/settings_activity.xml @@ -77,7 +77,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:icon="@drawable/ic_color_lens_black_24dp" - app:title="@string/settings_theme_title" /> + app:title="@string/settings_theme_title" + app:widget="@layout/settings_theme_widget" /> + + + + + \ No newline at end of file