More code cleanup and strings resources usages

D4rK7355608 · Jul 11, 2024 · dc1e51e · dc1e51e
1 parent 124f259
commit dc1e51e
Show file tree

Hide file tree

Showing 24 changed files with 985 additions and 915 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,6 @@ free and open-source software!
 
 # Features
 
-- Automatic daily cleaning
 - App management
 - Image optimization
 - Clean empty folders

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,7 +14,7 @@ android {
         applicationId = "com.d4rk.cleaner"
         minSdk = 26
         targetSdk = 34
-        versionCode = 90
+        versionCode = 92
         versionName = "2.0.0"
         archivesName = "${applicationId}-v${versionName}"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -35,6 +35,7 @@ android {
             "bg",
             "pl",
             "uk",
+            "b+zh+rTW",
         )
         vectorDrawables {
             useSupportLibrary = true

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,6 @@
     <uses-permission android:name="com.android.vending.CHECK_LICENSE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission android:name="android.permission.ACTION_OPEN_DOCUMENT_TREE" />

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/MainComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/MainComposable.kt
@@ -165,7 +165,7 @@ fun MainComposable() {
                     }
                 }) {
                     Icon(
-                        imageVector = Icons.Default.Menu, contentDescription = "Menu"
+                        imageVector = Icons.Default.Menu, contentDescription = stringResource(id = R.string.navigation_drawer_open)
                     )
                 }
             }, actions = {
@@ -174,7 +174,7 @@ fun MainComposable() {
                 }) {
                     Icon(
                         Icons.Outlined.VolunteerActivism,
-                        contentDescription = "Support"
+                        contentDescription = stringResource(id = R.string.support_us)
                     )
                 }
             })

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/appmanager/AppManagerComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/appmanager/AppManagerComposable.kt
@@ -76,7 +76,11 @@ fun AppManagerComposable() {
         factory = AppManagerViewModelFactory(LocalContext.current.applicationContext as Application)
     )
     val context = LocalContext.current
-    val tabs = listOf("Installed Apps", "System Apps", "App Install Files")
+    val tabs = listOf(
+        stringResource(id = R.string.installed_apps),
+        stringResource(id = R.string.system_apps),
+        stringResource(id = R.string.app_install_files)
+    )
     val pagerState = rememberPagerState(pageCount = { tabs.size })
     val coroutineScope = rememberCoroutineScope()
     val isLoading by viewModel.isLoading.collectAsState()
@@ -353,7 +357,7 @@ fun ApkItemComposable(apkPath: String) {
                         context.startActivity(Intent.createChooser(shareIntent, "Share APK"))
                     })
 
-                    DropdownMenuItem(text = { Text("Install") }, onClick = {
+                    DropdownMenuItem(text = { Text(stringResource(id = R.string.installed)) }, onClick = {
                         val installIntent = Intent(Intent.ACTION_VIEW)
                         installIntent.setDataAndType(
                             Uri.fromFile(apkFile),

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/dialogs/RescanDialogComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/dialogs/RescanDialogComposable.kt
@@ -5,6 +5,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import com.d4rk.cleaner.R
 
 
 @Composable
@@ -14,8 +15,8 @@ fun RescanAlertDialog(
 ) {
     AlertDialog(
         onDismissRequest = onDismiss,
-        title = { Text("Rescan?") },
-        text = { Text("Are you sure you want to scan again?") },
+        title = { Text(stringResource(id = R.string.rescan_title)) },
+        text = { Text(stringResource(id = R.string.rescan_message)) },
         confirmButton = {
             TextButton(onClick = onYes) {
                 Text(stringResource(android.R.string.ok))

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/home/HomeComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/home/HomeComposable.kt
@@ -59,6 +59,7 @@ import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.asFlow
@@ -198,7 +199,7 @@ fun HomeComposable() {
                             contentDescription = null,
                             modifier = Modifier.size(ButtonDefaults.IconSize)
                         )
-                        Text(text = "Clean", style = MaterialTheme.typography.bodyMedium)
+                        Text(text = stringResource(R.string.clean), style = MaterialTheme.typography.bodyMedium)
                     }
                 }
             }
@@ -224,7 +225,7 @@ fun HomeComposable() {
                         contentDescription = null,
                         modifier = Modifier.size(ButtonDefaults.IconSize)
                     )
-                    Text(text = "Analyze", style = MaterialTheme.typography.bodyMedium)
+                    Text(text = stringResource(R.string.analyze), style = MaterialTheme.typography.bodyMedium)
                 }
             }
         }
@@ -291,9 +292,9 @@ fun AnalyzeComposable(launchScanningKey: MutableState<Boolean>, imageLoader: Ima
             horizontalArrangement = Arrangement.SpaceBetween,
         ) {
             val statusText = if (selectedFileCount > 0) {
-                "Status: Selected $selectedFileCount files"
+                stringResource(id = R.string.status_selected_files, selectedFileCount)
             } else {
-                "Status: No files selected"
+                stringResource(id = R.string.status_no_files_selected)
             }
             val statusColor by animateColorAsState(
                 targetValue = if (selectedFileCount > 0) {
@@ -432,7 +433,7 @@ fun SelectAllComposable(
             onClick = {
                 onCheckedChange(!checked)
             },
-            label = { Text("Select All") },
+            label = { Text(stringResource(id = R.string.select_all)) },
             leadingIcon = {
                 AnimatedContent(targetState = checked, label = "") { targetChecked ->
                     if (targetChecked) {

diff --git a/...c/main/kotlin/com/d4rk/cleaner/ui/imageoptimizer/imageoptimizer/ImageOptimizerActivity.kt b/...c/main/kotlin/com/d4rk/cleaner/ui/imageoptimizer/imageoptimizer/ImageOptimizerActivity.kt
@@ -19,7 +19,6 @@ import com.d4rk.cleaner.databinding.ActivityImageOptimizerBinding
 import com.d4rk.cleaner.ui.imageoptimizer.imageoptimizer.tabs.FileSizeFragment
 import com.d4rk.cleaner.ui.imageoptimizer.imageoptimizer.tabs.ManualModeFragment
 import com.d4rk.cleaner.ui.imageoptimizer.imageoptimizer.tabs.QuickCompressFragment
-import com.d4rk.cleaner.ui.viewmodel.ImageOptimizerViewModel
 import com.google.android.gms.ads.AdRequest
 import com.google.android.gms.ads.MobileAds
 import com.google.android.material.snackbar.Snackbar

diff --git a/...r/ui/viewmodel/ImageOptimizerViewModel.kt → ...imageoptimizer/ImageOptimizerViewModel.kt b/...r/ui/viewmodel/ImageOptimizerViewModel.kt → ...imageoptimizer/ImageOptimizerViewModel.kt
@@ -1,4 +1,4 @@
-package com.d4rk.cleaner.ui.viewmodel
+package com.d4rk.cleaner.ui.imageoptimizer.imageoptimizer
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel

diff --git a/...in/kotlin/com/d4rk/cleaner/ui/imageoptimizer/imageoptimizer/tabs/QuickCompressFragment.kt b/...in/kotlin/com/d4rk/cleaner/ui/imageoptimizer/imageoptimizer/tabs/QuickCompressFragment.kt
@@ -8,7 +8,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.databinding.FragmentQuickCompressBinding
-import com.d4rk.cleaner.ui.viewmodel.ImageOptimizerViewModel
+import com.d4rk.cleaner.ui.imageoptimizer.imageoptimizer.ImageOptimizerViewModel
 
 class QuickCompressFragment : Fragment() {
     private lateinit var binding: FragmentQuickCompressBinding