From a06af741ae5ce1edfe41a3e576ca2dbe35f83ed2 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 1 Dec 2017 00:47:35 -0500 Subject: [PATCH] Show hint for Default SMS preference --- qksms/build.gradle | 1 + .../main/java/com/moez/QKSMS/common/di/AppModule.kt | 9 +++++++++ .../QKSMS/presentation/settings/SettingsActivity.kt | 6 ++++++ .../QKSMS/presentation/settings/SettingsFragment.kt | 8 ++++++-- .../QKSMS/presentation/settings/SettingsState.kt | 3 ++- .../QKSMS/presentation/settings/SettingsView.kt | 1 + .../presentation/settings/SettingsViewModel.kt | 13 +++++++++++++ .../QKSMS/receiver/DefaultSmsChangedReceiver.kt | 4 ++++ qksms/src/main/res/values/strings.xml | 2 ++ 9 files changed, 44 insertions(+), 3 deletions(-) diff --git a/qksms/build.gradle b/qksms/build.gradle index 25e1a735..7a6d7bf5 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -40,6 +40,7 @@ dependencies { compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'com.android.support:design:26.1.0' compile 'com.bugsnag:bugsnag-android:4.1.1' + compile 'com.f2prateek.rx.preferences2:rx-preferences:2.0.0-RC3' compile 'com.github.bumptech.glide:glide:4.3.0' compile 'com.google.android:flexbox:0.3.1' compile "com.google.dagger:dagger:2.11" diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt b/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt index b8f89149..7d39a773 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt @@ -2,6 +2,8 @@ package com.moez.QKSMS.common.di import android.app.Application import android.content.Context +import android.preference.PreferenceManager +import com.f2prateek.rx.preferences2.RxSharedPreferences import dagger.Module import dagger.Provides import javax.inject.Singleton @@ -15,4 +17,11 @@ class AppModule(private var application: Application) { return application } + @Provides + @Singleton + fun provideRxPreferences(context: Context) : RxSharedPreferences { + val preferences = PreferenceManager.getDefaultSharedPreferences(context) + return RxSharedPreferences.create(preferences) + } + } \ No newline at end of file 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 afe80c87..e89a95e7 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 @@ -10,6 +10,7 @@ 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 } @@ -39,6 +40,11 @@ class SettingsActivity : QkActivity(), SettingsView { override fun render(state: SettingsState) { if (progressDialog.isShowing && !state.syncing) progressDialog.hide() else if (!progressDialog.isShowing && state.syncing) progressDialog.show() + + fragment.preferenceManager?.findPreference("defaultSms")?.setSummary(when (state.isDefaultSmsApp) { + true -> R.string.settings_default_sms_summary_true + else -> R.string.settings_default_sms_summary_false + }) } } \ No newline at end of file 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 index 2999907b..d5f8c6f7 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsFragment.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsFragment.kt @@ -5,16 +5,20 @@ 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 preferenceClicks: PublishSubject = PublishSubject.create() - val preferenceChanges: PublishSubject = PublishSubject.create() + 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 diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt index 235d7e47..f65fb129 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt @@ -1,5 +1,6 @@ package com.moez.QKSMS.presentation.settings data class SettingsState( - val syncing: Boolean = false + val syncing: Boolean = false, + val isDefaultSmsApp: Boolean = false ) \ 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 322c0f5c..f94db9d9 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 @@ -6,6 +6,7 @@ import io.reactivex.Observable interface SettingsView : QkView { + val preferencesAddedIntent: Observable val preferenceClickIntent: Observable val preferenceChangeIntent: Observable 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 e2f777c3..4b017f9a 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 @@ -3,6 +3,7 @@ package com.moez.QKSMS.presentation.settings import android.content.Context import android.content.Intent import android.provider.Telephony +import com.f2prateek.rx.preferences2.RxSharedPreferences import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.domain.interactor.FullSync import com.moez.QKSMS.presentation.base.QkViewModel @@ -13,17 +14,29 @@ import javax.inject.Inject class SettingsViewModel : QkViewModel(SettingsState()) { @Inject lateinit var context: Context + @Inject lateinit var prefs: RxSharedPreferences @Inject lateinit var fullSync: FullSync init { AppComponentManager.appComponent.inject(this) disposables += fullSync + + disposables += prefs.getBoolean("defaultSms") + .asObservable() + .subscribe { isDefaultSmsApp -> + newState { it.copy(isDefaultSmsApp = isDefaultSmsApp) } + } } 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}") diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt index fe269fb6..9d5287af 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt @@ -6,6 +6,7 @@ import android.content.Intent import android.os.Build import android.provider.Telephony import android.support.annotation.RequiresApi +import com.f2prateek.rx.preferences2.RxSharedPreferences import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.domain.interactor.PartialSync import javax.inject.Inject @@ -13,12 +14,15 @@ import javax.inject.Inject class DefaultSmsChangedReceiver : BroadcastReceiver() { @Inject lateinit var partialSync: PartialSync + @Inject lateinit var prefs: RxSharedPreferences @RequiresApi(Build.VERSION_CODES.N) override fun onReceive(context: Context, intent: Intent) { AppComponentManager.appComponent.inject(this) val isDefaultSmsApp = intent.getBooleanExtra(Telephony.Sms.Intents.EXTRA_IS_DEFAULT_SMS_APP, false) + prefs.getBoolean("defaultSms").set(isDefaultSmsApp) + if (isDefaultSmsApp) { val pendingResult = goAsync() partialSync.execute(Unit, { pendingResult.finish() }) diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index fec1faa1..4d11d3ce 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -16,6 +16,8 @@ Settings Default SMS app + QKSMS is your default SMS app + Set QKSMS as your default SMS app Sync messages Re-sync your messages with the native Android SMS database