From e7bb6a08f82e9c228980573532072a9b8251b36b Mon Sep 17 00:00:00 2001
From: Mihai-Cristian Condrea <mihai.condrea@digisoftware.ro>
Date: Sat, 5 Oct 2024 10:12:21 +0300
Subject: [PATCH] Finished trash screen and functionality + string
 improvements.

---
 .idea/compiler.xml                            |  2 +-
 .idea/gradle.xml                              |  1 +
 .idea/misc.xml                                |  2 +-
 .../com/d4rk/cleaner/ui/components/Buttons.kt | 24 ++++++----
 .../cleaner/ui/screens/home/HomeScreen.kt     | 31 ++++++++-----
 .../screens/home/repository/HomeRepository.kt |  2 +-
 .../HomeRepositoryImplementation.kt           | 24 ++++++++--
 .../cleaner/ui/screens/trash/TrashScreen.kt   | 45 +++++++++++++++----
 .../ui/screens/trash/TrashViewModel.kt        | 10 +++++
 app/src/main/res/values-bg-rBG/strings.xml    |  5 ++-
 app/src/main/res/values-de-rDE/strings.xml    |  5 ++-
 app/src/main/res/values-es-rGQ/strings.xml    |  6 ++-
 app/src/main/res/values-fr-rFR/strings.xml    |  6 ++-
 app/src/main/res/values-hi-rIN/strings.xml    |  5 ++-
 app/src/main/res/values-hu-rHU/strings.xml    |  5 ++-
 app/src/main/res/values-in-rID/strings.xml    |  4 +-
 app/src/main/res/values-it-rIT/strings.xml    |  6 ++-
 app/src/main/res/values-ja-rJP/strings.xml    |  4 +-
 app/src/main/res/values-pl-rPL/strings.xml    |  7 ++-
 app/src/main/res/values-ro-rRO/strings.xml    |  6 ++-
 app/src/main/res/values-ru-rRU/strings.xml    |  7 ++-
 app/src/main/res/values-sv-rSE/strings.xml    |  5 ++-
 app/src/main/res/values-tr-rTR/strings.xml    |  5 ++-
 app/src/main/res/values-uk-rUA/strings.xml    |  7 ++-
 app/src/main/res/values-zh-rTW/strings.xml    |  4 +-
 app/src/main/res/values/strings.xml           |  8 +++-
 gradle/libs.versions.toml                     |  4 +-
 27 files changed, 187 insertions(+), 53 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..b86273d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..7b3006b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b3c2a28..a7f1481 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,7 +6,7 @@
     </list>
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/components/Buttons.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/Buttons.kt
index a8a209c..6aa60e5 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/components/Buttons.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/Buttons.kt
@@ -15,17 +15,23 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.cleaner.ui.components.animations.bounceClick
 
 @Composable
