Code cleanup

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

Hide file tree

Showing 12 changed files with 51 additions and 127 deletions.
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 = 89
+        versionCode = 90
         versionName = "2.0.0"
         archivesName = "${applicationId}-v${versionName}"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/dialogs/VersionInfoDialogComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/dialogs/VersionInfoDialogComposable.kt
@@ -33,7 +33,7 @@ fun VersionInfoDialog(onDismiss: () -> Unit) {
 @Composable
 fun VersionInfoContent() {
     val context = LocalContext.current
-    val appName = context.getString(R.string.app_name)
+    val appName = context.getString(R.string.app_full_name)
     val versionName = BuildConfig.VERSION_NAME
     val versionString =
         stringResource(R.string.version, versionName)

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/startup/StartupActivity.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/startup/StartupActivity.kt
@@ -1,7 +1,5 @@
 package com.d4rk.cleaner.ui.startup
 
-import android.Manifest
-import android.os.Build
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -11,15 +9,16 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
 import com.d4rk.cleaner.ui.settings.display.theme.style.AppTheme
-import com.d4rk.cleaner.utils.PermissionsUtils
 import com.google.android.ump.ConsentForm
 import com.google.android.ump.ConsentInformation
 import com.google.android.ump.ConsentRequestParameters
 import com.google.android.ump.UserMessagingPlatform
+import kotlinx.coroutines.flow.MutableStateFlow
 
 class StartupActivity : AppCompatActivity() {
     private lateinit var consentInformation : ConsentInformation
     private lateinit var consentForm : ConsentForm
+    val consentFormShown = MutableStateFlow(false)
     override fun onCreate(savedInstanceState : Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
@@ -28,7 +27,7 @@ class StartupActivity : AppCompatActivity() {
                 Surface(
                     modifier = Modifier.fillMaxSize() , color = MaterialTheme.colorScheme.background
                 ) {
-                    StartupComposable()
+                    StartupComposable(this@StartupActivity)
                 }
             }
         }
@@ -39,9 +38,6 @@ class StartupActivity : AppCompatActivity() {
                 loadForm()
             }
         } , {})
-        if (!PermissionsUtils.hasNotificationPermission(this)) {
-            PermissionsUtils.requestNotificationPermission(this)
-        }
     }
 
     /**
@@ -59,6 +55,7 @@ class StartupActivity : AppCompatActivity() {
         UserMessagingPlatform.loadConsentForm(this , { consentForm ->
             this.consentForm = consentForm
             if (consentInformation.consentStatus == ConsentInformation.ConsentStatus.REQUIRED) {
+                consentFormShown.value = true
                 consentForm.show(this) {
                     loadForm()
                 }

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/startup/StartupComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/startup/StartupComposable.kt
@@ -1,5 +1,6 @@
 package com.d4rk.cleaner.ui.startup
 
+import android.app.Activity
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -12,6 +13,7 @@ import androidx.compose.material.icons.outlined.CheckCircle
 import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExtendedFloatingActionButton
+import androidx.compose.material3.FloatingActionButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LargeTopAppBar
 import androidx.compose.material3.MaterialTheme
@@ -20,8 +22,12 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color.Companion.Gray
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
@@ -34,16 +40,29 @@ import androidx.compose.ui.unit.dp
 import com.d4rk.cleaner.MainActivity
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.utils.IntentUtils
+import com.d4rk.cleaner.utils.PermissionsUtils
 import com.d4rk.cleaner.utils.compose.bounceClick
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun StartupComposable() {
+fun StartupComposable(activity: StartupActivity) {
     val context = LocalContext.current
     val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection) , topBar = {
-        LargeTopAppBar(title = { Text(stringResource(R.string.welcome)) } ,
-            scrollBehavior = scrollBehavior)
+    val fabEnabled = remember { mutableStateOf(false) }
+    LaunchedEffect(context) {
+        if (!PermissionsUtils.hasNotificationPermission(context)) {
+            PermissionsUtils.requestNotificationPermission(context as Activity)
+        }
+        activity.consentFormShown.collect { shown ->
+            fabEnabled.value = shown
+        }
+    }
+
+    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {
+        LargeTopAppBar(
+            title = { Text(stringResource(R.string.welcome)) },
+            scrollBehavior = scrollBehavior
+        )
     }) { innerPadding ->
         Box(
             modifier = Modifier
@@ -54,58 +73,63 @@ fun StartupComposable() {
             LazyColumn(
                 modifier = Modifier
                     .fillMaxSize()
-                    .padding(innerPadding) ,
+                    .padding(innerPadding),
             ) {
                 item {
                     Image(
-                        painter = painterResource(id = R.drawable.il_startup) ,
+                        painter = painterResource(id = R.drawable.il_startup),
                         contentDescription = null
                     )
                     Icon(
-                        Icons.Outlined.Info , contentDescription = null
+                        Icons.Outlined.Info, contentDescription = null
                     )
                 }
                 item {
                     Text(
-                        text = stringResource(R.string.summary_browse_terms_of_service_and_privacy_policy) ,
-                        modifier = Modifier.padding(top = 24.dp , bottom = 24.dp)
+                        text = stringResource(R.string.summary_browse_terms_of_service_and_privacy_policy),
+                        modifier = Modifier.padding(top = 24.dp, bottom = 24.dp)
                     )
                     val annotatedString = buildAnnotatedString {
                         withStyle(
                             style = SpanStyle(
-                                color = MaterialTheme.colorScheme.primary ,
+                                color = MaterialTheme.colorScheme.primary,
                                 textDecoration = TextDecoration.Underline
                             )
                         ) {
                             append(stringResource(R.string.browse_terms_of_service_and_privacy_policy))
                         }
                         addStringAnnotation(
-                            tag = "URL" ,
-                            annotation = "https://sites.google.com/view/d4rk7355608/more/apps/privacy-policy" ,
-                            start = 0 ,
+                            tag = "URL",
+                            annotation = "https://sites.google.com/view/d4rk7355608/more/apps/privacy-policy",
+                            start = 0,
                             end = stringResource(R.string.browse_terms_of_service_and_privacy_policy).length
                         )
                     }
-                    ClickableText(text = annotatedString , onClick = { offset ->
-                        annotatedString.getStringAnnotations("URL" , offset , offset).firstOrNull()
+                    ClickableText(text = annotatedString, onClick = { offset ->
+                        annotatedString.getStringAnnotations("URL", offset, offset).firstOrNull()
                             ?.let { annotation ->
-                                IntentUtils.openUrl(context , annotation.item)
+                                IntentUtils.openUrl(context, annotation.item)
                             }
                     })
                 }
             }
             ExtendedFloatingActionButton(modifier = Modifier
                 .align(Alignment.BottomEnd)
-                .bounceClick() ,
-                text = { Text(stringResource(R.string.agree)) } ,
+                .bounceClick(),
+                containerColor = if (fabEnabled.value) {
+                    FloatingActionButtonDefaults.containerColor
+                } else {
+                    Gray
+                },
+                text = { Text(stringResource(R.string.agree)) },
                 onClick = {
                     IntentUtils.openActivity(
                         context , MainActivity::class.java
                     )
-                } ,
+                },
                 icon = {
                     Icon(
-                        Icons.Outlined.CheckCircle ,
+                        Icons.Outlined.CheckCircle,
                         contentDescription = null
                     )
                 })

diff --git a/app/src/main/res/anim/anim_swipe_up_right.xml b/app/src/main/res/anim/anim_swipe_up_right.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_add.xml b/app/src/main/res/drawable-anydpi/ic_add.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_contact_page.xml b/app/src/main/res/drawable-anydpi/ic_contact_page.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_draft.xml b/app/src/main/res/drawable-anydpi/ic_draft.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_image_search.xml b/app/src/main/res/drawable-anydpi/ic_image_search.xml
diff --git a/app/src/main/res/layout/activity_image_picker.xml b/app/src/main/res/layout/activity_image_picker.xml
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -83,7 +83,7 @@
 <string name="running_cycle">Çalışma Döngüsü %1$d/%2$d</string>
 <string name="finished_cycle">Tamamlanan Döngü %1$d/%2$d</string>
 <string name="analyze">Analiz Et</string>
-<string name="status">Durum: Boşta...</string>
+<string name="status">Durum: Boşta…</string>
 <string name="status_running">Durum: Çalışıyor</string>
 <string name="found">Bulundu: </string>
 <string name="freed">Boşaltıldı: </string>

diff --git a/app/src/main/res/values/untranslatable_strings.xml b/app/src/main/res/values/untranslatable_strings.xml
@@ -1,9 +1,6 @@
 <resources>
     <string name="app_name" translatable="false">Cleaner</string>
     <string name="app_full_name" translatable="false">Cleaner for Android</string>
-    <string name="main_progress_0" translatable="false">0%</string>
-    <string name="ram_usage_percentage" translatable="false">%.0f%%</string>
-    <string name="memory_used_mb" translatable="false">%d MB/</string>
     <string name="image_compressor_percentage_format" translatable="false">%d%%</string>
     <string name="feedback_for" translatable="false">Feedback for </string>
     <string name="dear_developer" translatable="false">Dear developer, </string>
@@ -23,7 +20,6 @@
     <string name="spanish" translatable="false">Español</string>
     <string name="turkish" translatable="false">Türkçe</string>
     <string name="ukrainian" translatable="false">Українська</string>
-    <string name="app_version" translatable="false">%1$s (%2$s)</string>
     <string name="copyright" translatable="false">Copyright ©2020-2024, D4rK</string>
     <string name="arch" translatable="false">Arch:</string>
     <string name="app_build" translatable="false">%1$s\n%2$s\n%3$s\n%4$s\n%5$s</string>