Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

feat(settings): show last push/pull timestamps in DriveAccountRow

Celtiore28dd4fca0e1f
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt
index dfc81612..c3c7db25 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt
@@ -104,6 +104,8 @@ internal fun LazyListScope.settingsDriveBackupSection(
?: stringResource(R.string.settings_drive_signin)
DriveAccountRow(
accountLabel = accountLabel,
+ lastPushAtMs = uiState.driveSyncStatus.lastPushAtMs,
+ lastPullAtMs = uiState.driveSyncStatus.lastPullAtMs,
onSignOut = onSignOut
)
Row(
@@ -136,19 +138,28 @@ internal fun LazyListScope.settingsDriveBackupSection(
@androidx.compose.runtime.Composable
private fun DriveAccountRow(
accountLabel: String,
+ lastPushAtMs: Long?,
+ lastPullAtMs: Long?,
onSignOut: () -> Unit
) {
+ val syncSummary = formatLastSync(lastPushAtMs, lastPullAtMs)
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically
) {
- Text(
- text = accountLabel,
- style = MaterialTheme.typography.bodyLarge,
- color = OnSurface,
- fontWeight = FontWeight.Medium,
- modifier = Modifier.weight(1f)
- )
+ Column(modifier = Modifier.weight(1f)) {
+ Text(
+ text = accountLabel,
+ style = MaterialTheme.typography.bodyLarge,
+ color = OnSurface,
+ fontWeight = FontWeight.Medium
+ )
+ Text(
+ text = syncSummary,
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim
+ )
+ }
TvClickableSurface(
onClick = onSignOut,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(10.dp)),
@@ -168,6 +179,21 @@ private fun DriveAccountRow(
}
}
+private fun formatLastSync(pushMs: Long?, pullMs: Long?): String {
+ if (pushMs == null && pullMs == null) {
+ return stringResource(R.string.settings_drive_never_synced)
+ }
+ val df = java.text.DateFormat.getDateTimeInstance(
+ java.text.DateFormat.SHORT,
+ java.text.DateFormat.SHORT
+ )
+ val parts = mutableListOf<String>()
+ pushMs?.let { parts += stringResource(R.string.settings_drive_last_push, df.format(java.util.Date(it))) }
+ pullMs?.let { parts += stringResource(R.string.settings_drive_last_pull, df.format(java.util.Date(it))) }
+ return parts.joinToString(" · ")
+}
+
@androidx.compose.runtime.Composable
private fun BackupActionCard(
icon: String,
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 72efc9ac..b0c0cee3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1434,4 +1434,7 @@
<string name="settings_drive_push_subtitle">Téléverse la configuration actuelle dans votre sauvegarde Drive.</string>
<string name="settings_drive_pull">Récupérer depuis Drive</string>
<string name="settings_drive_pull_subtitle">Télécharge la dernière sauvegarde Drive et prévisualise l’import.</string>
+ <string name="settings_drive_last_push">Envoyé : %1$s</string>
+ <string name="settings_drive_last_pull">Récupéré : %1$s</string>
+ <string name="settings_drive_never_synced">Jamais synchronisé</string>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c00b030b..c1f8d857 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1507,5 +1507,8 @@
<string name="settings_drive_push_subtitle">Upload the current configuration to your Drive backup.</string>
<string name="settings_drive_pull">Restore from Drive</string>
<string name="settings_drive_pull_subtitle">Download the latest Drive backup and preview the import.</string>
+ <string name="settings_drive_last_push">Pushed: %1$s</string>
+ <string name="settings_drive_last_pull">Pulled: %1$s</string>
+ <string name="settings_drive_never_synced">Never synced yet</string>
</resources>