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 a928e916..17feafd4 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 @@ -19,22 +19,28 @@ package com.moez.QKSMS.feature.backup import android.app.AlertDialog +import android.graphics.Typeface import android.view.View +import androidx.core.view.children import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R 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.setTint +import com.moez.QKSMS.common.widget.PreferenceView import com.moez.QKSMS.injection.appComponent import com.moez.QKSMS.model.Backup import io.reactivex.Observable import kotlinx.android.synthetic.main.backup_controller.* import kotlinx.android.synthetic.main.backup_list_dialog.view.* +import kotlinx.android.synthetic.main.preference_view.view.* import javax.inject.Inject class BackupController : QkController(), BackupView { @Inject lateinit var adapter: BackupAdapter + @Inject lateinit var dateFormatter: DateFormatter @Inject override lateinit var presenter: BackupPresenter private val dialog by lazy { @@ -67,9 +73,20 @@ class BackupController : QkController( fabIcon.setTint(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) { + backup.summary = when (state.lastBackup) { + null -> activity?.getString(R.string.backup_never) + else -> dateFormatter.getDetailedTimestamp(state.lastBackup) + } + restore.isEnabled = state.upgraded adapter.data = state.backups 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 fee49932..b32ba1ea 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 @@ -35,7 +35,7 @@ class BackupPresenter @Inject constructor( init { disposables += backupRepo.getBackups() - .subscribe { backups -> newState { copy(backups = backups) } } + .subscribe { backups -> newState { copy(lastBackup = backups.map { it.date }.max(), backups = backups) } } disposables += billingManager.upgradeStatus .subscribe { upgraded -> newState { copy(upgraded = upgraded) } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt index 44901294..2db0b2df 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt @@ -22,6 +22,6 @@ import com.moez.QKSMS.model.Backup data class BackupState( val upgraded: Boolean = false, - val lastBackup: Long = 0, + val lastBackup: Long? = null, val backups: List = listOf() ) \ No newline at end of file diff --git a/presentation/src/main/res/layout/backup_controller.xml b/presentation/src/main/res/layout/backup_controller.xml index 0a2de0bc..4e7365b3 100644 --- a/presentation/src/main/res/layout/backup_controller.xml +++ b/presentation/src/main/res/layout/backup_controller.xml @@ -30,6 +30,7 @@ android:paddingTop="8dp">