forked from upstream-mirrors/quik
Create QkDialog to simplify showing menus
This commit is contained in:
@@ -19,21 +19,17 @@
|
||||
package feature.notificationprefs
|
||||
|
||||
import android.app.Activity
|
||||
import android.app.AlertDialog
|
||||
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.LinearLayoutManager
|
||||
import android.support.v7.widget.RecyclerView
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.R
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.MenuItemAdapter
|
||||
import common.QkDialog
|
||||
import common.base.QkThemedActivity
|
||||
import common.util.extensions.dpToPx
|
||||
import common.util.extensions.setVisible
|
||||
import common.widget.PreferenceView
|
||||
import injection.appComponent
|
||||
@@ -45,11 +41,11 @@ import javax.inject.Inject
|
||||
|
||||
class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>(), NotificationPrefsView {
|
||||
|
||||
@Inject lateinit var notificationPreviewModeAdapter: MenuItemAdapter
|
||||
@Inject lateinit var previewModeDialog: QkDialog
|
||||
|
||||
override val viewModelClass = NotificationPrefsViewModel::class
|
||||
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
|
||||
override val notificationPreviewModeSelectedIntent by lazy { notificationPreviewModeAdapter.menuItemClicks }
|
||||
override val previewModeSelectedIntent by lazy { previewModeDialog.adapter.menuItemClicks }
|
||||
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
|
||||
|
||||
init {
|
||||
@@ -70,7 +66,8 @@ class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>()
|
||||
vibration.setVisible(!hasOreo)
|
||||
ringtone.setVisible(!hasOreo)
|
||||
|
||||
notificationPreviewModeAdapter.setData(R.array.notification_preview_options)
|
||||
previewModeDialog.setTitle(R.string.settings_notification_previews_title)
|
||||
previewModeDialog.adapter.setData(R.array.notification_preview_options)
|
||||
|
||||
colors.background
|
||||
.autoDisposable(scope())
|
||||
@@ -101,21 +98,7 @@ class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>()
|
||||
qkreplyTapDismiss.checkbox.isChecked = state.qkReplyTapDismiss
|
||||
}
|
||||
|
||||
override fun showNotificationPreviewModeDialog() {
|
||||
val recyclerView = RecyclerView(this)
|
||||
recyclerView.layoutManager = LinearLayoutManager(this)
|
||||
recyclerView.adapter = notificationPreviewModeAdapter
|
||||
recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this))
|
||||
|
||||
val dialog = AlertDialog.Builder(this)
|
||||
.setView(recyclerView)
|
||||
.create()
|
||||
.apply { show() }
|
||||
|
||||
notificationPreviewModeAdapter.menuItemClicks
|
||||
.autoDisposable(scope())
|
||||
.subscribe { dialog.dismiss() }
|
||||
}
|
||||
override fun showPreviewModeDialog() = previewModeDialog.show(this)
|
||||
|
||||
override fun showRingtonePicker(default: Uri) {
|
||||
val intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER)
|
||||
|
||||
@@ -27,9 +27,9 @@ import io.reactivex.subjects.Subject
|
||||
interface NotificationPrefsView : QkView<NotificationPrefsState> {
|
||||
|
||||
val preferenceClickIntent: Subject<PreferenceView>
|
||||
val notificationPreviewModeSelectedIntent: Subject<Int>
|
||||
val previewModeSelectedIntent: Subject<Int>
|
||||
val ringtoneSelectedIntent: Observable<String>
|
||||
|
||||
fun showNotificationPreviewModeDialog()
|
||||
fun showPreviewModeDialog()
|
||||
fun showRingtonePicker(default: Uri)
|
||||
}
|
||||
|
||||
@@ -97,7 +97,7 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefs
|
||||
|
||||
R.id.notifications -> notifications.set(!notifications.get())
|
||||
|
||||
R.id.notificationPreviews -> view.showNotificationPreviewModeDialog()
|
||||
R.id.notificationPreviews -> view.showPreviewModeDialog()
|
||||
|
||||
R.id.vibration -> vibration.set(!vibration.get())
|
||||
|
||||
@@ -109,7 +109,7 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefs
|
||||
}
|
||||
}
|
||||
|
||||
view.notificationPreviewModeSelectedIntent
|
||||
view.previewModeSelectedIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { prefs.notificationPreviews().set(it) }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user