Implement notifications preference

This commit is contained in:
Moez Bhatti
2018-01-04 01:37:02 -05:00
parent f02bdde618
commit b77e87ea85
4 changed files with 40 additions and 10 deletions
@@ -18,8 +18,12 @@
*/
package presentation.feature.settings
import android.app.Activity
import android.app.AlertDialog
import android.app.ProgressDialog
import android.content.Intent
import android.media.RingtoneManager
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.support.v7.widget.RecyclerView
@@ -29,20 +33,21 @@ import com.moez.QKSMS.R
import common.di.appComponent
import common.util.extensions.dpToPx
import common.util.extensions.setVisible
import presentation.common.base.QkActivity
import presentation.common.widget.PreferenceView
import io.reactivex.Observable
import io.reactivex.rxkotlin.plusAssign
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 presentation.common.base.QkActivity
import presentation.common.widget.PreferenceView
class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
override val viewModelClass = SettingsViewModel::class
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
override val themeSelectedIntent: Observable<Int> by lazy { themeAdapter.colorSelected }
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
// TODO remove this
private val progressDialog by lazy {
@@ -156,4 +161,21 @@ class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
mmsSize.summary = state.maxMmsSize
}
override fun showRingtonePicker(default: Uri) {
val intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, default)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION)
startActivityForResult(intent, 123)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == 123 && resultCode == Activity.RESULT_OK) {
val uri: Uri? = data?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
uri?.let { ringtoneSelectedIntent.onNext(uri.toString()) }
}
}
}
@@ -18,12 +18,17 @@
*/
package presentation.feature.settings
import presentation.common.base.QkView
import presentation.common.widget.PreferenceView
import android.net.Uri
import io.reactivex.Observable
import io.reactivex.subjects.Subject
import presentation.common.base.QkView
import presentation.common.widget.PreferenceView
interface SettingsView : QkView<SettingsState> {
val preferenceClickIntent: Subject<PreferenceView>
val themeSelectedIntent: Observable<Int>
val ringtoneSelectedIntent: Observable<String>
fun showRingtonePicker(default: Uri)
}
@@ -19,13 +19,14 @@
package presentation.feature.settings
import android.content.Context
import android.net.Uri
import com.moez.QKSMS.R
import common.di.appComponent
import common.util.Preferences
import interactor.FullSync
import io.reactivex.rxkotlin.plusAssign
import presentation.common.Navigator
import presentation.common.base.QkViewModel
import io.reactivex.rxkotlin.plusAssign
import timber.log.Timber
import javax.inject.Inject
@@ -61,9 +62,6 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
newState { it.copy(vibrationEnabled = vibrationEnabled) }
}
disposables += prefs.ringtone.asObservable().subscribe { ringtone ->
}
disposables += prefs.delivery.asObservable().subscribe { deliveryEnabled ->
newState { it.copy(deliveryEnabled = deliveryEnabled) }
}
@@ -108,8 +106,7 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
R.id.vibration -> prefs.vibration.set(!prefs.vibration.get())
R.id.ringtone -> {
}
R.id.ringtone -> view.showRingtonePicker(Uri.parse(prefs.ringtone.get()))
R.id.delivery -> prefs.delivery.set(!prefs.delivery.get())
@@ -135,5 +132,9 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
prefs.theme.set(color)
newState { it.copy(selectingTheme = false) }
}
intents += view.ringtoneSelectedIntent.subscribe { ringtone ->
prefs.ringtone.set(ringtone)
}
}
}