diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ba7549a..96bd9d2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -14,7 +14,7 @@ android {
applicationId = "com.d4rk.cleaner"
minSdk = 26
targetSdk = 34
- versionCode = 73
+ versionCode = 75
versionName = "2.0.0"
archivesName = "${applicationId}-v${versionName}"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/MainComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/MainComposable.kt
index 24f8cfe..c46da4f 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/MainComposable.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/MainComposable.kt
@@ -45,9 +45,9 @@ import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import com.d4rk.cleaner.ads.FullBannerAdsComposable
import com.d4rk.cleaner.data.datastore.DataStore
-import com.d4rk.cleaner.ui.components.navigation.NavigationDrawerItem
-import com.d4rk.cleaner.ui.components.navigation.BottomNavigationScreen
import com.d4rk.cleaner.ui.appmanager.AppManagerComposable
+import com.d4rk.cleaner.ui.components.navigation.BottomNavigationScreen
+import com.d4rk.cleaner.ui.components.navigation.NavigationDrawerItem
import com.d4rk.cleaner.ui.help.HelpActivity
import com.d4rk.cleaner.ui.home.HomeComposable
import com.d4rk.cleaner.ui.imageoptimizer.ImagePickerActivity
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
index c13741b..883c74b 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/home/HomeComposable.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/home/HomeComposable.kt
@@ -54,9 +54,7 @@ import androidx.compose.ui.unit.dp
import androidx.lifecycle.asFlow
import androidx.lifecycle.viewmodel.compose.viewModel
import com.d4rk.cleaner.R
-import com.d4rk.cleaner.ui.startup.StartupActivity
import com.d4rk.cleaner.utils.CircularDeterminateIndicator
-import com.d4rk.cleaner.utils.Utils
import com.d4rk.cleaner.utils.bounceClick
import com.google.common.io.Files.getFileExtension
import java.io.File
@@ -109,8 +107,16 @@ fun HomeComposable() {
) {
AnimatedVisibility(
visible = showCleaningComposable,
- enter = fadeIn() + expandHorizontally(expandFrom = Alignment.Start),
- exit = fadeOut() + shrinkHorizontally(shrinkTowards = Alignment.Start),
+ enter = fadeIn(animationSpec = tween(durationMillis = 400)) +
+ expandHorizontally(
+ animationSpec = tween(durationMillis = 400),
+ expandFrom = Alignment.Start
+ ),
+ exit = fadeOut(animationSpec = tween(durationMillis = 400)) +
+ shrinkHorizontally(
+ animationSpec = tween(durationMillis = 400),
+ shrinkTowards = Alignment.Start
+ ),
modifier = Modifier.weight(1f)
) {
val enabled = !isAnalyzing && selectedFileCount > 0
@@ -129,9 +135,6 @@ fun HomeComposable() {
.bounceClick(),
onClick = {
viewModel.clean(activity = context as Activity)
- Utils.openActivity(
- context, StartupActivity::class.java
- )
},
shape = MaterialTheme.shapes.medium,
enabled = enabled,
@@ -241,13 +244,24 @@ fun AnalyzeComposable() {
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
) {
- Text(
- text = if (selectedFileCount > 0) {
- "Status: Selected $selectedFileCount files"
+ val statusText = if (selectedFileCount > 0) {
+ "Status: Selected $selectedFileCount files"
+ } else {
+ "Status: No files selected"
+ }
+ val statusColor by animateColorAsState(
+ targetValue = if (selectedFileCount > 0) {
+ MaterialTheme.colorScheme.primary
} else {
- "Status: No files selected"
+ MaterialTheme.colorScheme.secondary
},
- color = MaterialTheme.colorScheme.primary,
+ animationSpec = tween(), label = ""
+ )
+
+ Text(
+ text = statusText,
+ color = statusColor,
+ modifier = Modifier.animateContentSize()
)
SelectAllComposable(
checked = allFilesSelected,
@@ -335,6 +349,10 @@ fun FileItemComposable(
fileIconMap[it] = R.drawable.ic_video_file
}
+ context.resources.getStringArray(R.array.image_extensions).forEach {
+ fileIconMap[it] = R.drawable.ic_image
+ }
+
fileIconMap["nomedia"] = R.drawable.ic_draft
fileIconMap["vcf"] = R.drawable.ic_contact_page
diff --git a/app/src/main/res/drawable-anydpi/ic_image.xml b/app/src/main/res/drawable-anydpi/ic_image.xml
new file mode 100644
index 0000000..f34447c
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_image.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/font/font_poppins.ttf b/app/src/main/res/font/font_poppins.ttf
deleted file mode 100644
index 6bcdcc2..0000000
Binary files a/app/src/main/res/font/font_poppins.ttf and /dev/null differ
diff --git a/app/src/main/res/layout/fragment_memory.xml b/app/src/main/res/layout/fragment_memory.xml
deleted file mode 100644
index 8054771..0000000
--- a/app/src/main/res/layout/fragment_memory.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_cpu_list.xml b/app/src/main/res/layout/item_cpu_list.xml
deleted file mode 100644
index d089af4..0000000
--- a/app/src/main/res/layout/item_cpu_list.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fc1af73..2c3d407 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -117,7 +117,6 @@
Theme
-
Feedback
In-app ads
Change ad settings