feat: show number of backup's generation and total generations count

AndroidLabs-org · web-flow · commit e24874676ac9 · 2025-04-09T08:40:29.000+03:00
diff --git a/app/src/main/java/org/androidlabs/applistbackup/BackupService.kt b/app/src/main/java/org/androidlabs/applistbackup/BackupService.kt
@@ -34,9 +34,11 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import org.androidlabs.applistbackup.data.BackupAppDetails
 import org.androidlabs.applistbackup.data.BackupAppInfo
+import org.androidlabs.applistbackup.data.BackupFile
 import org.androidlabs.applistbackup.data.BackupFormat
 import org.androidlabs.applistbackup.data.BackupFormatResult
 import org.androidlabs.applistbackup.data.BackupRawFile
+import org.androidlabs.applistbackup.data.FileInfo
 import org.androidlabs.applistbackup.settings.Settings
 import org.androidlabs.applistbackup.utils.Utils.clearPrefixSlash
 import org.androidlabs.applistbackup.utils.Utils.isTV
@@ -50,12 +52,6 @@ import java.util.Date
 import java.util.Locale
 import java.util.regex.Pattern
 
-data class BackupFile(
-    val uri: Uri,
-    val date: Date,
-    val title: String
-)
-
 class BackupService : Service() {
     private val tag: String = "BackupService"
 
@@ -178,22 +174,52 @@ class BackupService : Service() {
         fun getBackupFiles(context: Context): List<BackupFile> {
             val dateFormat = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.getDefault())
 
-            return getRawBackupFiles(context)
+            val files = getRawBackupFiles(context)
+
+            val infos = files
                 .map { file ->
                     val name = file.name
                     val dateString = name.removePrefix(FILE_NAME_PREFIX).substringBeforeLast('.')
-                    val date = if (dateString.isNotEmpty()) {
-                        dateFormat.parse(dateString) ?: Date()
-                    } else {
-                        val timestamp = getFileDate(context, file.uri)
-                        Date(timestamp)
+                    val date = try {
+                        if (dateString.isNotEmpty()) {
+                            dateFormat.parse(dateString) ?: Date()
+                        } else {
+                            val timestamp = getFileDate(context, file.uri)
+                            Date(timestamp)
+                        }
+                    } catch (e: Exception) {
+                        Log.e("BackupService", "Error parsing date: ${e.message}")
+                        Date()
                     }
-                    val title = getTitleFromUri(context, file.uri) ?: name
-                    BackupFile(file.uri, date, title)
+
+                    getFileInfoFromUri(context, file.uri) ?: FileInfo(
+                        file.uri,
+                        name,
+                        name.substringAfterLast("."),
+                        date
+                    )
                 }
+
+            val filesByGeneration = infos
+                .groupBy { dateFormat.format(it.date) }
+                .toSortedMap(reverseOrder())
+
+            val generationsCount = filesByGeneration.size
+
+            return filesByGeneration.values.flatMapIndexed { generationNumber, filesInGeneration ->
+                filesInGeneration.map { info ->
+                    BackupFile(
+                        info.uri,
+                        info.date,
+                        info.name,
+                        generationNumber,
+                        generationsCount
+                    )
+                }
+            }.sortedByDescending { it.date }
         }
 
-        fun getTitleFromUri(context: Context, uri: Uri): String? {
+        fun getFileInfoFromUri(context: Context, uri: Uri): FileInfo? {
             val pattern =
                 Pattern.compile("$FILE_NAME_PREFIX-(\\d{4}-\\d{2}-\\d{2}-\\d{2}-\\d{2}-\\d{2})\\.(\\w+)")
             val matcher = pattern.matcher(uri.toString())
@@ -203,10 +229,11 @@ class BackupService : Service() {
             val isFind = matcher.find()
             if (!isFind) {
                 val timestamp = getFileDate(context, uri)
-                val date = titleFormatter.format(Date(timestamp))
+                val date = Date(timestamp)
+                val formattedDate = titleFormatter.format(date)
                 val extension = uri.toString().split(".").last()
                 val format = extension.let { BackupFormat.fromExtension(it) }
-                return "$date (${format.value})"
+                return FileInfo(uri, "$formattedDate (${format.value})", format.value, date)
             } else {
                 val dateString = matcher.group(1)
                 val extension = matcher.group(2)
@@ -217,9 +244,14 @@ class BackupService : Service() {
                 if (date != null) {
                     if (extension != null) {
                         val format = extension.let { BackupFormat.fromExtension(it) }
-                        return "${titleFormatter.format(date)} (${format.value})"
+                        return FileInfo(
+                            uri,
+                            "${titleFormatter.format(date)} (${format.value})",
+                            format.value,
+                            date
+                        )
                     } else {
-                        return titleFormatter.format(date)
+                        return FileInfo(uri, titleFormatter.format(date), "", date)
                     }
                 } else {
                     return null
diff --git a/app/src/main/java/org/androidlabs/applistbackup/backupnow/BackupViewModel.kt b/app/src/main/java/org/androidlabs/applistbackup/backupnow/BackupViewModel.kt
@@ -12,8 +12,8 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
-import org.androidlabs.applistbackup.BackupFile
 import org.androidlabs.applistbackup.BackupService
+import org.androidlabs.applistbackup.data.BackupFile
 import org.androidlabs.applistbackup.settings.Settings
 
 class BackupViewModel(application: Application) : AndroidViewModel(application) {
diff --git a/app/src/main/java/org/androidlabs/applistbackup/data/BackupFile.kt b/app/src/main/java/org/androidlabs/applistbackup/data/BackupFile.kt
@@ -0,0 +1,16 @@
+package org.androidlabs.applistbackup.data
+
+import android.net.Uri
+import java.util.Date
+
+data class BackupFile(
+    val uri: Uri,
+    val date: Date,
+    val title: String,
+    val generationNumber: Int,
+    val generationsCount: Int,
+) {
+    fun titleWithGeneration(): String {
+        return "$title (${generationNumber + 1} of $generationsCount)"
+    }
+}
diff --git a/app/src/main/java/org/androidlabs/applistbackup/data/FileInfo.kt b/app/src/main/java/org/androidlabs/applistbackup/data/FileInfo.kt
@@ -0,0 +1,11 @@
+package org.androidlabs.applistbackup.data
+
+import android.net.Uri
+import java.util.Date
+
+data class FileInfo(
+    val uri: Uri,
+    val name: String,
+    val format: String,
+    val date: Date
+)
diff --git a/app/src/main/java/org/androidlabs/applistbackup/reader/BackupReaderFragment.kt b/app/src/main/java/org/androidlabs/applistbackup/reader/BackupReaderFragment.kt
@@ -1,6 +1,5 @@
 package org.androidlabs.applistbackup.reader
 
-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -11,6 +10,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDropDown
@@ -29,6 +29,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -90,7 +91,7 @@ class BackupReaderFragment(
     ): View {
         return ComposeView(requireContext()).apply {
             setContent {
-                DisplayHtmlContent(
+                DisplayContent(
                     viewModel = viewModel,
                     runBackup = ::runBackup
                 )
@@ -122,15 +123,16 @@ class BackupReaderFragment(
     }
 }
 
-@SuppressLint("SetJavaScriptEnabled")
 @Composable
-private fun DisplayHtmlContent(
+private fun DisplayContent(
     viewModel: BackupViewModel,
     runBackup: () -> Unit,
 ) {
     var expanded by remember { mutableStateOf(false) }
 
     val context = LocalContext.current
+    val configuration = LocalConfiguration.current
+    val screenHeight = configuration.screenHeightDp.dp
 
     val uri by viewModel.uri.collectAsState()
     val backups by viewModel.backupFiles.collectAsState(initial = emptyList())
@@ -140,14 +142,21 @@ private fun DisplayHtmlContent(
         val extension = uri.toString().substringAfterLast('.', "").lowercase()
         val format = BackupFormat.fromExtension(extension)
 
+        val uriBackup = remember(uri, backups) {
+            backups.find { backup -> backup.uri == uri }
+        }
+
+        val title = uriBackup?.titleWithGeneration()
+            ?: (BackupService.getFileInfoFromUri(context, uri!!)?.name
+                ?: stringResource(R.string.backup))
+
         Column(modifier = Modifier.fillMaxSize()) {
             Row(
                 verticalAlignment = Alignment.CenterVertically,
                 modifier = Modifier.padding(start = 16.dp, end = 4.dp)
             ) {
                 Text(
-                    text = BackupService.getTitleFromUri(context, uri!!)
-                        ?: stringResource(R.string.backup),
+                    text = title,
                     modifier = Modifier
                         .weight(1f)
                 )
@@ -162,11 +171,13 @@ private fun DisplayHtmlContent(
 
                     DropdownMenu(
                         expanded = expanded,
-                        onDismissRequest = { expanded = false }
+                        onDismissRequest = { expanded = false },
+                        modifier = Modifier
+                            .heightIn(max = screenHeight * 0.75f)
                     ) {
                         backups.forEach { backup ->
                             DropdownMenuItem(text = {
-                                Text(backup.title)
+                                Text(backup.titleWithGeneration())
                             }, onClick = {
                                 expanded = false
                                 viewModel.setUri(context, backup.uri)
diff --git a/app/src/main/java/org/androidlabs/applistbackup/reader/BackupViewModel.kt b/app/src/main/java/org/androidlabs/applistbackup/reader/BackupViewModel.kt
@@ -19,8 +19,8 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.androidlabs.applistbackup.BackupFile
 import org.androidlabs.applistbackup.BackupService
+import org.androidlabs.applistbackup.data.BackupFile
 import org.androidlabs.applistbackup.settings.Settings
 import org.androidlabs.applistbackup.utils.Utils.isTV
 
