From 22cb4e151f7cdc5a916c3eb70b2177473d1858ff Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 3 Dec 2017 23:56:56 -0500 Subject: [PATCH] Created custom view to handle preferences better with MVI --- .../presentation/settings/SettingsActivity.kt | 29 +++++++------ .../presentation/settings/SettingsFragment.kt | 40 ------------------ .../presentation/settings/SettingsView.kt | 12 ++---- .../settings/SettingsViewModel.kt | 16 +++----- .../QKSMS/presentation/view/PreferenceView.kt | 41 +++++++++++++++++++ qksms/src/main/res/layout/preference_view.xml | 37 +++++++++++++++++ .../src/main/res/layout/settings_activity.xml | 38 ++++++++++++++++- qksms/src/main/res/values/attrs.xml | 11 +++++ qksms/src/main/res/xml/settings.xml | 17 -------- 9 files changed, 151 insertions(+), 90 deletions(-) delete mode 100644 qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsFragment.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/presentation/view/PreferenceView.kt create mode 100644 qksms/src/main/res/layout/preference_view.xml create mode 100644 qksms/src/main/res/values/attrs.xml delete mode 100644 qksms/src/main/res/xml/settings.xml diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt index eb85223d..bf12e3b8 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt @@ -5,24 +5,23 @@ import android.app.ProgressDialog import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView +import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.presentation.base.QkActivity +import com.moez.QKSMS.presentation.view.PreferenceView +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.settings_activity.* class SettingsActivity : QkActivity(), SettingsView { override val viewModelClass = SettingsViewModel::class - override val preferencesAddedIntent by lazy { fragment.preferencesAdded } - override val preferenceClickIntent by lazy { fragment.preferenceClicks } - override val preferenceChangeIntent by lazy { fragment.preferenceChanges } + override val preferenceClickIntent: Subject = PublishSubject.create() override val themeSelectedIntent by lazy { themeAdapter.colorSelected } - private val fragment by lazy { - fragmentManager.findFragmentById(fragmentFrame.id) as? SettingsFragment ?: SettingsFragment() - } - - private val progressDialog by lazy { // TODO remove this + private val progressDialog by lazy { + // TODO remove this ProgressDialog(this).apply { isIndeterminate = true setCancelable(false) @@ -59,9 +58,15 @@ class SettingsActivity : QkActivity(), SettingsView { supportActionBar?.setDisplayHomeAsUpEnabled(true) viewModel.bindView(this) - fragmentManager.beginTransaction() - .replace(fragmentFrame.id, fragment) - .commit() + // Listen to clicks for all of the preferences + (0 until preferences.childCount) + .map { index -> preferences.getChildAt(index) } + .filter { view -> view is PreferenceView } + .forEach { preference -> + preference.clicks().subscribe { + preferenceClickIntent.onNext(preference as PreferenceView) + } + } } override fun render(state: SettingsState) { @@ -71,7 +76,7 @@ class SettingsActivity : QkActivity(), SettingsView { if (themeDialog.isShowing && !state.selectingTheme) themeDialog.dismiss() else if (!themeDialog.isShowing && state.selectingTheme) themeDialog.show() - fragment.preferenceManager?.findPreference("defaultSms")?.setSummary(when (state.isDefaultSmsApp) { + defaultSms.summary = getString(when (state.isDefaultSmsApp) { true -> R.string.settings_default_sms_summary_true else -> R.string.settings_default_sms_summary_false }) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsFragment.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsFragment.kt deleted file mode 100644 index d5f8c6f7..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsFragment.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.moez.QKSMS.presentation.settings - -import android.os.Bundle -import android.preference.Preference -import android.preference.PreferenceFragment -import com.moez.QKSMS.R -import io.reactivex.subjects.PublishSubject -import io.reactivex.subjects.Subject - -class SettingsFragment : PreferenceFragment() { - - val preferencesAdded: Subject = PublishSubject.create() - val preferenceClicks: Subject = PublishSubject.create() - val preferenceChanges: Subject = PublishSubject.create() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - addPreferencesFromResource(R.xml.settings) - - preferencesAdded.onNext(Unit) - - val clickListener = Preference.OnPreferenceClickListener { - preferenceClicks.onNext(it) - true - } - - val changeListener = Preference.OnPreferenceChangeListener { preference, newValue -> - preferenceChanges.onNext(PreferenceChange(preference, newValue)) - true - } - - (0 until preferenceScreen.preferenceCount) - .map { index -> preferenceScreen.getPreference(index) } - .forEach { preference -> - preference.onPreferenceClickListener = clickListener - preference.onPreferenceChangeListener = changeListener - } - } - -} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt index c166ead0..880e364a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt @@ -1,17 +1,11 @@ package com.moez.QKSMS.presentation.settings -import android.preference.Preference import com.moez.QKSMS.presentation.base.QkView +import com.moez.QKSMS.presentation.view.PreferenceView import io.reactivex.Observable +import io.reactivex.subjects.Subject interface SettingsView : QkView { - - val preferencesAddedIntent: Observable - val preferenceClickIntent: Observable - val preferenceChangeIntent: Observable - + val preferenceClickIntent: Subject val themeSelectedIntent: Observable - } - -data class PreferenceChange(val preference: Preference, val newValue: Any) \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt index 66bf4610..f8c7f4a5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.provider.Telephony import com.f2prateek.rx.preferences2.RxSharedPreferences +import com.moez.QKSMS.R import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.domain.interactor.FullSync import com.moez.QKSMS.presentation.base.QkViewModel @@ -32,16 +33,11 @@ class SettingsViewModel : QkViewModel(SettingsState override fun bindView(view: SettingsView) { super.bindView(view) - // Force update the view once we receive notification that the fragment's preference view has been created - intents += view.preferencesAddedIntent.subscribe { - newState { it.copy() } - } - intents += view.preferenceClickIntent.subscribe { - Timber.v("Preference click: ${it.key}") + Timber.v("Preference click: ${context.resources.getResourceName(it.id)}") - when (it.key) { - "defaultSms" -> { + when (it.id) { + R.id.defaultSms -> { val intent = Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT) if (Telephony.Sms.getDefaultSmsPackage(context) != context.packageName) { intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, context.packageName) @@ -49,11 +45,11 @@ class SettingsViewModel : QkViewModel(SettingsState context.startActivity(intent) } - "theme" -> { + R.id.theme -> { newState { it.copy(selectingTheme = true) } } - "sync" -> { + R.id.sync -> { newState { it.copy(syncing = true) } fullSync.execute(Unit, { newState { it.copy(syncing = false) } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/PreferenceView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/PreferenceView.kt new file mode 100644 index 00000000..94af0fa0 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/PreferenceView.kt @@ -0,0 +1,41 @@ +package com.moez.QKSMS.presentation.view + +import android.content.Context +import android.support.v7.widget.LinearLayoutCompat +import android.util.AttributeSet +import android.view.View +import com.moez.QKSMS.R +import com.moez.QKSMS.common.util.extensions.setVisible +import kotlinx.android.synthetic.main.preference_view.view.* + +class PreferenceView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) + : LinearLayoutCompat(context, attrs) { + + var title: String? = null + set(value) { + field = value + titleView.text = value + } + + var summary: String? = null + set(value) { + field = value + summaryView.text = value + summaryView.setVisible(value?.isNotEmpty() == true) + } + + init { + View.inflate(context, R.layout.preference_view, this) + setBackgroundResource(R.drawable.ripple) + + context.obtainStyledAttributes(attrs, R.styleable.PreferenceView)?.run { + title = getString(R.styleable.PreferenceView_title) + summary = getString(R.styleable.PreferenceView_summary) + getResourceId(R.styleable.PreferenceView_widget, -1).takeIf { it != -1 }?.run { + View.inflate(context, this, widgetFrame) + } + recycle() + } + } + +} \ No newline at end of file diff --git a/qksms/src/main/res/layout/preference_view.xml b/qksms/src/main/res/layout/preference_view.xml new file mode 100644 index 00000000..415f0e5a --- /dev/null +++ b/qksms/src/main/res/layout/preference_view.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/settings_activity.xml b/qksms/src/main/res/layout/settings_activity.xml index 3b9a780e..3521826a 100644 --- a/qksms/src/main/res/layout/settings_activity.xml +++ b/qksms/src/main/res/layout/settings_activity.xml @@ -1,5 +1,6 @@ @@ -7,9 +8,42 @@ + android:layout_height="0dp" + android:layout_weight="1"> + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/xml/settings.xml b/qksms/src/main/res/xml/settings.xml deleted file mode 100644 index e870a85a..00000000 --- a/qksms/src/main/res/xml/settings.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - \ No newline at end of file