From 8c008acd9c175240b65ed8bd70e8874d788fa5d2 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 1 Sep 2018 02:10:49 -0400 Subject: [PATCH] Add confirmation dialogs for starting and stopping restore --- .../util/extensions/DialogExtensions.kt | 35 +++++++++++++++ .../QKSMS/feature/backup/BackupController.kt | 44 ++++++++++++++++--- .../QKSMS/feature/backup/BackupPresenter.kt | 13 ++++++ .../moez/QKSMS/feature/backup/BackupView.kt | 5 +++ presentation/src/main/res/values/strings.xml | 5 +++ 5 files changed, 97 insertions(+), 5 deletions(-) create mode 100644 presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt new file mode 100644 index 00000000..cf8eff10 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * 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 . + */ +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): AlertDialog.Builder { + return setPositiveButton(textId) { _, _ -> subject.onNext(Unit) } +} + +fun AlertDialog.Builder.setNegativeButton(@StringRes textId: Int, subject: Subject): AlertDialog.Builder { + return setNegativeButton(textId) { _, _ -> subject.onNext(Unit) } +} + +fun AlertDialog.Builder.setNeutralButton(@StringRes textId: Int, subject: Subject): AlertDialog.Builder { + return setNeutralButton(textId) { _, _ -> subject.onNext(Unit) } +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt index 582f0dc7..926234ab 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt @@ -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( @Inject lateinit var dateFormatter: DateFormatter @Inject override lateinit var presenter: BackupPresenter - private val dialog by lazy { + private val confirmRestoreSubject: Subject = PublishSubject.create() + private val stopRestoreSubject: Subject = 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( override fun restoreClicks(): Observable<*> = restore.clicks() override fun restoreFileSelected(): Observable = 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() } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt index f5b69019..9906ce1b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt @@ -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()) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt index 2efc41e8..70cceeda 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt @@ -26,8 +26,13 @@ interface BackupView : QkViewContract { fun restoreClicks(): Observable<*> fun restoreFileSelected(): Observable + fun restoreConfirmed(): Observable<*> + fun stopRestoreClicks(): Observable<*> + fun stopRestoreConfirmed(): Observable<*> fun fabClicks(): Observable<*> fun selectFile() + fun confirmRestore() + fun stopRestore() } \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 9b514b90..c55a361e 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -156,6 +156,10 @@ Please unlock QKSMS+ to use backup and restore Backup in progress… Restore in progress… + Restore from backup + Are you sure you would like to restore your messages from this backup? + Stop restore + Messages that have already been restored will remain on your device Backups /QKSMS/Backups No backups found @@ -314,6 +318,7 @@ Cancel Delete Save + Stop More Set Unblock