forked from upstream-mirrors/quik
Show date of last backup
This commit is contained in:
@@ -19,22 +19,28 @@
|
|||||||
package com.moez.QKSMS.feature.backup
|
package com.moez.QKSMS.feature.backup
|
||||||
|
|
||||||
import android.app.AlertDialog
|
import android.app.AlertDialog
|
||||||
|
import android.graphics.Typeface
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
import androidx.core.view.children
|
||||||
import com.jakewharton.rxbinding2.view.clicks
|
import com.jakewharton.rxbinding2.view.clicks
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.common.base.QkController
|
import com.moez.QKSMS.common.base.QkController
|
||||||
|
import com.moez.QKSMS.common.util.DateFormatter
|
||||||
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||||
import com.moez.QKSMS.common.util.extensions.setTint
|
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.injection.appComponent
|
||||||
import com.moez.QKSMS.model.Backup
|
import com.moez.QKSMS.model.Backup
|
||||||
import io.reactivex.Observable
|
import io.reactivex.Observable
|
||||||
import kotlinx.android.synthetic.main.backup_controller.*
|
import kotlinx.android.synthetic.main.backup_controller.*
|
||||||
import kotlinx.android.synthetic.main.backup_list_dialog.view.*
|
import kotlinx.android.synthetic.main.backup_list_dialog.view.*
|
||||||
|
import kotlinx.android.synthetic.main.preference_view.view.*
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class BackupController : QkController<BackupView, BackupState, BackupPresenter>(), BackupView {
|
class BackupController : QkController<BackupView, BackupState, BackupPresenter>(), BackupView {
|
||||||
|
|
||||||
@Inject lateinit var adapter: BackupAdapter
|
@Inject lateinit var adapter: BackupAdapter
|
||||||
|
@Inject lateinit var dateFormatter: DateFormatter
|
||||||
@Inject override lateinit var presenter: BackupPresenter
|
@Inject override lateinit var presenter: BackupPresenter
|
||||||
|
|
||||||
private val dialog by lazy {
|
private val dialog by lazy {
|
||||||
@@ -67,9 +73,20 @@ class BackupController : QkController<BackupView, BackupState, BackupPresenter>(
|
|||||||
fabIcon.setTint(theme.textPrimary)
|
fabIcon.setTint(theme.textPrimary)
|
||||||
fabLabel.setTextColor(theme.textPrimary)
|
fabLabel.setTextColor(theme.textPrimary)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Make the list titles bold
|
||||||
|
linearLayout.children
|
||||||
|
.mapNotNull { it as? PreferenceView }
|
||||||
|
.map { it.titleView }
|
||||||
|
.forEach { it.setTypeface(it.typeface, Typeface.BOLD) }
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun render(state: BackupState) {
|
override fun render(state: BackupState) {
|
||||||
|
backup.summary = when (state.lastBackup) {
|
||||||
|
null -> activity?.getString(R.string.backup_never)
|
||||||
|
else -> dateFormatter.getDetailedTimestamp(state.lastBackup)
|
||||||
|
}
|
||||||
|
|
||||||
restore.isEnabled = state.upgraded
|
restore.isEnabled = state.upgraded
|
||||||
|
|
||||||
adapter.data = state.backups
|
adapter.data = state.backups
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ class BackupPresenter @Inject constructor(
|
|||||||
|
|
||||||
init {
|
init {
|
||||||
disposables += backupRepo.getBackups()
|
disposables += backupRepo.getBackups()
|
||||||
.subscribe { backups -> newState { copy(backups = backups) } }
|
.subscribe { backups -> newState { copy(lastBackup = backups.map { it.date }.max(), backups = backups) } }
|
||||||
|
|
||||||
disposables += billingManager.upgradeStatus
|
disposables += billingManager.upgradeStatus
|
||||||
.subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
|
.subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
|
||||||
|
|||||||
@@ -22,6 +22,6 @@ import com.moez.QKSMS.model.Backup
|
|||||||
|
|
||||||
data class BackupState(
|
data class BackupState(
|
||||||
val upgraded: Boolean = false,
|
val upgraded: Boolean = false,
|
||||||
val lastBackup: Long = 0,
|
val lastBackup: Long? = null,
|
||||||
val backups: List<Backup> = listOf()
|
val backups: List<Backup> = listOf()
|
||||||
)
|
)
|
||||||
@@ -30,6 +30,7 @@
|
|||||||
android:paddingTop="8dp">
|
android:paddingTop="8dp">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:id="@+id/linearLayout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|||||||
Reference in New Issue
Block a user