mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
Display progress when backing up or restoring
This commit is contained in:
@@ -22,6 +22,7 @@ import android.app.AlertDialog
|
||||
import android.graphics.Typeface
|
||||
import android.view.View
|
||||
import androidx.core.view.children
|
||||
import androidx.core.view.isVisible
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.base.QkController
|
||||
@@ -31,6 +32,7 @@ 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.Backup
|
||||
import com.moez.QKSMS.repository.BackupRepository
|
||||
import io.reactivex.Observable
|
||||
import kotlinx.android.synthetic.main.backup_controller.*
|
||||
import kotlinx.android.synthetic.main.backup_list_dialog.view.*
|
||||
@@ -82,6 +84,35 @@ class BackupController : QkController<BackupView, BackupState, BackupPresenter>(
|
||||
}
|
||||
|
||||
override fun render(state: BackupState) {
|
||||
when {
|
||||
state.backupProgress is BackupRepository.Progress.Running -> {
|
||||
progressIcon.setImageResource(R.drawable.ic_file_upload_black_24dp)
|
||||
progressTitle.setText(R.string.backup_backing_up)
|
||||
progressSummary.text = state.backupProgress.status
|
||||
progressSummary.isVisible = progressSummary.text.isNotEmpty()
|
||||
progressBar.isIndeterminate = state.backupProgress.progress == 0
|
||||
progressBar.progress = state.backupProgress.progress
|
||||
progress.isVisible = true
|
||||
fab.isVisible = false
|
||||
}
|
||||
|
||||
state.restoreProgress is BackupRepository.Progress.Running -> {
|
||||
progressIcon.setImageResource(R.drawable.ic_file_download_black_24dp)
|
||||
progressTitle.setText(R.string.backup_restoring)
|
||||
progressSummary.text = state.restoreProgress.status
|
||||
progressSummary.isVisible = progressSummary.text.isNotEmpty()
|
||||
progressBar.isIndeterminate = state.restoreProgress.progress == 0
|
||||
progressBar.progress = state.restoreProgress.progress
|
||||
progress.isVisible = true
|
||||
fab.isVisible = false
|
||||
}
|
||||
|
||||
else -> {
|
||||
progress.isVisible = false
|
||||
fab.isVisible = true
|
||||
}
|
||||
}
|
||||
|
||||
backup.summary = when (state.lastBackup) {
|
||||
null -> activity?.getString(R.string.backup_never)
|
||||
else -> dateFormatter.getDetailedTimestamp(state.lastBackup)
|
||||
@@ -105,6 +136,7 @@ class BackupController : QkController<BackupView, BackupState, BackupPresenter>(
|
||||
override fun restoreClicks(): Observable<*> = restore.clicks()
|
||||
|
||||
override fun restoreFileSelected(): Observable<Backup> = adapter.backupSelected
|
||||
.doOnNext { dialog.dismiss() }
|
||||
|
||||
override fun fabClicks(): Observable<*> = fab.clicks()
|
||||
|
||||
|
||||
@@ -21,6 +21,8 @@ package com.moez.QKSMS.feature.backup
|
||||
import com.moez.QKSMS.common.Navigator
|
||||
import com.moez.QKSMS.common.base.QkPresenter
|
||||
import com.moez.QKSMS.common.util.BillingManager
|
||||
import com.moez.QKSMS.interactor.PerformBackup
|
||||
import com.moez.QKSMS.interactor.PerformRestore
|
||||
import com.moez.QKSMS.repository.BackupRepository
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
@@ -30,10 +32,18 @@ import javax.inject.Inject
|
||||
class BackupPresenter @Inject constructor(
|
||||
backupRepo: BackupRepository,
|
||||
private val billingManager: BillingManager,
|
||||
private val navigator: Navigator
|
||||
private val navigator: Navigator,
|
||||
private val performBackup: PerformBackup,
|
||||
private val performRestore: PerformRestore
|
||||
) : QkPresenter<BackupView, BackupState>(BackupState()) {
|
||||
|
||||
init {
|
||||
disposables += backupRepo.getBackupProgress()
|
||||
.subscribe { progress -> newState { copy(backupProgress = progress) } }
|
||||
|
||||
disposables += backupRepo.getRestoreProgress()
|
||||
.subscribe { progress -> newState { copy(restoreProgress = progress) } }
|
||||
|
||||
disposables += backupRepo.getBackups()
|
||||
.subscribe { backups -> newState { copy(lastBackup = backups.map { it.date }.max(), backups = backups) } }
|
||||
|
||||
@@ -50,14 +60,14 @@ class BackupPresenter @Inject constructor(
|
||||
|
||||
view.restoreFileSelected()
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
.subscribe { performRestore.execute(Unit) }
|
||||
|
||||
view.fabClicks()
|
||||
.withLatestFrom(billingManager.upgradeStatus) { _, upgraded -> upgraded }
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { upgraded ->
|
||||
when (upgraded) {
|
||||
true -> navigator.showQksmsPlusActivity("backup_fab")
|
||||
true -> performBackup.execute(Unit)
|
||||
false -> navigator.showQksmsPlusActivity("backup_fab")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,9 +19,12 @@
|
||||
package com.moez.QKSMS.feature.backup
|
||||
|
||||
import com.moez.QKSMS.model.Backup
|
||||
import com.moez.QKSMS.repository.BackupRepository
|
||||
|
||||
data class BackupState(
|
||||
val upgraded: Boolean = false,
|
||||
val backupProgress: BackupRepository.Progress = BackupRepository.Progress.Idle(),
|
||||
val restoreProgress: BackupRepository.Progress = BackupRepository.Progress.Idle(),
|
||||
val lastBackup: Long? = null,
|
||||
val backups: List<Backup> = listOf()
|
||||
val backups: List<Backup> = listOf(),
|
||||
val upgraded: Boolean = false
|
||||
)
|
||||
Reference in New Issue
Block a user