mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
Add confirmation dialogs for starting and stopping restore
This commit is contained in:
@@ -0,0 +1,35 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* This file is part of QKSMS.
|
||||
*
|
||||
* QKSMS is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* QKSMS is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.moez.QKSMS.common.util.extensions
|
||||
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import io.reactivex.subjects.Subject
|
||||
|
||||
fun AlertDialog.Builder.setPositiveButton(@StringRes textId: Int, subject: Subject<Unit>): AlertDialog.Builder {
|
||||
return setPositiveButton(textId) { _, _ -> subject.onNext(Unit) }
|
||||
}
|
||||
|
||||
fun AlertDialog.Builder.setNegativeButton(@StringRes textId: Int, subject: Subject<Unit>): AlertDialog.Builder {
|
||||
return setNegativeButton(textId) { _, _ -> subject.onNext(Unit) }
|
||||
}
|
||||
|
||||
fun AlertDialog.Builder.setNeutralButton(@StringRes textId: Int, subject: Subject<Unit>): AlertDialog.Builder {
|
||||
return setNeutralButton(textId) { _, _ -> subject.onNext(Unit) }
|
||||
}
|
||||
@@ -18,9 +18,9 @@
|
||||
*/
|
||||
package com.moez.QKSMS.feature.backup
|
||||
|
||||
import android.app.AlertDialog
|
||||
import android.graphics.Typeface
|
||||
import android.view.View
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.core.view.children
|
||||
import androidx.core.view.isVisible
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
@@ -29,12 +29,15 @@ import com.moez.QKSMS.common.base.QkController
|
||||
import com.moez.QKSMS.common.util.DateFormatter
|
||||
import com.moez.QKSMS.common.util.extensions.getLabel
|
||||
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||
import com.moez.QKSMS.common.util.extensions.setPositiveButton
|
||||
import com.moez.QKSMS.common.util.extensions.setTint
|
||||
import com.moez.QKSMS.common.widget.PreferenceView
|
||||
import com.moez.QKSMS.injection.appComponent
|
||||
import com.moez.QKSMS.model.BackupFile
|
||||
import com.moez.QKSMS.repository.BackupRepository
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.backup_controller.*
|
||||
import kotlinx.android.synthetic.main.backup_list_dialog.view.*
|
||||
import kotlinx.android.synthetic.main.preference_view.view.*
|
||||
@@ -46,16 +49,37 @@ class BackupController : QkController<BackupView, BackupState, BackupPresenter>(
|
||||
@Inject lateinit var dateFormatter: DateFormatter
|
||||
@Inject override lateinit var presenter: BackupPresenter
|
||||
|
||||
private val dialog by lazy {
|
||||
private val confirmRestoreSubject: Subject<Unit> = PublishSubject.create()
|
||||
private val stopRestoreSubject: Subject<Unit> = PublishSubject.create()
|
||||
|
||||
private val backupFilesDialog by lazy {
|
||||
val view = View.inflate(activity, R.layout.backup_list_dialog, null)
|
||||
.apply { files.adapter = adapter.apply { emptyView = empty } }
|
||||
|
||||
AlertDialog.Builder(activity)
|
||||
AlertDialog.Builder(activity!!)
|
||||
.setView(view)
|
||||
.setCancelable(true)
|
||||
.create()
|
||||
}
|
||||
|
||||
private val confirmRestoreDialog by lazy {
|
||||
AlertDialog.Builder(activity!!)
|
||||
.setTitle(R.string.backup_restore_confirm_title)
|
||||
.setMessage(R.string.backup_restore_confirm_message)
|
||||
.setPositiveButton(R.string.backup_restore_title, confirmRestoreSubject)
|
||||
.setNegativeButton(R.string.button_cancel, null)
|
||||
.create()
|
||||
}
|
||||
|
||||
private val stopRestoreDialog by lazy {
|
||||
AlertDialog.Builder(activity!!)
|
||||
.setTitle(R.string.backup_restore_stop_title)
|
||||
.setMessage(R.string.backup_restore_stop_message)
|
||||
.setPositiveButton(R.string.button_stop, stopRestoreSubject)
|
||||
.setNegativeButton(R.string.button_cancel, null)
|
||||
.create()
|
||||
}
|
||||
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
layoutRes = R.layout.backup_controller
|
||||
@@ -138,10 +162,20 @@ class BackupController : QkController<BackupView, BackupState, BackupPresenter>(
|
||||
override fun restoreClicks(): Observable<*> = restore.clicks()
|
||||
|
||||
override fun restoreFileSelected(): Observable<BackupFile> = adapter.backupSelected
|
||||
.doOnNext { dialog.dismiss() }
|
||||
.doOnNext { backupFilesDialog.dismiss() }
|
||||
|
||||
override fun restoreConfirmed(): Observable<*> = confirmRestoreSubject
|
||||
|
||||
override fun stopRestoreClicks(): Observable<*> = progressCancel.clicks()
|
||||
|
||||
override fun stopRestoreConfirmed(): Observable<*> = stopRestoreSubject
|
||||
|
||||
override fun fabClicks(): Observable<*> = fab.clicks()
|
||||
|
||||
override fun selectFile() = dialog.show()
|
||||
override fun selectFile() = backupFilesDialog.show()
|
||||
|
||||
override fun confirmRestore() = confirmRestoreDialog.show()
|
||||
|
||||
override fun stopRestore() = stopRestoreDialog.show()
|
||||
|
||||
}
|
||||
@@ -89,9 +89,22 @@ class BackupPresenter @Inject constructor(
|
||||
.subscribe()
|
||||
|
||||
view.restoreFileSelected()
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { view.confirmRestore() }
|
||||
|
||||
view.restoreConfirmed()
|
||||
.withLatestFrom(view.restoreFileSelected()) { _, backup -> backup }
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { backup -> RestoreBackupService.start(context, backup.path) }
|
||||
|
||||
view.stopRestoreClicks()
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { view.stopRestore() }
|
||||
|
||||
view.stopRestoreConfirmed()
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
|
||||
view.fabClicks()
|
||||
.withLatestFrom(billingManager.upgradeStatus) { _, upgraded -> upgraded }
|
||||
.autoDisposable(view.scope())
|
||||
|
||||
@@ -26,8 +26,13 @@ interface BackupView : QkViewContract<BackupState> {
|
||||
|
||||
fun restoreClicks(): Observable<*>
|
||||
fun restoreFileSelected(): Observable<BackupFile>
|
||||
fun restoreConfirmed(): Observable<*>
|
||||
fun stopRestoreClicks(): Observable<*>
|
||||
fun stopRestoreConfirmed(): Observable<*>
|
||||
fun fabClicks(): Observable<*>
|
||||
|
||||
fun selectFile()
|
||||
fun confirmRestore()
|
||||
fun stopRestore()
|
||||
|
||||
}
|
||||
@@ -156,6 +156,10 @@
|
||||
<string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
|
||||
<string name="backup_restore_error_backup">Backup in progress…</string>
|
||||
<string name="backup_restore_error_restore">Restore in progress…</string>
|
||||
<string name="backup_restore_confirm_title">Restore from backup</string>
|
||||
<string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
|
||||
<string name="backup_restore_stop_title">Stop restore</string>
|
||||
<string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
|
||||
<string name="backup_restore_dialog_title">Backups</string>
|
||||
<string name="backup_restore_dialog_summary" translatable="false">/QKSMS/Backups</string>
|
||||
<string name="backup_restore_dialog_empty">No backups found</string>
|
||||
@@ -314,6 +318,7 @@
|
||||
<string name="button_cancel">Cancel</string>
|
||||
<string name="button_delete">Delete</string>
|
||||
<string name="button_save">Save</string>
|
||||
<string name="button_stop">Stop</string>
|
||||
<string name="button_more">More</string>
|
||||
<string name="button_set">Set</string>
|
||||
<string name="button_unblock">Unblock</string>
|
||||
|
||||
Reference in New Issue
Block a user