improved UX in backup screen

Author: DP-Hridayan

app/src/main/java/in/hridayan/ashell/settings/presentation/page/backup/screens/BackupAndRestoreScreen.kt

@@ -95,7 +95,7 @@ fun BackupAndRestoreScreen(
     val lastCloudBackupTime = LocalSettings.current.lastCloudBackupTime
     val lastCloudBackupType = LocalSettings.current.lastCloudBackupType
 
-    val isFetchingCloudBackupTime by backupAndRestoreViewModel.isFetchingCloudBackupTime.collectAsState()
+    val isFetchingCloudBackupTime by backupAndRestoreViewModel.isFetchingCloudBackup.collectAsState()
     var isLastBackupDetailsCardExpanded by rememberSaveable { mutableStateOf(false) }
 
     val googleUserState by backupAndRestoreViewModel.googleUserState.collectAsState()
@@ -387,8 +387,6 @@ private fun LastBackupTimeCard(
         if (isExpanded) CardCornerShape.FIRST_CARD else RoundedCornerShape(cardHeight / 2)
 
     val perUserLastCloudBackupTime = when {
-        !userState.isSignedIn -> stringResource(R.string.not_signed_in)
-
         isFetching -> stringResource(R.string.fetching_backup_time)
 
         lastCloudBackupTime.isNotEmpty() ->
@@ -398,18 +396,27 @@ private fun LastBackupTimeCard(
                 "$date | $time"
             }
 
+        else -> ""
+    }
+
+    val perUserLastCloudBackupType = when {
+        !userState.isSignedIn -> stringResource(R.string.not_signed_in)
+
+        isFetching -> stringResource(R.string.fetching_backup_type)
+
+        lastCloudBackupType.isNotEmpty() -> lastCloudBackupType
+
         else -> stringResource(R.string.none)
     }
 
     val formattedLastLocalBackupTime =
-        if (lastLocalBackupTime.isEmpty()) stringResource(R.string.none)
+        if (lastLocalBackupTime.isEmpty()) "-- -- -- | --:--"
         else lastLocalBackupTime.split(" ").let { parts ->
             val date = parts.getOrNull(0).orEmpty()
             val time = parts.getOrNull(1).orEmpty()
             "$date | $time"
         }
 
-
     Column(modifier = modifier.animateContentSize()) {
         RoundedCornerCard(
             modifier = Modifier
@@ -454,7 +461,7 @@ private fun LastBackupTimeCard(
                 roundedCornerShape = CardCornerShape.MIDDLE_CARD,
                 icon = painterResource(R.drawable.ic_mobile),
                 title = stringResource(R.string.device_backup_local),
-                backupType = lastLocalBackupType,
+                backupType = lastLocalBackupType.ifEmpty { stringResource(R.string.none) },
                 timeDescription = formattedLastLocalBackupTime
             )
 
@@ -463,7 +470,7 @@ private fun LastBackupTimeCard(
                 roundedCornerShape = CardCornerShape.LAST_CARD,
                 icon = painterResource(R.drawable.ic_cloud_done),
                 title = stringResource(R.string.cloud_backup_google_drive),
-                backupType = lastCloudBackupType,
+                backupType = perUserLastCloudBackupType,
                 timeDescription = perUserLastCloudBackupTime
             )
         }
@@ -486,7 +493,7 @@ private fun TimeCard(
         BackupType.SETTINGS_ONLY.name -> stringResource(R.string.settings_only)
         BackupType.DATABASE_ONLY.name -> stringResource(R.string.databases_only)
         BackupType.SETTINGS_AND_DATABASE.name -> stringResource(R.string.all_data)
-        else -> stringResource(R.string.none)
+        else -> backupType
     }
 
     RoundedCornerCard(
@@ -523,11 +530,13 @@ private fun TimeCard(
                     modifier = Modifier.alpha(0.9f)
                 )
 
-                Text(
-                    text = timeDescription,
-                    style = MaterialTheme.typography.bodySmall,
-                    modifier = Modifier.alpha(0.9f)
-                )
+                if (timeDescription.isNotEmpty()) {
+                    Text(
+                        text = timeDescription,
+                        style = MaterialTheme.typography.bodySmall,
+                        modifier = Modifier.alpha(0.9f)
+                    )
+                }
             }
         }
     }

app/src/main/java/in/hridayan/ashell/settings/presentation/page/backup/viewmodel/BackupAndRestoreViewModel.kt

@@ -70,8 +70,8 @@ class BackupAndRestoreViewModel @Inject constructor(
     private val _cloudBackupType = MutableStateFlow<String?>(null)
     val cloudBackupType: StateFlow<String?> = _cloudBackupType.asStateFlow()
 
-    private val _isFetchingCloudBackupTime = MutableStateFlow(false)
-    val isFetchingCloudBackupTime: StateFlow<Boolean> = _isFetchingCloudBackupTime.asStateFlow()
+    private val _isFetchingCloudBackup = MutableStateFlow(false)
+    val isFetchingCloudBackup: StateFlow<Boolean> = _isFetchingCloudBackup.asStateFlow()
 
     private val _showCloudRestoreConfirm = MutableStateFlow(false)
     val showCloudRestoreConfirm: StateFlow<Boolean> = _showCloudRestoreConfirm.asStateFlow()
@@ -173,7 +173,7 @@ class BackupAndRestoreViewModel @Inject constructor(
 
                     if (authorized) {
                         // This is done to show correct last backup time per Google account
-                        syncCloudBackupTimeSilently()
+                        syncCloudBackupDetailsOnSignIn()
                     }
                 },
                 onFailure = { error ->
@@ -192,6 +192,7 @@ class BackupAndRestoreViewModel @Inject constructor(
         viewModelScope.launch {
             googleAuthRepository.signOut()
             _uiEvent.emit(SettingsUiEvent.ShowToast(context.getString(R.string.signed_out)))
+            settingsRepository.setString(SettingsKeys.LAST_CLOUD_BACKUP_TIME, "")
         }
     }
 
@@ -213,7 +214,7 @@ class BackupAndRestoreViewModel @Inject constructor(
 
             null -> {
                 Log.d(TAG, "onConsentGranted: no pending operation to retry")
-                syncCloudBackupTimeSilently()
+                syncCloudBackupDetailsOnSignIn()
             }
         }
     }
@@ -310,24 +311,25 @@ class BackupAndRestoreViewModel @Inject constructor(
         }
     }
 
-    private fun syncCloudBackupTimeSilently() {
+    private fun syncCloudBackupDetailsOnSignIn() {
         viewModelScope.launch {
             Log.d(TAG, "syncCloudBackupTimeSilently: starting...")
 
-            _isFetchingCloudBackupTime.value = true
+            _isFetchingCloudBackup.value = true
 
             val result = googleDriveRepository.downloadBackup()
 
             if (result == null) {
                 if (googleDriveRepository.isConsentPending) {
                     Log.d(TAG, "syncCloudBackupTimeSilently: consent required, skipping for now")
-                    _isFetchingCloudBackupTime.value = false
+                    _isFetchingCloudBackup.value = false
                     return@launch
                 }
 
                 Log.d(TAG, "syncCloudBackupTimeSilently: no backup found")
                 settingsRepository.setString(SettingsKeys.LAST_CLOUD_BACKUP_TIME, "")
-                _isFetchingCloudBackupTime.value = false
+                settingsRepository.setString(SettingsKeys.LAST_CLOUD_BACKUP_TYPE, "")
+                _isFetchingCloudBackup.value = false
                 return@launch
             }
 
@@ -346,7 +348,20 @@ class BackupAndRestoreViewModel @Inject constructor(
                 Log.e(TAG, "syncCloudBackupTimeSilently: failed to extract time")
             }
 
-            _isFetchingCloudBackupTime.value = false
+            val type = backupAndRestoreRepository.getBackupTypeFromBytes(bytes)
+
+            if (type != null) {
+                Log.d(TAG, "syncCloudBackupTypeSilently: extracted type=$type")
+
+                settingsRepository.setString(
+                    SettingsKeys.LAST_CLOUD_BACKUP_TYPE,
+                    type
+                )
+            } else {
+                Log.e(TAG, "syncCloudBackupTypeSilently: failed to extract type")
+            }
+
+            _isFetchingCloudBackup.value = false
         }
     }
 

app/src/main/res/values/strings.xml

@@ -28,6 +28,7 @@
     <string name="back_button">Back button</string>
     <string name="backup">Backup</string>
     <string name="backup_scheduler">Backup scheduler</string>
+    <string name="fetching_backup_type">Fetching backup type…</string>
     <string name="des_backup_scheduler">Automatically schedule backups at selected intervals</string>
     <string name="backup_all_data">Backup all data</string>
     <string name="backup_and_restore">Backup &amp; restore</string>