diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index 315ea3ab..e3761422 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -45,7 +45,7 @@ - + @@ -38,16 +36,8 @@ class ConversationsViewModel : QkViewModel(), SettingsView { - - override val viewModelClass = SettingsViewModel::class - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.settings_activity) - setTitle(R.string.title_settings) - supportActionBar?.setDisplayHomeAsUpEnabled(true) - viewModel.setView(this) - } - - override fun render(state: SettingsState) { - } - -} \ 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 new file mode 100644 index 00000000..d959f16a --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt @@ -0,0 +1,42 @@ +package com.moez.QKSMS.presentation.settings + +import android.app.ProgressDialog +import android.os.Bundle +import com.moez.QKSMS.R +import com.moez.QKSMS.presentation.base.QkActivity +import kotlinx.android.synthetic.main.settings_activity.* + +class SettingsActivity : QkActivity(), SettingsView { + + override val viewModelClass = SettingsViewModel::class + override val preferenceClickIntent by lazy { fragment.preferenceClicks } + override val preferenceChangeIntent by lazy { fragment.preferenceChanges } + + private lateinit var fragment: SettingsFragment + private lateinit var progressDialog: ProgressDialog // TODO remove this + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.settings_activity) + setTitle(R.string.title_settings) + supportActionBar?.setDisplayHomeAsUpEnabled(true) + + progressDialog = ProgressDialog(this) + progressDialog.isIndeterminate = true + progressDialog.setCancelable(false) + progressDialog.setCanceledOnTouchOutside(false) + + fragment = fragmentManager.findFragmentById(fragmentFrame.id) as? SettingsFragment ?: SettingsFragment() + viewModel.setView(this) + + fragmentManager.beginTransaction() + .replace(fragmentFrame.id, fragment) + .commit() + } + + override fun render(state: SettingsState) { + if (progressDialog.isShowing && !state.syncing) progressDialog.hide() + else if (!progressDialog.isShowing && state.syncing) progressDialog.show() + } + +} \ 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 new file mode 100644 index 00000000..2999907b --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsFragment.kt @@ -0,0 +1,36 @@ +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 + +class SettingsFragment : PreferenceFragment() { + + val preferenceClicks: PublishSubject = PublishSubject.create() + val preferenceChanges: PublishSubject = PublishSubject.create() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + addPreferencesFromResource(R.xml.settings) + + 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/SettingsState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt index 1d863361..235d7e47 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,5 @@ package com.moez.QKSMS.presentation.settings data class SettingsState( - val ignored: String = "" + val syncing: 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 30e7af8b..322c0f5c 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,7 +1,14 @@ package com.moez.QKSMS.presentation.settings +import android.preference.Preference import com.moez.QKSMS.presentation.base.QkView +import io.reactivex.Observable interface SettingsView : QkView { -} \ No newline at end of file + val preferenceClickIntent: Observable + val preferenceChangeIntent: 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 4dcdcfff..e9f913d6 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 @@ -1,7 +1,38 @@ package com.moez.QKSMS.presentation.settings +import com.moez.QKSMS.common.di.AppComponentManager +import com.moez.QKSMS.domain.interactor.SyncConversations import com.moez.QKSMS.presentation.base.QkViewModel +import timber.log.Timber +import javax.inject.Inject class SettingsViewModel : QkViewModel(SettingsState()) { + @Inject lateinit var syncConversations: SyncConversations + + init { + AppComponentManager.appComponent.inject(this) + } + + override fun bindIntents(view: SettingsView) { + super.bindIntents(view) + + view.preferenceClickIntent.subscribe { + Timber.v("Preference click: ${it.key}") + + when (it.key) { + "sync" -> { + newState { it.copy(syncing = true) } + syncConversations.execute(Unit, { + newState { it.copy(syncing = false) } + }) + } + } + } + } + + override fun onCleared() { + super.onCleared() + syncConversations.dispose() + } } \ No newline at end of file diff --git a/qksms/src/main/res/layout/conversation_list_activity.xml b/qksms/src/main/res/layout/conversation_list_activity.xml index b76501fb..b17d4954 100644 --- a/qksms/src/main/res/layout/conversation_list_activity.xml +++ b/qksms/src/main/res/layout/conversation_list_activity.xml @@ -19,22 +19,15 @@ android:layout_height="0dp" android:layout_weight="1"> - - - - - + android:layout_height="match_parent" + android:clipChildren="false" + android:clipToPadding="false" + android:paddingBottom="8dp" + android:paddingTop="8dp" + tools:listitem="@layout/conversation_list_item" /> - + android:layout_height="match_parent"> + + + + \ No newline at end of file diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index 519862ab..bc88ad48 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -11,6 +11,9 @@ Blocked Settings + Sync messages + Re-sync your messages with the native Android SMS database + Reply Mark read diff --git a/qksms/src/main/res/xml/settings.xml b/qksms/src/main/res/xml/settings.xml new file mode 100644 index 00000000..2e90f512 --- /dev/null +++ b/qksms/src/main/res/xml/settings.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file