-fun TwoRowButtons(enabled : Boolean ,
-                  onStartButtonClick: () -> Unit ,
-                  onStartButtonIcon : ImageVector ,
-                  onEndButtonClick: () -> Unit ,
-                  onEndButtonIcon : ImageVector) {
+fun TwoRowButtons(
+    modifier : Modifier ,
+    enabled : Boolean ,
+    onStartButtonClick : () -> Unit ,
+    onStartButtonIcon : ImageVector ,
+    onStartButtonText : Int ,
+    onEndButtonClick : () -> Unit ,
+    onEndButtonIcon : ImageVector ,
+    onEndButtonText : Int ,
+) {
     Row(
-        modifier = Modifier.fillMaxWidth() , horizontalArrangement = Arrangement.SpaceAround
+        modifier = modifier.fillMaxWidth() , horizontalArrangement = Arrangement.SpaceAround
     ) {
         OutlinedButton(enabled = enabled ,
                        onClick = {
@@ -41,14 +47,14 @@ fun TwoRowButtons(enabled : Boolean ,
                 modifier = Modifier.size(ButtonDefaults.IconSize)
             )
             Spacer(Modifier.size(ButtonDefaults.IconSpacing))
-            Text(text = "Move to trash")
+            Text(text = stringResource(id = onStartButtonText))
         }
 
         Spacer(Modifier.width(8.dp))
 
         Button(enabled = enabled ,
                onClick = {
-                  onEndButtonClick()
+                   onEndButtonClick()
                } ,
                modifier = Modifier
                        .weight(1f)
@@ -60,7 +66,7 @@ fun TwoRowButtons(enabled : Boolean ,
                 modifier = Modifier.size(ButtonDefaults.IconSize)
             )
             Spacer(Modifier.size(ButtonDefaults.IconSpacing))
-            Text(text = "Delete forever")
+            Text(text = stringResource(id = onEndButtonText))
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/HomeScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/HomeScreen.kt
index f258fb5..8132366 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/HomeScreen.kt
@@ -60,6 +60,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
@@ -304,6 +305,7 @@ fun AnalyzeComposable(imageLoader : ImageLoader , context : Context) {
                         }
 
                         FilesByDateSection(
+                            modifier = Modifier,
                             filesByDate = filesByDate ,
                             fileSelectionStates = uiState.fileSelectionStates ,
                             imageLoader = imageLoader ,
@@ -319,10 +321,9 @@ fun AnalyzeComposable(imageLoader : ImageLoader , context : Context) {
                 verticalAlignment = Alignment.CenterVertically ,
                 horizontalArrangement = Arrangement.SpaceBetween ,
             ) {
-                val statusText : String = if (uiState.selectedFileCount > 0) {
-                    stringResource(id = R.string.status_selected_files , uiState.selectedFileCount)
-                }
-                else {
+                val statusText: String = if (uiState.selectedFileCount > 0) {
+                    pluralStringResource(id = R.plurals.status_selected_files, count = uiState.selectedFileCount, uiState.selectedFileCount)
+                } else {
                     stringResource(id = R.string.status_no_files_selected)
                 }
                 val statusColor : Color by animateColorAsState(
@@ -342,24 +343,34 @@ fun AnalyzeComposable(imageLoader : ImageLoader , context : Context) {
                 SelectAllComposable(viewModel)
             }
 
-            TwoRowButtons(enabled = enabled , onStartButtonClick = {
-                viewModel.moveToTrash()
-            } , onStartButtonIcon = Icons.Outlined.Delete , onEndButtonClick = {
-                viewModel.clean()
-            } , onEndButtonIcon = Icons.Outlined.DeleteForever)
+            TwoRowButtons(
+                modifier = Modifier,
+                enabled = enabled ,
+                onStartButtonClick = {
+                    viewModel.moveToTrash()
+                } ,
+                onStartButtonIcon = Icons.Outlined.Delete ,
+                onStartButtonText = R.string.move_to_trash ,
+
+                onEndButtonClick = {
+                    viewModel.clean()
+                } ,
+                onEndButtonIcon = Icons.Outlined.DeleteForever ,
+                onEndButtonText = R.string.delete_forever)
         }
     }
 }
 
 @Composable
 fun FilesByDateSection(
+    modifier : Modifier,
     filesByDate : Map<String , List<File>> ,
     fileSelectionStates : Map<File , Boolean> ,
     imageLoader : ImageLoader ,
     onFileSelectionChange : (File , Boolean) -> Unit ,
 ) {
     LazyColumn(
-        modifier = Modifier.fillMaxSize()
+        modifier = modifier.fillMaxSize()
     ) {
         val sortedDates = filesByDate.keys.sortedByDescending { dateString ->
             SimpleDateFormat("yyyy-MM-dd" , Locale.getDefault()).parse(dateString)
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/repository/HomeRepository.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/repository/HomeRepository.kt
index dc6fe01..56984cd 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/repository/HomeRepository.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/repository/HomeRepository.kt
@@ -70,7 +70,7 @@ class HomeRepository(
 
     suspend fun moveToTrash(filesToMove : List<File> , onSuccess : () -> Unit) {
         withContext(Dispatchers.IO) {
-            moveToTrash(filesToMove) // Call the updated function below
+            moveToTrash(filesToMove)
             withContext(Dispatchers.Main) {
                 onSuccess()
             }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/repository/HomeRepositoryImplementation.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/repository/HomeRepositoryImplementation.kt
index 5db6cc2..351489b 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/repository/HomeRepositoryImplementation.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/repository/HomeRepositoryImplementation.kt
@@ -59,12 +59,28 @@ abstract class HomeRepositoryImplementation(val application : Application) {
         }
     }
 
-    fun restoreFromTrash(filesToRestore : Set<File>) {
+    fun restoreFromTrash(filesToRestore: Set<File>) {
         filesToRestore.forEach { file ->
-            val originalPath = file.absolutePath.replace("/trash/" , "/")
-            val destination = File(originalPath)
+            val trashDir = File(application.getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS), "Trash")
+
+            val relativePathInTrash = file.relativeTo(trashDir).path
+            val originalFile = File(application.getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS), relativePathInTrash)
+
+            val destinationParent = originalFile.parentFile
+
+            if (destinationParent != null && !destinationParent.exists()) {
+                destinationParent.mkdirs()
+            }
+
             if (file.exists()) {
-                file.renameTo(destination)
+                if (file.renameTo(originalFile)) {
+                    MediaScannerConnection.scanFile(
+                        application,
+                        arrayOf(originalFile.absolutePath, file.absolutePath),
+                        null,
+                        null
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/trash/TrashScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/trash/TrashScreen.kt
index c22c9af..c5b2255 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/trash/TrashScreen.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/trash/TrashScreen.kt
@@ -1,12 +1,11 @@
 package com.d4rk.cleaner.ui.screens.trash
 
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.DeleteForever
+import androidx.compose.material.icons.outlined.Restore
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -17,6 +16,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.constraintlayout.compose.ConstraintLayout
+import androidx.constraintlayout.compose.Dimension
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.ImageLoader
 import coil.disk.DiskCache
@@ -72,23 +74,48 @@ fun TrashScreen(activity : TrashActivity) {
                 }
             }
             else {
-                Column(
+                ConstraintLayout(
                     modifier = Modifier
                             .fillMaxSize()
                             .padding(paddingValues)
                 ) {
+                    val (list , buttons) = createRefs()
+
                     TrashItemsList(
+                        modifier = Modifier.constrainAs(list) {
+                                    top.linkTo(parent.top)
+                                    start.linkTo(parent.start)
+                                    end.linkTo(parent.end)
+                                    bottom.linkTo(buttons.top)
+                                    width = Dimension.fillToConstraints
+                                    height = Dimension.fillToConstraints
+                                } ,
                         trashFiles = uiState.trashFiles ,
                         imageLoader ,
                         uiState = uiState ,
                         viewModel = viewModel
                     )
 
-                    TwoRowButtons(enabled = enabled , onStartButtonClick = {
-                        viewModel.restoreFromTrash()
-                    } , onStartButtonIcon = Icons.Outlined.Delete , onEndButtonClick = {
-                        // TODO: for restore
-                    } , onEndButtonIcon = Icons.Outlined.DeleteForever)
+                    TwoRowButtons(modifier = Modifier
+                            .padding(16.dp)
+                            .constrainAs(buttons) {
+                                bottom.linkTo(parent.bottom)
+                                start.linkTo(parent.start)
+                                end.linkTo(parent.end)
+                                width = Dimension.fillToConstraints
+                            } ,
+                                  enabled = enabled ,
+                                  onStartButtonClick = {
+                                      viewModel.restoreFromTrash()
+                                  } ,
+                                  onStartButtonIcon = Icons.Outlined.Restore ,
+                                  onStartButtonText = R.string.restore ,
+
+                                  onEndButtonClick = {
+                                      viewModel.clean()
+                                  } ,
+                                  onEndButtonIcon = Icons.Outlined.DeleteForever ,
+                                  onEndButtonText = R.string.delete_forever)
                 }
             }
         }
@@ -97,6 +124,7 @@ fun TrashScreen(activity : TrashActivity) {
 
 @Composable
 fun TrashItemsList(
+    modifier : Modifier ,
     trashFiles : List<File> ,
     imageLoader : ImageLoader ,
     uiState : UiTrashModel ,
@@ -109,6 +137,7 @@ fun TrashItemsList(
     }
 
     FilesByDateSection(
+        modifier = modifier ,
         filesByDate = filesByDate ,
         fileSelectionStates = uiState.fileSelectionStates ,
         imageLoader = imageLoader ,
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/trash/TrashViewModel.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/trash/TrashViewModel.kt
index 55a2dfd..ce58af0 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/trash/TrashViewModel.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/trash/TrashViewModel.kt
@@ -6,6 +6,7 @@ import com.d4rk.cleaner.data.datastore.DataStore
 import com.d4rk.cleaner.data.model.ui.screens.UiTrashModel
 import com.d4rk.cleaner.ui.screens.home.repository.HomeRepository
 import com.d4rk.cleaner.ui.viewmodel.BaseViewModel
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
@@ -48,4 +49,13 @@ class TrashViewModel(application : Application) : BaseViewModel(application) {
             hideLoading()
         }
     }
+
+    fun clean() {
+        viewModelScope.launch(context = Dispatchers.Default + coroutineExceptionHandler) {
+            val filesToDelete = _uiState.value.fileSelectionStates.filter { it.value }.keys
+            showLoading()
+            repository.deleteFiles(filesToDelete)
+            hideLoading()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 2efa1e5..efa97dd 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -22,7 +22,10 @@
     <string name="videos">Видеоклипове</string>
     <string name="audios">Аудио файлове</string>
     <string name="other">Други</string>
-    <string name="status_selected_files">Статус: Избрани %1$d файла</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">Състояние: Избран %1$d файл</item>
+        <item quantity="other">Състояние: Избрани %1$d файла</item>
+    </plurals>
     <string name="status_no_files_selected">Статус: Не са избрани файлове</string>
     <string name="select_all">Избиране на всички</string>
     <string name="rescan_title">Сканиране отново?</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 9493c24..6d7bba2 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -22,7 +22,10 @@
     <string name="videos">Videos</string>
     <string name="audios">Audios</string>
     <string name="other">Andere</string>
-    <string name="status_selected_files">Status: %1$d Dateien ausgewählt</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">Status: %1$d Datei ausgewählt</item>
+        <item quantity="other">Status: %1$d Dateien ausgewählt</item>
+    </plurals>
     <string name="status_no_files_selected">Status: Keine Dateien ausgewählt</string>
     <string name="select_all">Alle auswählen</string>
     <string name="rescan_title">Neu scannen?</string>
diff --git a/app/src/main/res/values-es-rGQ/strings.xml b/app/src/main/res/values-es-rGQ/strings.xml
index 9d7e245..ae2fda0 100644
--- a/app/src/main/res/values-es-rGQ/strings.xml
+++ b/app/src/main/res/values-es-rGQ/strings.xml
@@ -22,7 +22,11 @@
     <string name="videos">Vídeos</string>
     <string name="audios">Audios</string>
     <string name="other">Otros</string>
-    <string name="status_selected_files">Estado: Se seleccionaron %1$d archivos</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">Estado: %1$d archivo seleccionado</item>
+        <item quantity="other">Estado: %1$d archivos seleccionados</item>
+        <item quantity="many">Estado: %1$d archivos seleccionados</item>
+    </plurals>
     <string name="status_no_files_selected">Estado: No se seleccionaron archivos</string>
     <string name="select_all">Seleccionar todo</string>
     <string name="rescan_title">¿Volver a escanear?</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 15f92d4..e870c6e 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -22,7 +22,11 @@
     <string name="videos">Vidéos</string>
     <string name="audios">Audios</string>
     <string name="other">Autres</string>
-    <string name="status_selected_files">Statut: %1$d fichiers sélectionnés</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">Statut : %1$d fichier sélectionné</item>
+        <item quantity="other">Statut : %1$d fichiers sélectionnés</item>
+        <item quantity="many">Statut : %1$d fichiers sélectionnés</item>
+    </plurals>
     <string name="status_no_files_selected">Statut: Aucun fichier sélectionné</string>
     <string name="select_all">Tout sélectionner</string>
     <string name="rescan_title">Re-scanner?</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 4ff8194..9c77355 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -22,7 +22,10 @@
     <string name="videos">वीडियो</string>
     <string name="audios">ऑडियो</string>
     <string name="other">अन्य</string>
-    <string name="status_selected_files">स्थिति: %1$d फ़ाइलें चयनित</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">स्थिति: %1$d फ़ाइल चयनित</item>
+        <item quantity="other">स्थिति: %1$d फ़ाइलें चयनित</item>
+    </plurals>
     <string name="status_no_files_selected">स्थिति: कोई फ़ाइलें चयनित नहीं हैं</string>
     <string name="select_all">सबका चयन करें</string>
     <string name="rescan_title">पुनः स्कैन करें?</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 315940e..3c7d4a3 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -22,7 +22,10 @@
     <string name="videos">Videók</string>
     <string name="audios">Hangfájlok</string>
     <string name="other">Egyéb</string>
-    <string name="status_selected_files">Állapot: Kiválasztva %1$d fájl</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">Állapot: %1$d fájl kiválasztva</item>
+        <item quantity="other">Állapot: %1$d fájlok kiválasztva</item>
+    </plurals>
     <string name="status_no_files_selected">Állapot: Nincsenek kiválasztva fájlok</string>
     <string name="select_all">Összes kijelölése</string>
     <string name="rescan_title">Újraellenőrzés?</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index bad776e..fd5f3e4 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -22,7 +22,9 @@
     <string name="videos">Video</string>
     <string name="audios">Audio</string>
     <string name="other">Lainnya</string>
-    <string name="status_selected_files">Status: %1$d file dipilih</string>
+    <plurals name="status_selected_files">
+        <item quantity="other">Status: %1$d berkas dipilih</item>
+    </plurals>
     <string name="status_no_files_selected">Status: Tidak ada file yang dipilih</string>
     <string name="select_all">Pilih Semua</string>
     <string name="rescan_title">Pindai ulang?</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index ea787b4..1d5e5ac 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -22,7 +22,11 @@
     <string name="videos">Video</string>
     <string name="audios">Audio</string>
     <string name="other">Altro</string>
-    <string name="status_selected_files">Stato: %1$d file selezionati</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">Stato: %1$d file selezionato</item>
+        <item quantity="other">Stato: %1$d file selezionati</item>
+        <item quantity="many">Stato: %1$d file selezionati</item>
+    </plurals>
     <string name="status_no_files_selected">Stato: Nessun file selezionato</string>
     <string name="select_all">Seleziona tutto</string>
     <string name="rescan_title">Scansionare di nuovo?</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 9bdd3b9..4516a26 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -22,7 +22,9 @@
     <string name="videos">ビデオ</string>
     <string name="audios">オーディオ</string>
     <string name="other">その他</string>
-    <string name="status_selected_files">ステータス: %1$d ファイルを選択済み</string>
+    <plurals name="status_selected_files">
+        <item quantity="other">ステータス：%1$d ファイル選択済み</item>
+    </plurals>
     <string name="status_no_files_selected">ステータス: ファイルが選択されていません</string>
     <string name="select_all">すべて選択</string>
     <string name="rescan_title">再スキャンしますか？</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index b3c3789..dffd807 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -22,7 +22,12 @@
     <string name="videos">Filmy</string>
     <string name="audios">Audio</string>
     <string name="other">Inne</string>
-    <string name="status_selected_files">Status: Wybrano %1$d plików</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">Status: %1$d plik wybrany</item>
+        <item quantity="few">Status: %1$d pliki wybrane</item>
+        <item quantity="many">Status: %1$d plików wybranych</item>
+        <item quantity="other">Status: %1$d plików wybranych</item>
+    </plurals>
     <string name="status_no_files_selected">Status: Nie wybrano plików</string>
     <string name="select_all">Zaznacz wszystko</string>
     <string name="rescan_title">Skanować ponownie?</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 34955e8..5f7457a 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -22,7 +22,11 @@
     <string name="videos">Videoclipuri</string>
     <string name="audios">Fișiere audio</string>
     <string name="other">Altele</string>
-    <string name="status_selected_files">Stare: Selectate %1$d fișiere</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">Stare: %1$d fișier selectat</item>
+        <item quantity="few">Stare: %1$d fișiere selectate</item>
+        <item quantity="other">Stare: %1$d fișiere selectate</item>
+    </plurals>
     <string name="status_no_files_selected">Stare: Niciun fișier selectat</string>
     <string name="select_all">Selectează tot</string>
     <string name="rescan_title">Rescanare?</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 44f2967..f60624a 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -22,7 +22,12 @@
     <string name="videos">Видео</string>
     <string name="audios">Аудио</string>
     <string name="other">Другое</string>
-    <string name="status_selected_files">Статус: Выбрано %1$d файлов</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">Статус: выбран %1$d файл</item>
+        <item quantity="few">Статус: выбрано %1$d файла</item>
+        <item quantity="many">Статус: выбрано %1$d файлов</item>
+        <item quantity="other">Статус: выбрано %1$d файлов</item>
+    </plurals>
     <string name="status_no_files_selected">Статус: Файлы не выбраны</string>
     <string name="select_all">Выбрать все</string>
     <string name="rescan_title">Повторное сканирование?</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index f87a0b4..4241efc 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -22,7 +22,10 @@
     <string name="videos">Videor</string>
     <string name="audios">Ljud</string>
     <string name="other">Annat</string>
-    <string name="status_selected_files">Status: %1$d filer valda</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">Status: %1$d fil vald</item>
+        <item quantity="other">Status: %1$d filer valda</item>
+    </plurals>
     <string name="status_no_files_selected">Status: Inga filer valda</string>
     <string name="select_all">Välj alla</string>
     <string name="rescan_title">Skanna om?</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index e00c706..33b15a4 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -22,7 +22,10 @@
     <string name="videos">Videolar</string>
     <string name="audios">Sesler</string>
     <string name="other">Diğer</string>
-    <string name="status_selected_files">Durum: %1$d dosya seçildi</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">Durum: %1$d dosya seçildi</item>
+        <item quantity="other">Durum: %1$d dosya seçildi</item>
+    </plurals>
     <string name="status_no_files_selected">Durum: Dosya seçilmedi</string>
     <string name="select_all">Tümünü Seç</string>
     <string name="rescan_title">Tekrar Tara?</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 32e5ea2..a96ab1c 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -22,7 +22,12 @@
     <string name="videos">Відео</string>
     <string name="audios">Аудіо</string>
     <string name="other">Інше</string>
-    <string name="status_selected_files">Статус: Вибрано %1$d файлів</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">Стан: вибрано %1$d файл</item>
+        <item quantity="few">Стан: вибрано %1$d файли</item>
+        <item quantity="many">Стан: вибрано %1$d файлів</item>
+        <item quantity="other">Стан: вибрано %1$d файлів</item>
+    </plurals>
     <string name="status_no_files_selected">Статус: Не вибрано файлів</string>
     <string name="select_all">Вибрати все</string>
     <string name="rescan_title">Пересканувати?</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 19c0090..0cce2e3 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -22,7 +22,9 @@
     <string name="videos">影片</string>
     <string name="audios">音訊</string>
     <string name="other">其他</string>
-    <string name="status_selected_files">狀態：已選取 %1$d 個檔案</string>
+    <plurals name="status_selected_files">
+        <item quantity="other">狀態：已選取 %1$d 個檔案</item>
+    </plurals>
     <string name="status_no_files_selected">狀態：未選取任何檔案</string>
     <string name="select_all">選取全部</string>
     <string name="rescan_title">重新掃描？</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ad424d..1b86fd7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,8 @@
     <string name="navigation_drawer_open">Open navigation drawer</string>
 
     <string name="home">Home</string>
+    <string name="delete_forever">Delete forever</string>
+    <string name="move_to_trash">Move to trash</string>
     <string name="storage_used">%1$s/%2$s GB\nUsed</string>
     <string name="analyze">Analyze</string>
     <string name="clean">Clean</string>
@@ -22,7 +24,10 @@
     <string name="videos">Videos</string>
     <string name="audios">Audios</string>
     <string name="other">Other</string>
-    <string name="status_selected_files">Status: Selected %1$d files</string>
+    <plurals name="status_selected_files">
+        <item quantity="one">Status: Selected %1$d file</item>
+        <item quantity="other">Status: Selected %1$d files</item>
+    </plurals>
     <string name="status_no_files_selected">Status: No files selected</string>
     <string name="select_all">Select All</string>
     <string name="rescan_title">Rescan?</string>
@@ -85,6 +90,7 @@
 
     <string name="trash">Trash</string>
     <string name="trash_is_empty">Trash is empty</string>
+    <string name="restore">Restore</string>
 
     <string name="settings">Settings</string>
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6daddde..965edc8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
-agp = "8.6.1"
+agp = "8.7.0"
 appcompat = "1.7.0"
 appUpdateKtx = "2.1.0"
-billing = "7.1.0"
+billing = "7.1.1"
 coilCompose = "2.7.0"
 coilVideo = "2.7.0"
 composeBom = "2024.09.03"