Skip to content

Commit 0888d7d

Browse files
MihaiCristianCondreaMihaiCristianCondrea
committed
Updated the project structure and simplified the app
1 parent df2193e commit 0888d7d

28 files changed

+112
-108
lines changed

‎app/src/androidTest/kotlin/com/d4rk/cleaner/ExampleInstrumentedTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.d4rk.cleaner
33
import android.os.Environment
44
import androidx.test.ext.junit.runners.AndroidJUnit4
55
import androidx.test.platform.app.InstrumentationRegistry
6-
import com.d4rk.cleaner.utils.FileScanner
6+
import com.d4rk.cleaner.utils.cleaning.FileScanner
77
import org.junit.Assert
88
import org.junit.Before
99
import org.junit.Test

‎app/src/main/kotlin/com/d4rk/cleaner/MainComposable.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import com.d4rk.cleaner.ui.imageoptimizer.ImagePickerActivity
5353
import com.d4rk.cleaner.ui.memory.MemoryManagerComposable
5454
import com.d4rk.cleaner.ui.settings.SettingsActivity
5555
import com.d4rk.cleaner.ui.support.SupportActivity
56-
import com.d4rk.cleaner.utils.Utils
56+
import com.d4rk.cleaner.utils.IntentUtils
5757
import kotlinx.coroutines.launch
5858

