From 57791eb188635da71db45ff421a369c3637bac9e Mon Sep 17 00:00:00 2001
From: Mihai-Cristian Condrea <mihai.condrea@digisoftware.ro>
Date: Sat, 26 Oct 2024 09:26:01 +0300
Subject: [PATCH] Cleared the code and preparing for the release ASAP

---
 CHANGELOG.md                                  |  11 +-
 app/build.gradle.kts                          |   5 +-
 .../d4rk/cleaner/data/datastore/DataStore.kt  |  18 +--
 .../model/ui/memorymanager/StorageInfo.kt     |   8 +-
 .../data/model/ui/screens/UiHomeModel.kt      |   8 +-
 .../com/d4rk/cleaner/ui/components/Buttons.kt |   5 +-
 .../d4rk/cleaner/ui/components/ProgressBar.kt |   2 +-
 .../components/navigation/NavigationHost.kt   |   1 -
 .../ui/screens/analyze/AnalyzeScreen.kt       |  19 ++-
 .../cleaner/ui/screens/home/HomeScreen.kt     |  41 +++---
 .../cleaner/ui/screens/home/HomeViewModel.kt  | 121 ++++++++++--------
 .../screens/home/repository/HomeRepository.kt |  12 --
 .../HomeRepositoryImplementation.kt           |  57 ++-------
 .../tabs/ManualModeComposable.kt              |   2 +-
 .../screens/main/repository/MainRepository.kt |   1 -
 .../ui/screens/memory/MemoryManagerScreen.kt  |   8 +-
 .../MemoryManagerRepositoryImplementation.kt  |   6 +-
 .../ui/screens/trash/TrashViewModel.kt        |  54 +++++---
 .../cleaner/utils/cleaning/StorageUtils.kt    |   8 +-
 app/src/main/res/values-bg-rBG/strings.xml    |   7 -
 app/src/main/res/values-de-rDE/strings.xml    |   7 -
 app/src/main/res/values-es-rGQ/strings.xml    |   7 -
 app/src/main/res/values-fr-rFR/strings.xml    |   7 -
 app/src/main/res/values-hi-rIN/strings.xml    |   7 -
 app/src/main/res/values-hu-rHU/strings.xml    |   7 -
 app/src/main/res/values-in-rID/strings.xml    |   7 -
 app/src/main/res/values-it-rIT/strings.xml    |   7 -
 app/src/main/res/values-ja-rJP/strings.xml    |   7 -
 app/src/main/res/values-pl-rPL/strings.xml    |   7 -
 app/src/main/res/values-ro-rRO/strings.xml    |   7 -
 app/src/main/res/values-ru-rRU/strings.xml    |   7 -
 app/src/main/res/values-sv-rSE/strings.xml    |   7 -
 app/src/main/res/values-tr-rTR/strings.xml    |   7 -
 app/src/main/res/values-uk-rUA/strings.xml    |   7 -
 app/src/main/res/values-zh-rTW/strings.xml    |   7 -
 app/src/main/res/values/strings.xml           |  12 +-
 .../res/values/untranslatable_strings.xml     |   2 +-
 gradle/libs.versions.toml                     |   2 +-
 38 files changed, 188 insertions(+), 327 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1e659e..993ca72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,23 +4,24 @@
   appealing user interface.
 - **New**: Implemented date-based filtering in the Analyze screen, allowing for easier file
   selection and management.
-- **Patch**:Resolved an issue where APK installation from the App Manager was not functioning
+- **Patch**: Resolved an issue where APK installation from the App Manager was not functioning
   correctly.
-- **Patch**:Improved the "Select All" button behavior in the App Manager to ensure accurate state
+- **Patch**: Improved the "Select All" button behavior in the App Manager to ensure accurate state
   representation.
 - **New**: Introduced loading indicators in the App Manager for a smoother and more informative
   experience.
 - **New**: Added messages to indicate when no apps or APKs are found.
-- **Patch**:Optimized app loading speed in the App Manager through code refactoring and efficiency
+- **Patch**: Optimized app loading speed in the App Manager through code refactoring and efficiency
   improvements.
 - **New**: Enabled real-time RAM usage monitoring in the Memory Manager.
+- **New**: A new Trash screen has been added to provide more granular control over your device's storage.
 - **New**: Added a loading animation to the Memory Manager for visual feedback during data
   retrieval.
 - **New**: Introduced a new setting to customize the app's startup page, providing users with
   greater control over their initial experience.
 - **New**: Added an option to disable the bounce click effect for users who prefer a more
   traditional interaction style.
-- **Patch**:Resolved an issue where language selection was not consistently applied.
+- **Patch**: Resolved an issue where language selection was not consistently applied.
 - **New**: Added a snackbar notification for older Android versions when users copy device
   information from the About section.
 - **New**: Integrated haptic feedback for swipe gestures, enhancing the tactile response and user
@@ -29,7 +30,7 @@
 - **New**: Redesigned the Settings page, aligning it with the modern aesthetics of the Android 15
   design system.
 - **Minor**: Backported the app to support devices running Android 6.0 and above.
