forked from upstream-mirrors/quik
Convert ThemePicker Activity to Controller
This commit is contained in:
@@ -21,6 +21,7 @@ import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||
import com.moez.QKSMS.common.util.extensions.setVisible
|
||||
import com.moez.QKSMS.common.widget.PreferenceView
|
||||
import com.moez.QKSMS.feature.settings.about.AboutController
|
||||
import com.moez.QKSMS.feature.themepicker.ThemePickerController
|
||||
import com.moez.QKSMS.injection.appComponent
|
||||
import com.moez.QKSMS.util.Preferences
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
@@ -60,30 +61,27 @@ class SettingsController : QkController<SettingsView, SettingsState, SettingsPre
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
retainViewMode = RetainViewMode.RETAIN_DETACH
|
||||
layoutRes = R.layout.settings_activity
|
||||
|
||||
colors.themeObservable()
|
||||
.autoDisposable(scope())
|
||||
.subscribe { activity?.recreate() }
|
||||
}
|
||||
|
||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View {
|
||||
return inflater.inflate(R.layout.settings_activity, container, false).apply {
|
||||
preferences.postDelayed({ preferences.animateLayoutChanges = true }, 100)
|
||||
|
||||
nightModeDialog.adapter.setData(R.array.night_modes)
|
||||
textSizeDialog.adapter.setData(R.array.text_sizes)
|
||||
sendDelayDialog.adapter.setData(R.array.delayed_sending_labels)
|
||||
mmsSizeDialog.adapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
|
||||
|
||||
about.summary = context.getString(R.string.settings_version, BuildConfig.VERSION_NAME)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onAttach(view: View) {
|
||||
super.onAttach(view)
|
||||
presenter.bindIntents(this)
|
||||
setTitle(R.string.title_settings)
|
||||
showBackButton(true)
|
||||
|
||||
preferences.postDelayed({ preferences.animateLayoutChanges = true }, 100)
|
||||
|
||||
nightModeDialog.adapter.setData(R.array.night_modes)
|
||||
textSizeDialog.adapter.setData(R.array.text_sizes)
|
||||
sendDelayDialog.adapter.setData(R.array.delayed_sending_labels)
|
||||
mmsSizeDialog.adapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
|
||||
|
||||
about.summary = context.getString(R.string.settings_version, BuildConfig.VERSION_NAME)
|
||||
}
|
||||
|
||||
override fun preferenceClicks(): Observable<PreferenceView> = (0 until preferences.childCount)
|
||||
@@ -168,10 +166,16 @@ class SettingsController : QkController<SettingsView, SettingsState, SettingsPre
|
||||
|
||||
override fun showMmsSizePicker() = mmsSizeDialog.show(activity!!)
|
||||
|
||||
override fun showThemePicker() {
|
||||
router.pushController(RouterTransaction.with(ThemePickerController())
|
||||
.pushChangeHandler(FadeChangeHandler(150))
|
||||
.popChangeHandler(FadeChangeHandler(150)))
|
||||
}
|
||||
|
||||
override fun showAbout() {
|
||||
router.pushController(RouterTransaction.with(AboutController())
|
||||
.pushChangeHandler(FadeChangeHandler())
|
||||
.popChangeHandler(FadeChangeHandler()))
|
||||
.pushChangeHandler(FadeChangeHandler(150))
|
||||
.popChangeHandler(FadeChangeHandler(150)))
|
||||
}
|
||||
|
||||
}
|
||||
@@ -97,7 +97,7 @@ class SettingsPresenter @Inject constructor(
|
||||
Timber.v("Preference click: ${context.resources.getResourceName(it.id)}")
|
||||
|
||||
when (it.id) {
|
||||
R.id.theme -> navigator.showThemePicker()
|
||||
R.id.theme -> view.showThemePicker()
|
||||
|
||||
R.id.night -> view.showNightModeDialog()
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@ import com.moez.QKSMS.common.widget.PreferenceView
|
||||
import io.reactivex.Observable
|
||||
|
||||
interface SettingsView : QkViewContract<SettingsState> {
|
||||
|
||||
fun preferenceClicks(): Observable<PreferenceView>
|
||||
fun viewQksmsPlusClicks(): Observable<*>
|
||||
fun nightModeSelected(): Observable<Int>
|
||||
@@ -40,5 +39,6 @@ interface SettingsView : QkViewContract<SettingsState> {
|
||||
fun showTextSizePicker()
|
||||
fun showDelayDurationDialog()
|
||||
fun showMmsSizePicker()
|
||||
fun showThemePicker()
|
||||
fun showAbout()
|
||||
}
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
package com.moez.QKSMS.feature.settings.about
|
||||
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.BuildConfig
|
||||
import com.moez.QKSMS.R
|
||||
@@ -11,7 +9,6 @@ import com.moez.QKSMS.common.widget.PreferenceView
|
||||
import com.moez.QKSMS.injection.appComponent
|
||||
import io.reactivex.Observable
|
||||
import kotlinx.android.synthetic.main.about_activity.*
|
||||
import kotlinx.android.synthetic.main.about_activity.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class AboutController : QkController<AboutView, Unit, AboutPresenter>(), AboutView {
|
||||
@@ -20,12 +17,7 @@ class AboutController : QkController<AboutView, Unit, AboutPresenter>(), AboutVi
|
||||
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
}
|
||||
|
||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View {
|
||||
return inflater.inflate(R.layout.about_activity, container, false).apply {
|
||||
version.summary = BuildConfig.VERSION_NAME
|
||||
}
|
||||
layoutRes = R.layout.about_activity
|
||||
}
|
||||
|
||||
override fun onAttach(view: View) {
|
||||
@@ -33,6 +25,8 @@ class AboutController : QkController<AboutView, Unit, AboutPresenter>(), AboutVi
|
||||
presenter.bindIntents(this)
|
||||
setTitle(R.string.about_title)
|
||||
showBackButton(true)
|
||||
|
||||
version.summary = BuildConfig.VERSION_NAME
|
||||
}
|
||||
|
||||
override fun preferenceClicks(): Observable<PreferenceView> = (0 until preferences.childCount)
|
||||
|
||||
Reference in New Issue
Block a user