5959
@OptIn(ExperimentalMaterial3Api::class)
@@ -102,32 +102,32 @@ fun MainComposable() {
102102
when (item.title) {
103103

104104
R.string.image_optimizer -> {
105-
Utils.openActivity(
105+
IntentUtils.openActivity(
106106
context, ImagePickerActivity::class.java
107107
)
108108
}
109109

110110
R.string.settings -> {
111-
Utils.openActivity(
111+
IntentUtils.openActivity(
112112
context, SettingsActivity::class.java
113113
)
114114
}
115115

116116
R.string.help_and_feedback -> {
117-
Utils.openActivity(
117+
IntentUtils.openActivity(
118118
context, HelpActivity::class.java
119119
)
120120
}
121121

122122
R.string.updates -> {
123-
Utils.openUrl(
123+
IntentUtils.openUrl(
124124
context,
125125
"https://github.com/D4rK7355608/${context.packageName}/blob/master/CHANGELOG.md"
126126
)
127127
}
128128

129129
R.string.share -> {
130-
Utils.shareApp(context)
130+
IntentUtils.shareApp(context)
131131
}
132132
}
133133
scope.launch {
@@ -170,7 +170,7 @@ fun MainComposable() {
170170
}
171171
}, actions = {
172172
IconButton(onClick = {
173-
Utils.openActivity(context, SupportActivity::class.java)
173+
IntentUtils.openActivity(context, SupportActivity::class.java)
174174
}) {
175175
Icon(
176176
Icons.Outlined.VolunteerActivism,

‎app/src/main/kotlin/com/d4rk/cleaner/ui/dialogs/VersionInfoDialogComposable.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import androidx.compose.ui.res.stringResource
1919
import androidx.compose.ui.unit.dp
2020
import com.d4rk.cleaner.BuildConfig
2121
import com.d4rk.cleaner.R
22-
import com.d4rk.cleaner.utils.toBitmapDrawable
22+
import com.d4rk.cleaner.utils.cleaning.toBitmapDrawable
2323

2424
@Composable
2525
fun VersionInfoDialog(onDismiss: () -> Unit) {

‎app/src/main/kotlin/com/d4rk/cleaner/ui/help/HelpActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import androidx.compose.material3.MaterialTheme
99
import androidx.compose.material3.Surface
1010
import androidx.compose.ui.Modifier
1111
import com.d4rk.cleaner.ui.settings.display.theme.style.AppTheme
12-
import com.d4rk.cleaner.utils.Utils
12+
import com.d4rk.cleaner.utils.IntentUtils
1313
import com.google.android.play.core.review.ReviewManager
1414
import com.google.android.play.core.review.ReviewManagerFactory
1515

@@ -47,12 +47,12 @@ class HelpActivity : AppCompatActivity() {
4747
task.addOnSuccessListener { reviewInfo ->
4848
reviewManager.launchReviewFlow(this , reviewInfo)
4949
}.addOnFailureListener {
50-
Utils.openUrl(
50+
IntentUtils.openUrl(
5151
this ,
5252
"https://play.google.com/store/apps/details?id=${this.packageName}&showAllReviews=true"
5353
)
5454
}.addOnFailureListener {
55-
Utils.sendEmailToDeveloper(this)
55+
IntentUtils.sendEmailToDeveloper(this)
5656
}
5757
}
5858
}

‎app/src/main/kotlin/com/d4rk/cleaner/ui/help/HelpComposable.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ import androidx.compose.ui.unit.dp
4646
import androidx.constraintlayout.compose.ConstraintLayout
4747
import com.d4rk.cleaner.R
4848
import com.d4rk.cleaner.ui.dialogs.VersionInfoDialog
49-
import com.d4rk.cleaner.utils.Utils
50-
import com.d4rk.cleaner.utils.bounceClick
49+
import com.d4rk.cleaner.utils.IntentUtils
50+
import com.d4rk.cleaner.utils.compose.bounceClick
5151
import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
5252

5353
@OptIn(ExperimentalMaterial3Api::class)
@@ -71,7 +71,7 @@ fun HelpComposable(activity : HelpActivity) {
7171
DropdownMenu(expanded = showMenu , onDismissRequest = { showMenu = false }) {
7272
DropdownMenuItem(text = { Text(stringResource(R.string.view_in_google_play_store)) } ,
7373
onClick = {
74-
Utils.openUrl(
74+
IntentUtils.openUrl(
7575
context ,
7676
"https://play.google.com/store/apps/details?id=${activity.packageName}"
7777
)
@@ -80,28 +80,28 @@ fun HelpComposable(activity : HelpActivity) {
8080
onClick = { showDialog.value = true })
8181
DropdownMenuItem(text = { Text(stringResource(R.string.beta_program)) } ,
8282
onClick = {
83-
Utils.openUrl(
83+
IntentUtils.openUrl(
8484
context ,
8585
"https://play.google.com/apps/testing/${activity.packageName}"
8686
)
8787
})
8888
DropdownMenuItem(text = { Text(stringResource(R.string.terms_of_service)) } ,
8989
onClick = {
90-
Utils.openUrl(
90+
IntentUtils.openUrl(
9191
context ,
9292
"https://sites.google.com/view/d4rk7355608/more/apps/terms-of-service"
9393
)
9494
})
9595
DropdownMenuItem(text = { Text(stringResource(R.string.privacy_policy)) } ,
9696
onClick = {
97-
Utils.openUrl(
97+
IntentUtils.openUrl(
9898
context ,
9999
"https://sites.google.com/view/d4rk7355608/more/apps/privacy-policy"
100100
)
101101
})
102102
DropdownMenuItem(text = { Text(stringResource(com.google.android.gms.oss.licenses.R.string.oss_license_title)) } ,
103103
onClick = {
104-
Utils.openActivity(
104+
IntentUtils.openActivity(
105105
context , OssLicensesMenuActivity::class.java
106106
)
107107
})

‎app/src/main/kotlin/com/d4rk/cleaner/ui/home/HomeComposable.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ import coil.memory.MemoryCache
6969
import coil.request.ImageRequest
7070
import com.d4rk.cleaner.R
7171
import com.d4rk.cleaner.ui.dialogs.RescanAlertDialog
72-
import com.d4rk.cleaner.utils.CircularDeterminateIndicator
73-
import com.d4rk.cleaner.utils.bounceClick
74-
import com.d4rk.cleaner.utils.getFileIcon
75-
import com.d4rk.cleaner.utils.getVideoThumbnail
72+
import com.d4rk.cleaner.utils.compose.components.CircularDeterminateIndicator
73+
import com.d4rk.cleaner.utils.compose.bounceClick
74+
import com.d4rk.cleaner.utils.cleaning.getFileIcon
75+
import com.d4rk.cleaner.utils.cleaning.getVideoThumbnail
7676
import com.google.common.io.Files.getFileExtension
7777
import java.io.File
7878

‎app/src/main/kotlin/com/d4rk/cleaner/ui/home/HomeViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import androidx.lifecycle.AndroidViewModel
1111
import androidx.lifecycle.MutableLiveData
1212
import androidx.lifecycle.viewModelScope
1313
import com.d4rk.cleaner.data.datastore.DataStore
14-
import com.d4rk.cleaner.utils.FileScanner
14+
import com.d4rk.cleaner.utils.cleaning.FileScanner
1515
import com.d4rk.cleaner.utils.PermissionsUtils
1616
import kotlinx.coroutines.Dispatchers
1717
import kotlinx.coroutines.flow.MutableStateFlow
@@ -42,7 +42,7 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
4242

4343
init {
4444
updateStorageInfo()
45-
fileScanner = FileScanner(dataStoreInstance,application.resources)
45+
fileScanner = FileScanner(dataStoreInstance, application.resources)
4646
}
4747

4848
/**

‎app/src/main/kotlin/com/d4rk/cleaner/ui/memory/MemoryManagerComposable.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ import androidx.lifecycle.viewmodel.compose.viewModel
6464
import com.d4rk.cleaner.R
6565
import com.d4rk.cleaner.data.model.ui.RamInfo
6666
import com.d4rk.cleaner.data.model.ui.StorageInfo
67-
import com.d4rk.cleaner.utils.StorageProgressBar
68-
import com.d4rk.cleaner.utils.Utils.formatSize
69-
import com.d4rk.cleaner.utils.bounceClick
67+
import com.d4rk.cleaner.utils.cleaning.FileUtils.formatSize
68+
import com.d4rk.cleaner.utils.compose.components.StorageProgressBar
69+
import com.d4rk.cleaner.utils.compose.bounceClick
7070
import kotlin.math.absoluteValue
7171
import kotlin.math.min
7272

‎app/src/main/kotlin/com/d4rk/cleaner/ui/settings/SettingsComposable.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import com.d4rk.cleaner.ui.settings.advanced.AdvancedSettingsActivity
3030
import com.d4rk.cleaner.ui.settings.cleaning.CleaningSettingsActivity
3131
import com.d4rk.cleaner.ui.settings.display.DisplaySettingsActivity
3232
import com.d4rk.cleaner.ui.settings.privacy.PrivacySettingsActivity
33-
import com.d4rk.cleaner.utils.PreferenceItem
34-
import com.d4rk.cleaner.utils.Utils
33+
import com.d4rk.cleaner.utils.compose.components.PreferenceItem
34+
import com.d4rk.cleaner.utils.IntentUtils
3535

3636
@OptIn(ExperimentalMaterial3Api::class)
3737
@Composable
@@ -57,15 +57,15 @@ fun SettingsComposable(activity: SettingsActivity) {
5757
title = stringResource(R.string.display),
5858
summary = stringResource(R.string.summary_preference_settings_display),
5959
onClick = {
60-
Utils.openActivity(context, DisplaySettingsActivity::class.java)
60+
IntentUtils.openActivity(context, DisplaySettingsActivity::class.java)
6161
})
6262
}
6363
item {
6464
PreferenceItem(Icons.Outlined.CleaningServices,
6565
title = stringResource(R.string.cleaning),
6666
summary = stringResource(R.string.summary_preference_settings_cleaning),
6767
onClick = {
68-
Utils.openActivity(
68+
IntentUtils.openActivity(
6969
context, CleaningSettingsActivity::class.java
7070
)
7171
})
@@ -75,15 +75,15 @@ fun SettingsComposable(activity: SettingsActivity) {
7575
title = stringResource(R.string.notifications),
7676
summary = stringResource(R.string.summary_preference_settings_notifications),
7777
onClick = {
78-
Utils.openAppNotificationSettings(context)
78+
IntentUtils.openAppNotificationSettings(context)
7979
})
8080
}
8181
item {
8282
PreferenceItem(Icons.Outlined.Build,
8383
title = stringResource(R.string.advanced),
8484
summary = stringResource(R.string.summary_preference_settings_advanced),
8585
onClick = {
86-
Utils.openActivity(
86+
IntentUtils.openActivity(
8787
context, AdvancedSettingsActivity::class.java
8888
)
8989
})
@@ -93,15 +93,15 @@ fun SettingsComposable(activity: SettingsActivity) {
9393
title = stringResource(R.string.security_and_privacy),
9494
summary = stringResource(R.string.summary_preference_settings_privacy_and_security),
9595
onClick = {
96-
Utils.openActivity(context, PrivacySettingsActivity::class.java)
96+
IntentUtils.openActivity(context, PrivacySettingsActivity::class.java)
9797
})
9898
}
9999
item {
100100
PreferenceItem(Icons.Outlined.Info,
101101
title = stringResource(R.string.about),
102102
summary = stringResource(R.string.summary_preference_settings_about),
103103
onClick = {
104-
Utils.openActivity(context, AboutSettingsActivity::class.java)
104+
IntentUtils.openActivity(context, AboutSettingsActivity::class.java)
105105
})
106106
}
107107
}

‎app/src/main/kotlin/com/d4rk/cleaner/ui/settings/about/AboutSettingsComposable.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import androidx.compose.ui.platform.LocalContext
2424
import androidx.compose.ui.res.stringResource
2525
import com.d4rk.cleaner.BuildConfig
2626
import com.d4rk.cleaner.R
27-
import com.d4rk.cleaner.utils.PreferenceCategoryItem
28-
import com.d4rk.cleaner.utils.PreferenceItem
29-
import com.d4rk.cleaner.utils.Utils
27+
import com.d4rk.cleaner.utils.compose.components.PreferenceCategoryItem
28+
import com.d4rk.cleaner.utils.compose.components.PreferenceItem
29+
import com.d4rk.cleaner.utils.IntentUtils
3030
import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
3131

3232
@OptIn(ExperimentalMaterial3Api::class)
@@ -62,7 +62,7 @@ fun AboutSettingsComposable(activity : AboutSettingsActivity) {
6262
PreferenceItem(title = stringResource(com.google.android.gms.oss.licenses.R.string.oss_license_title) ,
6363
summary = stringResource(R.string.summary_preference_settings_oss) ,
6464
onClick = {
65-
Utils.openActivity(context , OssLicensesMenuActivity::class.java)
65+
IntentUtils.openActivity(context , OssLicensesMenuActivity::class.java)
6666
})
6767
}
6868
item {

0 commit comments

Comments
 (0)