-- **Patch**:Fixed visual glitches within the App Manager.
+- **Patch**: Fixed visual glitches within the App Manager.
 - **Major**: Restructured the app's code flow for improved organization and future extensibility.
 - **Major**: Implemented a robust error handling mechanism to gracefully manage unexpected
   situations and provide helpful feedback to users.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 584b006..4798963 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -8,13 +8,13 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "com.d4rk.cleaner"
     defaultConfig {
         applicationId = "com.d4rk.cleaner"
         minSdk = 23
         targetSdk = 35
-        versionCode = 138
+        versionCode = 139
         versionName = "3.0.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += listOf(
@@ -64,6 +64,7 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlinOptions {
         jvmTarget = "17"
     }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/datastore/DataStore.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/datastore/DataStore.kt
index c09c4b4..12f005e 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/data/datastore/DataStore.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/data/datastore/DataStore.kt
@@ -152,13 +152,11 @@ class DataStore(context : Context) {
     }
 
     private val lastScanTimestampKey = longPreferencesKey(name = "last_scan_timestamp")
-    val lastScanTimestamp : Flow<Long> = dataStore.data.map { preferences ->
-        preferences[lastScanTimestampKey] ?: 0L
-    }
 
     suspend fun saveLastScanTimestamp(timestamp : Long) {
         dataStore.edit { preferences ->
             preferences[lastScanTimestampKey] = timestamp
+            println("Cleaner for Android -> Saved timestamp: $timestamp")
         }
     }
 
@@ -184,20 +182,6 @@ class DataStore(context : Context) {
 
     private val trashFilePathsKey = stringSetPreferencesKey("trash_file_paths")
 
-    val trashFilePaths: Flow<Set<Pair<String, String>>> = dataStore.data.map { preferences ->
-        preferences[trashFilePathsKey]?.mapNotNull { entry ->
-            val parts = entry.split("||")
-            if (parts.size == 2) {
-                Pair(parts[0] , parts[1])
-            }
-            else {
-                println("Cleaner for Android -> Invalid entry in trashFilePaths: $entry. It should contain the '||' delimiter.")
-                null
-            }
-        }?.toSet() ?: emptySet()
-
-    }
-
     suspend fun addTrashFilePath(pathPair: Pair<String, String>) {
         dataStore.edit { settings ->
             val currentPaths = settings[trashFilePathsKey] ?: emptySet()
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/memorymanager/StorageInfo.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/memorymanager/StorageInfo.kt
index a0db11a..ca5e233 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/memorymanager/StorageInfo.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/memorymanager/StorageInfo.kt
@@ -1,8 +1,12 @@
 package com.d4rk.cleaner.data.model.ui.memorymanager
 
 data class StorageInfo(
-    val totalStorage: Long = 0,
+    val storageUsageProgress: Float = 0f,
     val freeStorage: Long = 0,
     val usedStorage: Long = 0,
-    val storageBreakdown: Map<String, Long> = emptyMap()
+    val freeSpacePercentage: Int = 0,
+    val storageBreakdown: Map<String, Long> = emptyMap(),
+    val usedStorageFormatted: String = "",
+    val totalStorageFormatted: String = "",
+    val cleanedSpace: String = "0 KB" ,
 )
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/screens/UiHomeModel.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/screens/UiHomeModel.kt
index 769021c..ae369f7 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/screens/UiHomeModel.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/data/model/ui/screens/UiHomeModel.kt
@@ -1,14 +1,12 @@
 package com.d4rk.cleaner.data.model.ui.screens
 
+import com.d4rk.cleaner.data.model.ui.memorymanager.StorageInfo
 import java.io.File
 
 data class UiHomeModel(
-    var storageUsageProgress : Float = 0f ,
-    var usedStorageFormatted : String = "" ,
-    var totalStorageFormatted : String = "" ,
+    val storageInfo: StorageInfo = StorageInfo() ,
     var analyzeState : UiAnalyzeModel = UiAnalyzeModel() ,
-    var daysFromLastScan : Int = 0,
-    val cleanedSpace: String = "0 KB",
+    var daysFromLastScan : Int = 0 ,
     var isRescanDialogVisible : Boolean = false ,
 )
 
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 437106e..669a1b4 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
@@ -2,6 +2,7 @@ package com.d4rk.cleaner.ui.components
 
 import android.view.SoundEffectConstants
 import android.view.View
+import androidx.compose.foundation.basicMarquee
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -52,7 +53,7 @@ fun TwoRowButtons(
                 modifier = Modifier.size(ButtonDefaults.IconSize)
             )
             Spacer(Modifier.size(ButtonDefaults.IconSpacing))
-            Text(text = stringResource(id = onStartButtonText))
+            Text(text = stringResource(id = onStartButtonText), modifier = Modifier.basicMarquee())
         }
 
         Spacer(Modifier.width(8.dp))
@@ -73,7 +74,7 @@ fun TwoRowButtons(
                 modifier = Modifier.size(ButtonDefaults.IconSize)
             )
             Spacer(Modifier.size(ButtonDefaults.IconSpacing))
-            Text(text = stringResource(id = onEndButtonText))
+            Text(text = stringResource(id = onEndButtonText), modifier = Modifier.basicMarquee())
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/components/ProgressBar.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/ProgressBar.kt
index f726dac..4fba601 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/components/ProgressBar.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/ProgressBar.kt
@@ -99,7 +99,7 @@ fun CircularDeterminateIndicator(
 @Composable
 fun StorageProgressBar(storageInfo: StorageInfo) {
     val progress: Float =
-        (storageInfo.usedStorage.toFloat() / storageInfo.totalStorage.toFloat()).coerceIn(
+        (storageInfo.usedStorage.toFloat() / storageInfo.storageUsageProgress).coerceIn(
             0f, 1f
         )
     LinearProgressIndicator(
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/components/navigation/NavigationHost.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/navigation/NavigationHost.kt
index ad3cf26..88e85d0 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/components/navigation/NavigationHost.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/navigation/NavigationHost.kt
@@ -9,7 +9,6 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.navDeepLink
 import com.d4rk.cleaner.constants.ui.bottombar.BottomBarRoutes
 import com.d4rk.cleaner.data.datastore.DataStore
 import com.d4rk.cleaner.data.model.ui.navigation.BottomNavigationScreen
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/analyze/AnalyzeScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/analyze/AnalyzeScreen.kt
index 15053c6..a1c0402 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/analyze/AnalyzeScreen.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/analyze/AnalyzeScreen.kt
@@ -529,19 +529,23 @@ fun FileCard(
                 onCheckedChange(checked)
             } , modifier = Modifier.align(Alignment.TopEnd))
 
-            Text(
-                text = file.name ,
-                maxLines = 1 ,
-                overflow = TextOverflow.Ellipsis ,
+            Box(
                 modifier = Modifier
                         .fillMaxWidth()
-                        .basicMarquee()
                         .background(
                             color = Color.Black.copy(alpha = 0.4f)
                         )
-                        .padding(8.dp)
                         .align(Alignment.BottomCenter)
-            )
+            ) {
+                Text(
+                    text = file.name ,
+                    maxLines = 1 ,
+                    overflow = TextOverflow.Ellipsis ,
+                    modifier = Modifier
+                            .basicMarquee()
+                            .padding(8.dp)
+                )
+            }
         }
     }
 }
@@ -587,6 +591,7 @@ fun SelectAllComposable(
                         Icon(
                             imageVector = Icons.Filled.Check ,
                             contentDescription = null ,
+                            modifier = Modifier.size(18.dp)
                         )
                     }
                 }
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 1435f8c..9118d30 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
@@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -26,7 +25,6 @@ import androidx.compose.runtime.key
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
@@ -80,19 +78,19 @@ fun HomeScreen() {
         ) {
 
             if (! uiState.analyzeState.isAnalyzeScreenVisible) {
-                CircularDeterminateIndicator(progress = uiState.storageUsageProgress ,
+                CircularDeterminateIndicator(progress = uiState.storageInfo.storageUsageProgress ,
                                              modifier = Modifier
                                                      .align(Alignment.TopCenter)
                                                      .offset(y = 98.dp) ,
                                              onClick = {
                                                  viewModel.analyze()
                                              })
-                LastScanInfo(
+                ExtraStorageInfo(
                     modifier = Modifier
                             .align(Alignment.BottomCenter)
                             .padding(bottom = 16.dp) ,
-                    cleanedSpace = uiState.cleanedSpace ,
-                    daysFromLastScan = uiState.daysFromLastScan ,
+                    cleanedSpace = uiState.storageInfo.cleanedSpace ,
+                    freeSpace = "${uiState.storageInfo.freeSpacePercentage} %",
                 )
             }
 
@@ -117,12 +115,11 @@ fun HomeScreen() {
 }
 
 @Composable
-fun LastScanInfo(
+fun ExtraStorageInfo(
     modifier : Modifier = Modifier ,
     cleanedSpace : String ,
-    daysFromLastScan : Int ,
+    freeSpace : String ,
 ) {
-    val context = LocalContext.current
 
     Row(
         modifier = modifier
@@ -135,30 +132,34 @@ fun LastScanInfo(
         InfoColumn(
             title = stringResource(id = R.string.cleaned_space) ,
             value = cleanedSpace ,
-            isRecent = false
+            modifier = Modifier.weight(1f)
         )
 
         VerticalDivider()
 
         InfoColumn(
-            title = stringResource(id = R.string.last_scan) ,
-            value = context.getString(R.string.last_scan_days_ago , daysFromLastScan) ,
-            isRecent = daysFromLastScan <= 2
+            title = stringResource(id = R.string.free_space) ,
+            value = freeSpace,
+            modifier = Modifier.weight(1f)
         )
     }
 }
 
 @Composable
-fun InfoColumn(title : String , value : String , isRecent : Boolean) {
+fun InfoColumn(
+    title: String,
+    value: String,
+    modifier: Modifier = Modifier
+) {
     Column(
-        horizontalAlignment = Alignment.CenterHorizontally , modifier = Modifier.wrapContentSize()
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = modifier
     ) {
-        Text(text = title , style = MaterialTheme.typography.bodySmall)
+        Text(text = title, style = MaterialTheme.typography.bodySmall)
         Text(
-            text = value ,
-            style = MaterialTheme.typography.bodyMedium ,
-            color = if (isRecent) Color.Green else MaterialTheme.colorScheme.onSurface ,
-            maxLines = 2 ,
+            text = value,
+            style = MaterialTheme.typography.bodyMedium,
+            maxLines = 2,
             overflow = TextOverflow.Ellipsis
         )
     }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/HomeViewModel.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/HomeViewModel.kt
index 820a43a..58c3564 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/HomeViewModel.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/HomeViewModel.kt
@@ -27,49 +27,51 @@ class HomeViewModel(application : Application) : BaseViewModel(application) {
     val uiState : StateFlow<UiHomeModel> = _uiState
 
     init {
-        prepareScreenData()
-    }
-
-    /**
-     * Loads initial screen data, including storage info and file types data.
-     */
-    private fun prepareScreenData() {
         updateStorageInfo()
         populateFileTypesData()
-        loadCleanedSpaceAndLastScan()
+        loadCleanedSpace()
     }
 
     /**
-     * Updates the storage information in the UI state.
+     * Updates the storage information (used and total storage) in the UI state.
      */
     private fun updateStorageInfo() {
         viewModelScope.launch(coroutineExceptionHandler) {
             repository.getStorageInfo { uiHomeModel ->
                 _uiState.update {
                     it.copy(
-                        storageUsageProgress = uiHomeModel.storageUsageProgress ,
-                        usedStorageFormatted = uiHomeModel.usedStorageFormatted ,
-                        totalStorageFormatted = uiHomeModel.totalStorageFormatted
+                        storageInfo = it.storageInfo.copy(
+                            storageUsageProgress = uiHomeModel.storageInfo.storageUsageProgress ,
+                            freeSpacePercentage = uiHomeModel.storageInfo.freeSpacePercentage
+                        )
                     )
                 }
             }
         }
     }
 
-    private fun loadCleanedSpaceAndLastScan() {
+    /**
+     * Loads the cleaned space and last scan information from DataStore and updates the UI state.
+     */
+    private fun loadCleanedSpace() {
         viewModelScope.launch(coroutineExceptionHandler) {
-            repository.dataStore.cleanedSpace.collect { cleanedSpace ->
-                _uiState.update { it.copy(cleanedSpace = StorageUtils.formatSize(cleanedSpace)) }
-            }
-
-            repository.getLastScanInfo { daysFromLastScan ->
-                _uiState.update { it.copy(daysFromLastScan = daysFromLastScan) }
+            with(repository) {
+                dataStore.cleanedSpace.collect { cleanedSpace ->
+                    _uiState.update {
+                        it.copy(
+                            storageInfo = it.storageInfo.copy(
+                                cleanedSpace = StorageUtils.formatSize(cleanedSpace)
+                            )
+                        )
+                    }
+                }
             }
         }
     }
 
     /**
-     * Initiates file analysis and updates the UI state with the results.
+     * Analyzes files to find duplicates, empty folders, and other relevant information.
+     * Updates the UI state with the analysis results.
      */
     fun analyze() {
         viewModelScope.launch(context = Dispatchers.Default + coroutineExceptionHandler) {
@@ -151,7 +153,7 @@ class HomeViewModel(application : Application) : BaseViewModel(application) {
                         areAllFilesSelected = when {
                             newSelectedCount == currentUiState.analyzeState.scannedFileList.size && newSelectedCount > 0 -> true
                             newSelectedCount == 0 -> false
-                            isChecked -> currentUiState.analyzeState.areAllFilesSelected // Maintain 'select all' state if an item was checked and all were already checked
+                            isChecked -> currentUiState.analyzeState.areAllFilesSelected
                             else -> false
                         }
                     )
@@ -189,28 +191,28 @@ class HomeViewModel(application : Application) : BaseViewModel(application) {
      */
     fun clean() {
         viewModelScope.launch(context = Dispatchers.Default + coroutineExceptionHandler) {
+            showLoading()
             val filesToDelete =
                     _uiState.value.analyzeState.fileSelectionMap.filter { it.value }.keys
-            showLoading()
-
-            val totalCleanedSpace = filesToDelete.sumOf { it.length() } // Calculate cleaned space
-
-            repository.deleteFiles(filesToDelete) {
-                _uiState.update { currentUiState ->
-                    currentUiState.copy(analyzeState = currentUiState.analyzeState.copy(
-                        scannedFileList = currentUiState.analyzeState.scannedFileList.filterNot {
-                            filesToDelete.contains(it)
-                        } ,
-                        selectedFilesCount = 0 ,
-                        areAllFilesSelected = false ,
-                        fileSelectionMap = emptyMap() ,
-                        isAnalyzeScreenVisible = false ,
-                    ))
+            val clearedSpaceTotalSize = filesToDelete.sumOf { it.length() }
+            with(repository) {
+                deleteFiles(filesToDelete) {
+                    _uiState.update { currentUiState ->
+                        currentUiState.copy(analyzeState = currentUiState.analyzeState.copy(
+                            scannedFileList = currentUiState.analyzeState.scannedFileList.filterNot {
+                                filesToDelete.contains(it)
+                            } ,
+                            selectedFilesCount = 0 ,
+                            areAllFilesSelected = false ,
+                            fileSelectionMap = emptyMap() ,
+                            isAnalyzeScreenVisible = false ,
+                        ))
+                    }
+                    updateStorageInfo()
                 }
-                updateStorageInfo()
-                viewModelScope.launch(Dispatchers.IO) {
-                    repository.dataStore.addCleanedSpace(totalCleanedSpace)
-                    repository.dataStore.saveLastScanTimestamp(System.currentTimeMillis())
+                with(dataStore) {
+                    addCleanedSpace(clearedSpaceTotalSize)
+                    saveLastScanTimestamp(System.currentTimeMillis())
                 }
             }
             hideLoading()
@@ -225,20 +227,23 @@ class HomeViewModel(application : Application) : BaseViewModel(application) {
             showLoading()
             val filesToMove =
                     _uiState.value.analyzeState.fileSelectionMap.filter { it.value }.keys.toList()
-            val totalTrashSize = filesToMove.sumOf { it.length() }
-            repository.moveToTrash(filesToMove) {
-                _uiState.update { currentUiState ->
-                    currentUiState.copy(analyzeState = currentUiState.analyzeState.copy(
-                        scannedFileList = currentUiState.analyzeState.scannedFileList.filterNot { existingFile ->
-                            filesToMove.any { movedFile -> existingFile.absolutePath == movedFile.absolutePath }
-                        } ,
-                        selectedFilesCount = 0 ,
-                        areAllFilesSelected = false ,
-                        fileSelectionMap = emptyMap()))
+            val totalFileSizeToMove = filesToMove.sumOf { it.length() }
+            with(repository) {
+                moveToTrash(filesToMove) {
+                    _uiState.update { currentUiState ->
+                        currentUiState.copy(analyzeState = currentUiState.analyzeState.copy(
+                            scannedFileList = currentUiState.analyzeState.scannedFileList.filterNot { existingFile ->
+                                filesToMove.any { movedFile -> existingFile.absolutePath == movedFile.absolutePath }
+                            } ,
+                            selectedFilesCount = 0 ,
+                            areAllFilesSelected = false ,
+                            isAnalyzeScreenVisible = false ,
+                            fileSelectionMap = emptyMap()))
+                    }
+                    updateStorageInfo()
                 }
-                updateStorageInfo()
+                addTrashSize(totalFileSizeToMove)
             }
-            repository.addTrashSize(totalTrashSize)
             hideLoading()
         }
     }
@@ -265,8 +270,10 @@ class HomeViewModel(application : Application) : BaseViewModel(application) {
      * @param isVisible True to show the dialog, false to hide it.
      */
     fun setDeleteForeverConfirmationDialogVisibility(isVisible : Boolean) {
-        _uiState.update {
-            it.copy(analyzeState = it.analyzeState.copy(isDeleteForeverConfirmationDialogVisible = isVisible))
+        viewModelScope.launch(coroutineExceptionHandler) {
+            _uiState.update {
+                it.copy(analyzeState = it.analyzeState.copy(isDeleteForeverConfirmationDialogVisible = isVisible))
+            }
         }
     }
 
@@ -275,8 +282,10 @@ class HomeViewModel(application : Application) : BaseViewModel(application) {
      * @param isVisible True to show the dialog, false to hide it.
      */
     fun setMoveToTrashConfirmationDialogVisibility(isVisible : Boolean) {
-        _uiState.update {
-            it.copy(analyzeState = it.analyzeState.copy(isMoveToTrashConfirmationDialogVisible = isVisible))
+        viewModelScope.launch(coroutineExceptionHandler) {
+            _uiState.update {
+                it.copy(analyzeState = it.analyzeState.copy(isMoveToTrashConfirmationDialogVisible = isVisible))
+            }
         }
     }
 }
\ No newline at end of file
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 d0496db..a53207b 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
@@ -7,7 +7,6 @@ import com.d4rk.cleaner.data.model.ui.screens.FileTypesData
 import com.d4rk.cleaner.data.model.ui.screens.UiHomeModel
 import com.d4rk.cleaner.utils.cleaning.FileScanner
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.withContext
 import java.io.File
 
@@ -36,17 +35,6 @@ class HomeRepository(
         }
     }
 
-    suspend fun getLastScanInfo(onSuccess : (Int) -> Unit) {
-        withContext(Dispatchers.IO) {
-            dataStore.lastScanTimestamp.firstOrNull()?.let { timestamp ->
-                val daysFromLastScan = calculateDaysSince(timestamp)
-                withContext(Dispatchers.Main) {
-                    onSuccess(daysFromLastScan)
-                }
-            }
-        }
-    }
-
     /**
      * Retrieves file types data from resources.
      * @param onSuccess Callback function to be invoked with the file types data.
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 c5dcfb4..88a962d 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
@@ -5,12 +5,12 @@ import android.media.MediaScannerConnection
 import android.os.Environment
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.data.datastore.DataStore
+import com.d4rk.cleaner.data.model.ui.memorymanager.StorageInfo
 import com.d4rk.cleaner.data.model.ui.screens.FileTypesData
 import com.d4rk.cleaner.data.model.ui.screens.UiHomeModel
 import com.d4rk.cleaner.utils.cleaning.StorageUtils
 import kotlinx.coroutines.flow.first
 import java.io.File
-import java.util.concurrent.TimeUnit
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
@@ -22,30 +22,21 @@ abstract class HomeRepositoryImplementation(
     private val trashDir =
             File(application.getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS) , "Trash")
 
-    suspend fun getStorageInfo() : UiHomeModel {
+    suspend fun getStorageInfo(): UiHomeModel {
         return suspendCoroutine { continuation ->
-            StorageUtils.getStorageInfo(application) { used , total , usageProgress ->
+            StorageUtils.getStorageInfo(application) { _ , _ , _ , usageProgress , freeSpacePercentage ->
                 continuation.resume(
                     UiHomeModel(
-                        storageUsageProgress = usageProgress ,
-                        usedStorageFormatted = used ,
-                        totalStorageFormatted = total ,
+                        storageInfo = StorageInfo(
+                            storageUsageProgress = usageProgress,
+                            freeSpacePercentage = freeSpacePercentage
+                        )
                     )
                 )
             }
         }
     }
 
-    fun calculateDaysSince(timestamp : Long) : Int {
-        if (timestamp == 0L) return 0
-
-        val currentTime = System.currentTimeMillis()
-        val differenceInMillis = currentTime - timestamp
-        val days = TimeUnit.MILLISECONDS.toDays(differenceInMillis).toInt()
-
-        return days
-    }
-
     suspend fun getFileTypesDataFromResources() : FileTypesData {
         return suspendCoroutine { continuation ->
             val apkExtensions =
@@ -75,12 +66,9 @@ abstract class HomeRepositoryImplementation(
     fun deleteFiles(filesToDelete : Set<File>) {
         filesToDelete.forEach { file ->
             if (file.exists()) {
-                println("Cleaner for Android -> Deleting file/directory: ${file.absolutePath}")
                 file.deleteRecursively()
-                println("Cleaner for Android -> Deleted file/directory: ${file.absolutePath}")
-
             } else {
-                println("Cleaner for Android -> File not found: ${file.absolutePath}")
+               // TODO: add a dialog if no file to delete found
             }
         }
     }
@@ -95,10 +83,7 @@ abstract class HomeRepositoryImplementation(
                 val originalPath = file.absolutePath
                 val destination = File(trashDir , file.name)
 
-                println("Cleaner for Android -> Moving file: ${file.absolutePath} to ${destination.absolutePath}")
-
                 if (file.renameTo(destination)) {
-                    println("Cleaner for Android -> File moved successfully")
                     dataStore.addTrashFileOriginalPath(originalPath)
                     dataStore.addTrashFilePath(originalPath to destination.absolutePath)
 
@@ -110,30 +95,20 @@ abstract class HomeRepositoryImplementation(
                     )
                 }
                 else {
-                    println("Cleaner for Android -> File move failed")
+                    // TODO: Add a dialog for failed files at the end for moving to trash
                 }
             }
             else {
-                println("Cleaner for Android -> File does not exist: ${file.absolutePath}")
+                // TODO: Add a dialog if the file does not exist for moving to trash
             }
         }
     }
 
     suspend fun restoreFromTrash(filesToRestore : Set<File>) {
-        println("Cleaner for Android -> impl logic called")
         val originalPaths = dataStore.trashFileOriginalPaths.first()
-        println("Cleaner for Android -> Original paths from DataStore: $originalPaths")
-        val trashToOriginalMap =
-                dataStore.trashFilePaths.first().associate { it.second to it.first }
-        println("Cleaner for Android -> trashToOriginalMap: $trashToOriginalMap")
-
         filesToRestore.forEach { file ->
-            println("Cleaner for Android -> Attempting to restore: ${file.absolutePath}")
-
             if (file.exists()) {
                 val originalPath = originalPaths.firstOrNull { File(it).name == file.name }
-                println("Cleaner for Android -> Original path found: $originalPath")
-
                 if (originalPath != null) {
                     val destinationFile = File(originalPath)
                     val destinationParent = destinationFile.parentFile
@@ -142,10 +117,7 @@ abstract class HomeRepositoryImplementation(
                         destinationParent.mkdirs()
                     }
 
-                    println("Cleaner for Android -> Restoring to: ${destinationFile.absolutePath}")
-
                     if (file.renameTo(destinationFile)) {
-                        println("Cleaner for Android -> File restored successfully")
                         dataStore.removeTrashFileOriginalPath(originalPath)
                         dataStore.removeTrashFilePath(originalPath)
                         MediaScannerConnection.scanFile(
@@ -155,18 +127,15 @@ abstract class HomeRepositoryImplementation(
                         )
                     }
                     else {
-                        println("Cleaner for Android -> File restore failed. Check if the file already exists or there is a permission issue.") // More informative message
+                        // TODO: Add a dialog for failed files at the end
                     }
                 }
                 else {
-                    println("Cleaner for Android -> No original path found for ${file.name}. Restoring to Downloads.")
                     val downloadsDir =
                             Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
                     val destinationFile = File(downloadsDir , file.name)
 
                     if (file.renameTo(destinationFile)) {
-                        println("Cleaner for Android -> File restored to Downloads successfully")
-
                         MediaScannerConnection.scanFile(
                             application ,
                             arrayOf(destinationFile.absolutePath , file.absolutePath) ,
@@ -175,12 +144,12 @@ abstract class HomeRepositoryImplementation(
                         )
                     }
                     else {
-                        println("Cleaner for Android -> File restore to Downloads failed")
+                       // TODO: Add a dialog if the move to download has been failed
                     }
                 }
             }
             else {
-                println("Cleaner for Android -> File does not exist in trash: ${file.absolutePath}")
+                // TODO: Add a dialog if the file does not exist
             }
         }
     }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/imageoptimizer/imageoptimizer/tabs/ManualModeComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/imageoptimizer/imageoptimizer/tabs/ManualModeComposable.kt
index f88e93c..5db724a 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/imageoptimizer/imageoptimizer/tabs/ManualModeComposable.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/imageoptimizer/imageoptimizer/tabs/ManualModeComposable.kt
@@ -92,7 +92,7 @@ fun ManualModeScreen(viewModel: ImageOptimizerViewModel) {
         ) {
             Text(
                 text = stringResource(
-                    R.string.image_compressor_percentage_format, qualityValue.toInt()
+                    R.string.percentage_format, qualityValue.toInt()
                 )
             )
             Slider(
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/main/repository/MainRepository.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/main/repository/MainRepository.kt
index ae5afe7..10cedb8 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/main/repository/MainRepository.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/main/repository/MainRepository.kt
@@ -6,7 +6,6 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import com.d4rk.cleaner.data.datastore.DataStore
 import com.d4rk.cleaner.notifications.managers.AppUpdateNotificationsManager
-import com.d4rk.cleaner.utils.cleaning.StorageUtils
 import com.google.android.play.core.appupdate.AppUpdateManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/memory/MemoryManagerScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/memory/MemoryManagerScreen.kt
index a18ded6..4090fd4 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/memory/MemoryManagerScreen.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/memory/MemoryManagerScreen.kt
@@ -160,10 +160,10 @@ fun MemoryManagerComposable() {
 @Composable
 fun StorageInfoCard(storageInfo: StorageInfo) {
 
-    val progress: Float = if (storageInfo.totalStorage == 0L) {
+    val progress: Float = if (storageInfo.storageUsageProgress.toLong() == 0L) {
         0f
     } else {
-        storageInfo.usedStorage.toFloat() / storageInfo.totalStorage.toFloat()
+        storageInfo.usedStorage.toFloat() / storageInfo.storageUsageProgress
     }
 
     Column(
@@ -192,7 +192,7 @@ fun StorageInfoCard(storageInfo: StorageInfo) {
             label = stringResource(id = R.string.free), size = storageInfo.freeStorage
         )
         StorageInfoText(
-            label = stringResource(id = R.string.total), size = storageInfo.totalStorage
+            label = stringResource(id = R.string.total), size = storageInfo.storageUsageProgress.toLong()
         )
     }
 }
@@ -294,7 +294,7 @@ fun RamInfoCard(ramInfo: RamInfo) {
         Spacer(modifier = Modifier.height(8.dp))
         StorageProgressBar(
             StorageInfo(
-                totalStorage = ramInfo.totalRam,
+                storageUsageProgress = ramInfo.totalRam.toFloat(),
                 usedStorage = ramInfo.usedRam,
                 freeStorage = ramInfo.availableRam
             )
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/memory/repository/MemoryManagerRepositoryImplementation.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/memory/repository/MemoryManagerRepositoryImplementation.kt
index aced40b..18e8b07 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/memory/repository/MemoryManagerRepositoryImplementation.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/memory/repository/MemoryManagerRepositoryImplementation.kt
@@ -19,15 +19,15 @@ import kotlin.math.pow
 
 abstract class MemoryManagerRepositoryImplementation(val application : Application) {
 
-    suspend fun getStorageInfo() : StorageInfo {
+    suspend fun getStorageInfo(): StorageInfo {
         return suspendCoroutine { continuation ->
-            StorageUtils.getStorageInfo(application) { used , total , _ ->
+            StorageUtils.getStorageInfo(application) { used , total , _ , _ , _ ->
                 val usedStorageBytes : Double = (used.toDoubleOrNull() ?: 0.0) * 1024.0.pow(n = 3)
                 val totalStorageBytes : Double = (total.toDoubleOrNull() ?: 0.0) * 1024.0.pow(n = 3)
 
                 val storageBreakdown : Map<String , Long> = getStorageBreakdown(application)
                 val storageInfo = StorageInfo(
-                    totalStorage = totalStorageBytes.toLong() ,
+                    storageUsageProgress = totalStorageBytes.toFloat() ,
                     freeStorage = (totalStorageBytes - usedStorageBytes).toLong() ,
                     usedStorage = usedStorageBytes.toLong() ,
                     storageBreakdown = storageBreakdown
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 de75d47..d51efb8 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
@@ -12,6 +12,12 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import java.io.File
 
+/**
+ * ViewModel for the Trash screen. Manages the display and interaction with trashed files.
+ *
+ * @param application The application instance.
+ * @author Mihai-Cristian Condrea
+ */
 class TrashViewModel(application : Application) : BaseViewModel(application) {
     private val repository = HomeRepository(DataStore(application) , application)
     private val _uiState = MutableStateFlow(UiTrashModel())
@@ -21,16 +27,23 @@ class TrashViewModel(application : Application) : BaseViewModel(application) {
         loadTrashItems()
     }
 
+    /**
+     * Loads the list of trashed files from the repository.
+     */
     private fun loadTrashItems() {
         viewModelScope.launch(coroutineExceptionHandler) {
             showLoading()
-            val trashFiles = repository.getTrashFiles()
-            _uiState.value = _uiState.value.copy(trashFiles = trashFiles)
+            _uiState.value = _uiState.value.copy(trashFiles = repository.getTrashFiles())
             hideLoading()
         }
     }
 
-
+    /**
+     * Handles changes in file selection state.
+     *
+     * @param file The file whose selection state has changed.
+     * @param isChecked True if the file is selected, false otherwise.
+     */
     fun onFileSelectionChange(file : File , isChecked : Boolean) {
         viewModelScope.launch(coroutineExceptionHandler) {
             val updatedSelections = _uiState.value.fileSelectionStates + (file to isChecked)
@@ -39,35 +52,42 @@ class TrashViewModel(application : Application) : BaseViewModel(application) {
         }
     }
 
+    /**
+     * Restores selected files from the trash.
+     */
     fun restoreFromTrash() {
         viewModelScope.launch(coroutineExceptionHandler) {
-            val filesToRestore = _uiState.value.fileSelectionStates.filter { it.value }.keys
-            println("Cleaner for Android -> restoreFromTrash() called")
-
-            println("Cleaner for Android -> Files to restore: $filesToRestore")
-
             showLoading()
-
+            val filesToRestore = _uiState.value.fileSelectionStates.filter { it.value }.keys
+            val totalFileSizeToRestore = filesToRestore.sumOf { it.length() }
             repository.restoreFromTrash(filesToRestore) {
                 loadTrashItems()
             }
-            repository.subtractTrashSize(filesToRestore.sumOf { it.length() })
+            repository.subtractTrashSize(totalFileSizeToRestore)
             hideLoading()
         }
     }
 
+    /**
+     * Permanently deletes selected files from the trash.
+     */
     fun clean() {
         viewModelScope.launch(context = Dispatchers.Default + coroutineExceptionHandler) {
-            val filesToDelete = _uiState.value.fileSelectionStates.filter { it.value }.keys
-            println("Cleaner for Android -> Starting clean. Files to delete: ${filesToDelete.joinToString { it.absolutePath }}") // Log files to be deleted
             showLoading()
-            println("Cleaner for Android -> Showing loading indicator")
-            repository.deleteFiles(filesToDelete) {
-                loadTrashItems()
+            val filesToDelete = _uiState.value.fileSelectionStates.filter { it.value }.keys
+            val totalFileSizeToDelete = filesToDelete.sumOf { it.length() }
+            with(repository) {
+                deleteFiles(filesToDelete) {
+                    loadTrashItems()
+                }
+
+                with(dataStore) {
+                    subtractTrashSize(totalFileSizeToDelete)
+                    addCleanedSpace(totalFileSizeToDelete)
+                    saveLastScanTimestamp(System.currentTimeMillis())
+                }
             }
-            repository.subtractTrashSize(filesToDelete.sumOf { it.length() })
             hideLoading()
-            println("Cleaner for Android -> Hiding loading indicator")
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/utils/cleaning/StorageUtils.kt b/app/src/main/kotlin/com/d4rk/cleaner/utils/cleaning/StorageUtils.kt
index 9265cac..f14c483 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/utils/cleaning/StorageUtils.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/utils/cleaning/StorageUtils.kt
@@ -32,8 +32,8 @@ object StorageUtils {
      */
 
     fun getStorageInfo(
-        context : Context ,
-        callback : (used : String , total : String , usageProgress : Float) -> Unit ,
+        context: Context,
+        callback: (used: String, total: String, totalSpace: Long, usageProgress: Float, freeSize: Int) -> Unit
     ) {
         val storageManager : StorageManager =
                 context.getSystemService(Context.STORAGE_SERVICE) as StorageManager
@@ -58,7 +58,9 @@ object StorageUtils {
         val totalFormatted : String =
                 (totalSize / (1024.0 * 1024.0 * 1024.0)).roundToInt().toString()
         val usageProgress : Float = usedSize.toFloat() / totalSize.toFloat()
-        callback(usedFormatted , totalFormatted , usageProgress)
+        val freeSize = totalSize - usedSize
+        val freeSpacePercentage: Int = ((freeSize.toDouble() / totalSize.toDouble()) * 100).toInt()
+        callback(usedFormatted, totalFormatted, totalSize, usageProgress, freeSpacePercentage)
     }
 
     /**
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 9207ed0..bb505e2 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">Отваряне на навигационното чекмедже</string>
 
     <string name="home">Начало</string>
-    <string name="storage_used">%1$s/%2$s GB\nИзползвано</string>
-    <string name="analyze">Анализиране</string>
-    <string name="clean">Почистване</string>
     <string name="quick_scan">Бързо сканиране</string>
     <string name="apks">APK файлове</string>
     <string name="archives">Архиви</string>
@@ -28,8 +25,6 @@
     </plurals>
     <string name="status_no_files_selected">Статус: Не са избрани файлове</string>
     <string name="select_all">Избиране на всички</string>
-    <string name="rescan_title">Сканиране отново?</string>
-    <string name="rescan_message">Сигурни ли сте, че искате да сканирате отново?</string>
     <string name="file_not_found">Файлът не е намерен.</string>
     <string name="no_files_found">Не са намерени файлове</string>
     <string name="activity_not_found">Дейността не е намерена.</string>
@@ -45,7 +40,6 @@
     <string name="uninstall">Деинсталиране</string>
     <string name="share">Споделяне</string>
     <string name="app_info">Информация за приложението</string>
-    <string name="installed">Инсталирано"</string>
     <string name="install">Инсталирай</string>
     <string name="share_apk">Сподели APK</string>
     <string name="no_app_installed">Няма инсталирани приложения</string>
@@ -280,7 +274,6 @@
     <string name="learn_more">Научете повече</string>
 
     <string name="close">Затваряне?</string>
-    <string name="require_restart">Необходимо е рестартиране!</string>
     <string name="snack_network_error">Възникна мрежова грешка при проверка за актуализации</string>
     <string name="snack_general_error">Възникна грешка при проверка за актуализации</string>
     <string name="summary_close">Сигурни ли сте, че искате да излезете?</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index c53b4c4..0e6395e 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">Navigationslade öffnen</string>
 
     <string name="home">Startseite</string>
-    <string name="storage_used">%1$s/%2$s GB\nVerwendet</string>
-    <string name="analyze">Analysieren</string>
-    <string name="clean">Reinigen</string>
     <string name="quick_scan">Schnellscan</string>
     <string name="apks">APKs</string>
     <string name="archives">Archive</string>
@@ -28,8 +25,6 @@
     </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>
-    <string name="rescan_message">Sind Sie sicher, dass Sie erneut scannen möchten?</string>
     <string name="file_not_found">Datei nicht gefunden.</string>
     <string name="activity_not_found">Aktivität nicht gefunden.</string>
     <string name="no_files_found">Keine Dateien gefunden</string>
@@ -45,7 +40,6 @@
     <string name="uninstall">Deinstallieren</string>
     <string name="share">Teilen</string>
     <string name="app_info">App-Info</string>
-    <string name="installed">Installiert"</string>
     <string name="install">Installieren</string>
     <string name="share_apk">APK teilen</string>
     <string name="no_app_installed">Keine Apps installiert</string>
@@ -280,7 +274,6 @@
     <string name="learn_more">Mehr erfahren</string>
 
     <string name="close">Schließen?</string>
-    <string name="require_restart">Neustart erforderlich!</string>
     <string name="snack_network_error">Beim Überprüfen auf Updates ist ein Netzwerkfehler aufgetreten</string>
     <string name="snack_general_error">Beim Überprüfen auf Updates ist ein Fehler aufgetreten</string>
     <string name="summary_close">Sind Sie sicher, dass Sie beenden möchten?</string>
diff --git a/app/src/main/res/values-es-rGQ/strings.xml b/app/src/main/res/values-es-rGQ/strings.xml
index 2a403f4..55833ea 100644
--- a/app/src/main/res/values-es-rGQ/strings.xml
+++ b/app/src/main/res/values-es-rGQ/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">Abrir el cajón de navegación</string>
 
     <string name="home">Inicio</string>
-    <string name="storage_used">%1$s/%2$s GB\nUtilizado</string>
-    <string name="analyze">Analizar</string>
-    <string name="clean">Limpiar</string>
     <string name="quick_scan">Escaneo rápido</string>
     <string name="apks">APK</string>
     <string name="archives">Archivos</string>
@@ -29,8 +26,6 @@
     </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>
-    <string name="rescan_message">¿Estás seguro de que quieres escanear de nuevo?</string>
     <string name="file_not_found">Archivo no encontrado.</string>
     <string name="no_files_found">No se encontraron archivos</string>
     <string name="activity_not_found">Actividad no encontrada.</string>
@@ -46,7 +41,6 @@
     <string name="uninstall">Desinstalar</string>
     <string name="share">Compartir</string>
     <string name="app_info">Información de la aplicación</string>
-    <string name="installed">Instalado"</string>
     <string name="install">Instalar</string>
     <string name="share_apk">Compartir APK</string>
     <string name="no_app_installed">No hay aplicaciones instaladas</string>
@@ -281,7 +275,6 @@
     <string name="learn_more">Más información</string>
 
     <string name="close">¿Cerrar?</string>
-    <string name="require_restart">¡Se requiere reiniciar!</string>
     <string name="snack_network_error">Ocurrió un error de red al verificar las actualizaciones</string>
     <string name="snack_general_error">Ocurrió un error al verificar las actualizaciones</string>
     <string name="summary_close">¿Estás seguro de que quieres salir?</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index a53506b..5254f0a 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">Ouvrir le tiroir de navigation</string>
 
     <string name="home">Accueil</string>
-    <string name="storage_used">%1$s/%2$s Go\nUtilisé</string>
-    <string name="analyze">Analyser</string>
-    <string name="clean">Nettoyer</string>
     <string name="quick_scan">Analyse rapide</string>
     <string name="apks">APK</string>
     <string name="archives">Archives</string>
@@ -29,8 +26,6 @@
     </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>
-    <string name="rescan_message">Êtes-vous sûr de vouloir re-scanner?</string>
     <string name="file_not_found">Fichier introuvable.</string>
     <string name="no_files_found">Aucun fichier trouvé</string>
     <string name="activity_not_found">Activité introuvable.</string>
@@ -46,7 +41,6 @@
     <string name="uninstall">Désinstaller</string>
     <string name="share">Partager</string>
     <string name="app_info">Informations sur l’application</string>
-    <string name="installed">Installé"</string>
     <string name="install">Installer</string>
     <string name="share_apk">Partager APK</string>
     <string name="no_app_installed">Aucune application installée</string>
@@ -281,7 +275,6 @@
     <string name="learn_more">En savoir plus</string>
 
     <string name="close">Fermer?</string>
-    <string name="require_restart">Un redémarrage est nécessaire!</string>
     <string name="snack_network_error">Une erreur réseau s\'est produite lors de la recherche de mises à jour.</string>
     <string name="snack_general_error">Une erreur s\'est produite lors de la recherche de mises à jour.</string>
     <string name="summary_close">Êtes-vous sûr de vouloir quitter?</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 1e4bfa0..b1ee24a 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">नेविगेशन ड्रॉअर खोलें</string>
 
     <string name="home">होम</string>
-    <string name="storage_used">%1$s/%2$s GB\nइस्तेमाल हुआ</string>
-    <string name="analyze">विश्लेषण करें</string>
-    <string name="clean">साफ करें</string>
     <string name="quick_scan">त्वरित स्कैन</string>
     <string name="apks">APK</string>
     <string name="archives">पुरालेख</string>
@@ -28,8 +25,6 @@
     </plurals>
     <string name="status_no_files_selected">स्थिति: कोई फ़ाइलें चयनित नहीं हैं</string>
     <string name="select_all">सबका चयन करें</string>
-    <string name="rescan_title">पुनः स्कैन करें?</string>
-    <string name="rescan_message">क्या आप सुनिश्चित हैं कि आप फिर से स्कैन करना चाहते हैं?</string>
     <string name="file_not_found">फ़ाइल नहीं मिली।</string>
     <string name="no_files_found">कोई फ़ाइल नहीं मिली</string>
     <string name="activity_not_found">गतिविधि नहीं मिली।</string>
@@ -45,7 +40,6 @@
     <string name="uninstall">अनइंस्टॉल करें</string>
     <string name="share">साझा करें</string>
     <string name="app_info">ऐप जानकारी</string>
-    <string name="installed">स्थापित"</string>
     <string name="install">इंस्टॉल करें</string>
     <string name="share_apk">APK साझा करें</string>
     <string name="no_app_installed">कोई ऐप इंस्टॉल नहीं हैं</string>
@@ -280,7 +274,6 @@
     <string name="learn_more">और जानें</string>
 
     <string name="close">बंद करें?</string>
-    <string name="require_restart">पुनः प्रारंभ करने की आवश्यकता है!</string>
     <string name="snack_network_error">अपडेट की जाँच करते समय नेटवर्क त्रुटि हुई</string>
     <string name="snack_general_error">अपडेट की जाँच करते समय एक त्रुटि हुई</string>
     <string name="summary_close">क्या आप सुनिश्चित हैं कि आप बाहर निकलना चाहते हैं?</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 29f2517..0829094 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">Navigációs fiók megnyitása</string>
 
     <string name="home">Kezdőlap</string>
-    <string name="storage_used">%1$s/%2$s GB\nHasznált</string>
-    <string name="analyze">Elemzés</string>
-    <string name="clean">Tisztítás</string>
     <string name="quick_scan">Gyorskeresés</string>
     <string name="apks">APK-k</string>
     <string name="archives">Archívumok</string>
@@ -28,8 +25,6 @@
     </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>
-    <string name="rescan_message">Biztosan újra szeretnéd ellenőrizni?</string>
     <string name="file_not_found">A fájl nem található.</string>
     <string name="no_files_found">Nem található fájl</string>
     <string name="activity_not_found">Tevékenység nem található.</string>
@@ -45,7 +40,6 @@
     <string name="uninstall">Eltávolítás</string>
     <string name="share">Megosztás</string>
     <string name="app_info">Alkalmazásinformációk</string>
-    <string name="installed">Telepítve"</string>
     <string name="install">Telepítés</string>
     <string name="share_apk">APK megosztása</string>
     <string name="no_app_installed">Nincsenek telepített alkalmazások</string>
@@ -280,7 +274,6 @@
     <string name="learn_more">Tudj meg többet</string>
 
     <string name="close">Bezárás?</string>
-    <string name="require_restart">Újraindítás szükséges!</string>
     <string name="snack_network_error">Hálózati hiba történt a frissítések ellenőrzése során</string>
     <string name="snack_general_error">Hiba történt a frissítések ellenőrzése során</string>
     <string name="summary_close">Biztosan ki szeretne lépni?</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index e341993..76ad2d7 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">Buka laci navigasi</string>
 
     <string name="home">Beranda</string>
-    <string name="storage_used">%1$s/%2$s GB\nDigunakan</string>
-    <string name="analyze">Analisis</string>
-    <string name="clean">Bersihkan</string>
     <string name="quick_scan">Pemindaian Cepat</string>
     <string name="apks">APK</string>
     <string name="archives">Arsip</string>
@@ -27,8 +24,6 @@
     </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>
-    <string name="rescan_message">Anda yakin ingin memindai lagi?</string>
     <string name="file_not_found">File tidak ditemukan.</string>
     <string name="activity_not_found">Aktivitas tidak ditemukan.</string>
     <string name="no_files_found">Tidak ada berkas yang ditemukan</string>
@@ -44,7 +39,6 @@
     <string name="uninstall">Copot pemasangan</string>
     <string name="share">Bagikan</string>
     <string name="app_info">Info aplikasi</string>
-    <string name="installed">Terpasang"</string>
     <string name="install">Pasang</string>
     <string name="share_apk">Bagikan APK</string>
     <string name="no_app_installed">Tidak ada aplikasi yang terinstal</string>
@@ -279,7 +273,6 @@
     <string name="learn_more">Pelajari lebih lanjut</string>
 
     <string name="close">Tutup?</string>
-    <string name="require_restart">Membutuhkan mulai ulang!</string>
     <string name="snack_network_error">Terjadi kesalahan jaringan saat memeriksa pembaruan</string>
     <string name="snack_general_error">Terjadi kesalahan saat memeriksa pembaruan</string>
     <string name="summary_close">Apakah Anda yakin ingin keluar?</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 1c6f981..d9da733 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">Apri il cassetto di navigazione</string>
 
     <string name="home">Home</string>
-    <string name="storage_used">%1$s/%2$s GB\nUtilizzato</string>
-    <string name="analyze">Analizza</string>
-    <string name="clean">Pulisci</string>
     <string name="quick_scan">Scansione rapida</string>
     <string name="apks">APK</string>
     <string name="archives">Archivi</string>
@@ -29,8 +26,6 @@
     </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>
-    <string name="rescan_message">Sei sicuro di voler scansionare di nuovo?</string>
     <string name="file_not_found">File non trovato.</string>
     <string name="no_files_found">Nessun file trovato</string>
     <string name="activity_not_found">Attività non trovata.</string>
@@ -46,7 +41,6 @@
     <string name="uninstall">Disinstalla</string>
     <string name="share">Condividi</string>
     <string name="app_info">Info app</string>
-    <string name="installed">Installato"</string>
     <string name="install">Installa</string>
     <string name="share_apk">Condividi APK</string>
     <string name="no_app_installed">Nessuna app installata</string>
@@ -281,7 +275,6 @@
     <string name="learn_more">Scopri di più</string>
 
     <string name="close">Chiudere?</string>
-    <string name="require_restart">Richiedi riavvio!</string>
     <string name="snack_network_error">Errore di rete durante la ricerca di aggiornamenti</string>
     <string name="snack_general_error">Si è verificato un errore durante la ricerca di aggiornamenti</string>
     <string name="summary_close">Sei sicuro di voler uscire?</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 71c1096..79ec30d 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">ナビゲーションドロワーを開く</string>
 
     <string name="home">ホーム</string>
-    <string name="storage_used">%1$s/%2$s GB\n使用済み</string>
-    <string name="analyze">分析する</string>
-    <string name="clean">クリーン</string>
     <string name="quick_scan">クイックスキャン</string>
     <string name="apks">APK</string>
     <string name="archives">アーカイブ</string>
@@ -27,8 +24,6 @@
     </plurals>
     <string name="status_no_files_selected">ステータス: ファイルが選択されていません</string>
     <string name="select_all">すべて選択</string>
-    <string name="rescan_title">再スキャンしますか？</string>
-    <string name="rescan_message">再スキャンしてもよろしいですか？</string>
     <string name="file_not_found">ファイルが見つかりません。</string>
     <string name="no_files_found">ファイルが見つかりません</string>
     <string name="activity_not_found">アクティビティが見つかりません。</string>
@@ -44,7 +39,6 @@
     <string name="uninstall">アンインストール</string>
     <string name="share">共有</string>
     <string name="app_info">アプリ情報</string>
-    <string name="installed">インストール済み"</string>
     <string name="install">インストール</string>
     <string name="share_apk">APKを共有</string>
     <string name="no_app_installed">インストールされているアプリはありません</string>
@@ -279,7 +273,6 @@
     <string name="learn_more">もっと詳しく知る</string>
 
     <string name="close">閉じる？</string>
-    <string name="require_restart">再起動が必要です！</string>
     <string name="snack_network_error">更新を確認中にネットワークエラーが発生しました</string>
     <string name="snack_general_error">更新を確認中にエラーが発生しました</string>
     <string name="summary_close">本当に終了しますか？</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index c78c899..4d5f618 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">Otwórz szufladę nawigacji</string>
 
     <string name="home">Strona główna</string>
-    <string name="storage_used">%1$s/%2$s GB\nUżywane</string>
-    <string name="analyze">Analizuj</string>
-    <string name="clean">Wyczyść</string>
     <string name="quick_scan">Szybkie skanowanie</string>
     <string name="apks">APK</string>
     <string name="archives">Archiwa</string>
@@ -30,8 +27,6 @@
     </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>
-    <string name="rescan_message">Czy na pewno chcesz skanować ponownie?</string>
     <string name="file_not_found">Plik nie znaleziony.</string>
     <string name="no_files_found">Nie znaleziono plików</string>
     <string name="activity_not_found">Nie znaleziono aktywności.</string>
@@ -47,7 +42,6 @@
     <string name="uninstall">Odinstaluj</string>
     <string name="share">Udostępnij</string>
     <string name="app_info">Informacje o aplikacji</string>
-    <string name="installed">Zainstalowano"</string>
     <string name="install">Zainstaluj</string>
     <string name="share_apk">Udostępnij APK</string>
     <string name="no_app_installed">Brak zainstalowanych aplikacji</string>
@@ -282,7 +276,6 @@
     <string name="learn_more">Dowiedz się więcej</string>
 
     <string name="close">Zamknąć?</string>
-    <string name="require_restart">Wymagane ponowne uruchomienie!</string>
     <string name="snack_network_error">Wystąpił błąd sieci podczas sprawdzania aktualizacji</string>
     <string name="snack_general_error">Wystąpił błąd podczas sprawdzania aktualizacji</string>
     <string name="summary_close">Czy na pewno chcesz wyjść?</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index c93b28e..a1e1815 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">Deschide sertarul de navigare</string>
 
     <string name="home">Acasă</string>
-    <string name="storage_used">%1$s/%2$s GB\nUtilizat</string>
-    <string name="analyze">Analizează</string>
-    <string name="clean">Curăță</string>
     <string name="quick_scan">Scanare rapidă</string>
     <string name="apks">APK-uri</string>
     <string name="archives">Arhive</string>
@@ -29,8 +26,6 @@
     </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>
-    <string name="rescan_message">Sunteți sigur că doriți să scanați din nou?</string>
     <string name="file_not_found">Fișierul nu a fost găsit.</string>
     <string name="no_files_found">Nu s-au găsit fișiere</string>
     <string name="activity_not_found">Activitatea nu a fost găsită.</string>
@@ -46,7 +41,6 @@
     <string name="uninstall">Dezinstalează</string>
     <string name="share">Partajează</string>
     <string name="app_info">Informații despre aplicație</string>
-    <string name="installed">Instalat"</string>
     <string name="install">Instalează</string>
     <string name="share_apk">Partajează APK</string>
     <string name="no_app_installed">Nicio aplicație instalată</string>
@@ -281,7 +275,6 @@
     <string name="learn_more">Află mai multe</string>
 
     <string name="close">Închide?</string>
-    <string name="require_restart">Este necesară o repornire!</string>
     <string name="snack_network_error">A apărut o eroare de rețea în timp ce se verificau actualizările</string>
     <string name="snack_general_error">A apărut o eroare în timp ce se verificau actualizările</string>
     <string name="summary_close">Sunteți sigur că doriți să ieșiți?</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index f130abe..f581f94 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">Открыть боковое меню навигации</string>
 
     <string name="home">Домой</string>
-    <string name="storage_used">%1$s/%2$s ГБ\nИспользовано</string>
-    <string name="analyze">Анализировать</string>
-    <string name="clean">Очистить</string>
     <string name="quick_scan">Быстрое сканирование</string>
     <string name="apks">APK</string>
     <string name="archives">Архивы</string>
@@ -30,8 +27,6 @@
     </plurals>
     <string name="status_no_files_selected">Статус: Файлы не выбраны</string>
     <string name="select_all">Выбрать все</string>
-    <string name="rescan_title">Повторное сканирование?</string>
-    <string name="rescan_message">Вы уверены, что хотите выполнить сканирование снова?</string>
     <string name="file_not_found">Файл не найден.</string>
     <string name="no_files_found">Файлы не найдены</string>
     <string name="activity_not_found">Действие не найдено.</string>
@@ -47,7 +42,6 @@
     <string name="uninstall">Удалить</string>
     <string name="share">Поделиться</string>
     <string name="app_info">Информация о приложении</string>
-    <string name="installed">Установлено"</string>
     <string name="install">Установить</string>
     <string name="share_apk">Поделиться APK</string>
     <string name="no_app_installed">Приложения не установлены</string>
@@ -282,7 +276,6 @@
     <string name="learn_more">Узнать больше</string>
 
     <string name="close">Закрыть?</string>
-    <string name="require_restart">Требуется перезагрузка!</string>
     <string name="snack_network_error">Ошибка сети при проверке обновлений</string>
     <string name="snack_general_error">Произошла ошибка при проверке обновлений</string>
     <string name="summary_close">Вы уверены, что хотите выйти?</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index fecc210..a0056b7 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">Öppna navigeringslådan</string>
 
     <string name="home">Hem</string>
-    <string name="storage_used">%1$s/%2$s GB\nAnvänt</string>
-    <string name="analyze">Analysera</string>
-    <string name="clean">Rensa</string>
     <string name="quick_scan">Snabbsökning</string>
     <string name="apks">APK:er</string>
     <string name="archives">Arkiv</string>
@@ -28,8 +25,6 @@
     </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>
-    <string name="rescan_message">Är du säker på att du vill skanna igen?</string>
     <string name="file_not_found">Filen hittades inte.</string>
     <string name="no_files_found">Inga filer hittades</string>
     <string name="activity_not_found">Aktiviteten hittades inte.</string>
@@ -45,7 +40,6 @@
     <string name="uninstall">Avinstallera</string>
     <string name="share">Dela</string>
     <string name="app_info">Appinformation</string>
-    <string name="installed">Installerad"</string>
     <string name="install">Installera</string>
     <string name="share_apk">Dela APK</string>
     <string name="no_app_installed">Inga appar installerade</string>
@@ -280,7 +274,6 @@
     <string name="learn_more">Läs mer</string>
 
     <string name="close">Stäng?</string>
-    <string name="require_restart">Kräver omstart!</string>
     <string name="snack_network_error">Nätverksfel uppstod vid kontroll av uppdateringar</string>
     <string name="snack_general_error">Ett fel uppstod vid kontroll av uppdateringar</string>
     <string name="summary_close">Är du säker på att du vill avsluta?</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index a293b96..b0d542e 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">Gezinme çekmecesini aç</string>
 
     <string name="home">Ana Sayfa</string>
-    <string name="storage_used">%1$s/%2$s GB\nKullanılan</string>
-    <string name="analyze">Analiz Et</string>
-    <string name="clean">Temizle</string>
     <string name="quick_scan">Hızlı Tarama</string>
     <string name="apks">APK\'lar</string>
     <string name="archives">Arşivler</string>
@@ -28,8 +25,6 @@
     </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>
-    <string name="rescan_message">Tekrar taramak istediğinizden emin misiniz?</string>
     <string name="file_not_found">Dosya bulunamadı.</string>
     <string name="no_files_found">Dosya bulunamadı</string>
     <string name="activity_not_found">Etkinlik bulunamadı.</string>
@@ -45,7 +40,6 @@
     <string name="uninstall">Kaldır</string>
     <string name="share">Paylaş</string>
     <string name="app_info">Uygulama bilgisi</string>
-    <string name="installed">Yüklü"</string>
     <string name="install">Yükle</string>
     <string name="share_apk">APK\'yı Paylaş</string>
     <string name="no_app_installed">Yüklü uygulama yok</string>
@@ -280,7 +274,6 @@
     <string name="learn_more">Daha fazla bilgi edinin</string>
 
     <string name="close">Kapat?</string>
-    <string name="require_restart">Yeniden başlatma gerekiyor!</string>
     <string name="snack_network_error">Güncellemeleri kontrol ederken ağ hatası oluştu</string>
     <string name="snack_general_error">Güncellemeleri kontrol ederken bir hata oluştu</string>
     <string name="summary_close">Çıkmak istediğinizden emin misiniz?</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index c8593f1..d0a4c4e 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">Відкрити панель навігації</string>
 
     <string name="home">Головна</string>
-    <string name="storage_used">%1$s/%2$s ГБ\nВикористано</string>
-    <string name="analyze">Аналізувати</string>
-    <string name="clean">Очистити</string>
     <string name="quick_scan">Швидке сканування</string>
     <string name="apks">APK</string>
     <string name="archives">Архіви</string>
@@ -30,8 +27,6 @@
     </plurals>
     <string name="status_no_files_selected">Статус: Не вибрано файлів</string>
     <string name="select_all">Вибрати все</string>
-    <string name="rescan_title">Пересканувати?</string>
-    <string name="rescan_message">Ви впевнені, що хочете сканувати знову?</string>
     <string name="file_not_found">Файл не знайдено.</string>
     <string name="no_files_found">Файли не знайдено</string>
     <string name="activity_not_found">Дія не знайдена.</string>
@@ -47,7 +42,6 @@
     <string name="uninstall">Видалити</string>
     <string name="share">Поділитися</string>
     <string name="app_info">Інформація про програму</string>
-    <string name="installed">Встановлено"</string>
     <string name="install">Встановити</string>
     <string name="share_apk">Поділитися APK</string>
     <string name="no_app_installed">Програми не встановлені</string>
@@ -282,7 +276,6 @@
     <string name="learn_more">Дізнатися більше</string>
 
     <string name="close">Закрити?</string>
-    <string name="require_restart">Потрібне перезавантаження!</string>
     <string name="snack_network_error">Під час перевірки наявності оновлень сталася помилка мережі</string>
     <string name="snack_general_error">Під час перевірки наявності оновлень сталася помилка</string>
     <string name="summary_close">Ви впевнені, що хочете вийти?</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 354000f..ef33def 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -13,9 +13,6 @@
     <string name="navigation_drawer_open">開啟導航抽屜</string>
 
     <string name="home">首頁</string>
-    <string name="storage_used">%1$s/%2$s GB\n已使用</string>
-    <string name="analyze">分析</string>
-    <string name="clean">清理</string>
     <string name="quick_scan">快速掃描</string>
     <string name="apks">APK</string>
     <string name="archives">檔案</string>
@@ -27,8 +24,6 @@
     </plurals>
     <string name="status_no_files_selected">狀態：未選取任何檔案</string>
     <string name="select_all">選取全部</string>
-    <string name="rescan_title">重新掃描？</string>
-    <string name="rescan_message">您確定要再次掃描嗎？</string>
     <string name="file_not_found">找不到檔案。</string>
     <string name="no_files_found">找不到檔案</string>
     <string name="activity_not_found">找不到活動。</string>
@@ -44,7 +39,6 @@
     <string name="uninstall">解除安裝</string>
     <string name="share">分享</string>
     <string name="app_info">應用程式資訊</string>
-    <string name="installed">已安裝"</string>
     <string name="install">安裝</string>
     <string name="share_apk">分享 APK</string>
     <string name="no_app_installed">沒有安裝任何應用程式</string>
@@ -279,7 +273,6 @@
     <string name="learn_more">了解更多</string>
 
     <string name="close">關閉？</string>
-    <string name="require_restart">需要重新啟動！</string>
     <string name="snack_network_error">檢查更新時發生網路錯誤</string>
     <string name="snack_general_error">檢查更新時發生錯誤</string>
     <string name="summary_close">您確定要退出嗎？</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 274420e..91a4f4a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,17 +15,13 @@
     <string name="home">Home</string>
     <string name="delete_forever">Delete forever</string>
     <string name="move_to_trash">Move to trash</string>
-    <string name="cleaned_space">Cleaned Space:</string>
-    <string name="last_scan">Last Scan:</string>
-    <string name="last_scan_days_ago">%1$d days ago</string>
+    <string name="cleaned_space">Cleaned Space</string>
+    <string name="free_space">Free Space</string>
     <string name="delete_forever_title">Delete Forever</string>
     <string name="delete_forever_message">Are you sure you want to delete these files forever? This action cannot be undone.</string>
     <string name="move_to_trash_title">Move to Trash</string>
     <string name="move_to_trash_message">Are you sure you want to move these files to the trash?</string>
 
-    <string name="storage_used">%1$s/%2$s GB\nUsed</string>
-    <string name="analyze">Analyze</string>
-    <string name="clean">Clean</string>
     <string name="quick_scan">Quick Scan</string>
     <string name="apks">APKs</string>
     <string name="archives">Archives</string>
@@ -39,8 +35,6 @@
     </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>
-    <string name="rescan_message">Are you sure you want to scan again?</string>
     <string name="file_not_found">File not found.</string>
     <string name="no_files_found">No files found</string>
     <string name="activity_not_found">Activity not found.</string>
@@ -56,7 +50,6 @@
     <string name="uninstall">Uninstall</string>
     <string name="share">Share</string>
     <string name="app_info">App info</string>
-    <string name="installed">Installed"</string>
     <string name="install">Install"</string>
     <string name="share_apk">Share APK</string>
     <string name="no_app_installed">No apps installed</string>
@@ -297,7 +290,6 @@
     <string name="learn_more">Learn more</string>
 
     <string name="close">Close?</string>
-    <string name="require_restart">Require restart!</string>
     <string name="snack_network_error">Network error occurred while checking for updates</string>
     <string name="snack_general_error">An error occurred while checking for updates</string>
     <string name="summary_close">Are you sure you want to exit?</string>
diff --git a/app/src/main/res/values/untranslatable_strings.xml b/app/src/main/res/values/untranslatable_strings.xml
index 14bc197..f2a154e 100644
--- a/app/src/main/res/values/untranslatable_strings.xml
+++ b/app/src/main/res/values/untranslatable_strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name" translatable="false">Cleaner</string>
     <string name="app_full_name" translatable="false">Cleaner for Android</string>
-    <string name="image_compressor_percentage_format" translatable="false">%d%%</string>
+    <string name="percentage_format" translatable="false">%d%%</string>
     <string name="feedback_for" translatable="false">Feedback for </string>
     <string name="dear_developer" translatable="false">Dear developer, </string>
     <string name="send_email_using" translatable="false">Send mail using:</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f2871eb..cf7cd2f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ compressor = "3.0.1"
 constraintlayoutCompose = "1.0.1"
 coreSplashscreen = "1.0.1"
 datastoreCore = "1.1.1"
-firebaseBom = "33.4.0"
+firebaseBom = "33.5.1"
 kotlinxSerializationJson = "1.7.3"
 lifecycle = "2.8.6"
 volley = "1.2.1"