From 724c54df2690d04a7f97eaacc13210830cb5c162 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Tue, 15 Oct 2024 02:22:32 +0200 Subject: [PATCH] Clean up --- build.gradle.kts | 6 ++-- settings.gradle.kts | 2 +- .../machiav3lli/fdroid/database/DatabaseX.kt | 28 +++++++++---------- .../machiav3lli/fdroid/pages/ExplorePage.kt | 2 +- .../machiav3lli/fdroid/pages/LatestPage.kt | 2 +- .../fdroid/pages/PermissionsPage.kt | 6 ++-- .../machiav3lli/fdroid/pages/SearchPage.kt | 2 +- 7 files changed, 23 insertions(+), 25 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 52ff401a9..ef569a37a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -65,19 +65,19 @@ android { } buildTypes { - named("debug") { + debug { isMinifyEnabled = false isShrinkResources = false applicationIdSuffix = ".debug" resValue("string", "application_name", "Neo Store - Debug") } - create("neo") { + register("neo") { isMinifyEnabled = false isShrinkResources = false applicationIdSuffix = ".neo" resValue("string", "application_name", "Neo Store") } - named("release") { + release { isMinifyEnabled = true isShrinkResources = true resValue("string", "application_name", "Neo Store") diff --git a/settings.gradle.kts b/settings.gradle.kts index a014c07b7..b7a581124 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -13,4 +13,4 @@ dependencyResolutionManagement { maven(url = "https://jitpack.io") } } -rootProject.name = "Neo-Store" \ No newline at end of file +rootProject.name = "Neo Store" \ No newline at end of file diff --git a/src/main/kotlin/com/machiav3lli/fdroid/database/DatabaseX.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/DatabaseX.kt index 7c1773e13..f94f87dad 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/database/DatabaseX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/DatabaseX.kt @@ -353,7 +353,7 @@ abstract class DatabaseX : RoomDatabase() { fun cleanUp(vararg pairs: Pair) { runInTransaction { - pairs.forEach { (id, enabled) -> + pairs.forEach { (id, enabled) -> getProductDao().deleteById(id) getCategoryDao().deleteById(id) getReleaseDao().deleteById(id) @@ -384,17 +384,17 @@ abstract class DatabaseX : RoomDatabase() { val databaseModule = module { single { DatabaseX.getInstance(androidContext()) } - factory { get().getRepositoryDao() } - factory { get().getProductDao() } - factory { get().getReleaseDao() } - factory { get().getReleaseTempDao() } - factory { get().getProductTempDao() } - factory { get().getCategoryDao() } - factory { get().getCategoryTempDao() } - factory { get().getInstalledDao() } - factory { get().getExtrasDao() } - factory { get().getExodusInfoDao() } - factory { get().getTrackerDao() } - factory { get().getDownloadedDao() } - factory { get().getInstallTaskDao() } + single { get().getRepositoryDao() } + single { get().getProductDao() } + single { get().getReleaseDao() } + single { get().getReleaseTempDao() } + single { get().getProductTempDao() } + single { get().getCategoryDao() } + single { get().getCategoryTempDao() } + single { get().getInstalledDao() } + single { get().getExtrasDao() } + single { get().getExodusInfoDao() } + single { get().getTrackerDao() } + single { get().getDownloadedDao() } + single { get().getInstallTaskDao() } } diff --git a/src/main/kotlin/com/machiav3lli/fdroid/pages/ExplorePage.kt b/src/main/kotlin/com/machiav3lli/fdroid/pages/ExplorePage.kt index ceb2fbf82..9c50b3f95 100755 --- a/src/main/kotlin/com/machiav3lli/fdroid/pages/ExplorePage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/pages/ExplorePage.kt @@ -114,7 +114,7 @@ fun ExplorePage(viewModel: MainVM) { Preferences.Key.SortOrderAscendingExplore, Preferences.Key.TargetSDKExplore, Preferences.Key.MinSDKExplore, - -> viewModel.setSortFilter( + -> viewModel.setSortFilter( Page.EXPLORE, listOf( Preferences[Preferences.Key.ReposFilterExplore], diff --git a/src/main/kotlin/com/machiav3lli/fdroid/pages/LatestPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/pages/LatestPage.kt index f48683673..19fc07f66 100755 --- a/src/main/kotlin/com/machiav3lli/fdroid/pages/LatestPage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/pages/LatestPage.kt @@ -95,7 +95,7 @@ fun LatestPage(viewModel: MainVM) { Preferences.Key.SortOrderAscendingLatest, Preferences.Key.TargetSDKLatest, Preferences.Key.MinSDKLatest, - -> viewModel.setSortFilter( + -> viewModel.setSortFilter( Page.LATEST, listOf( Preferences[Preferences.Key.ReposFilterLatest], diff --git a/src/main/kotlin/com/machiav3lli/fdroid/pages/PermissionsPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/pages/PermissionsPage.kt index a9b9f8787..a7fb18e87 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/pages/PermissionsPage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/pages/PermissionsPage.kt @@ -39,7 +39,6 @@ import com.machiav3lli.fdroid.MainApplication import com.machiav3lli.fdroid.content.Preferences import com.machiav3lli.fdroid.entity.Permission import com.machiav3lli.fdroid.ui.components.PermissionItem -import com.machiav3lli.fdroid.ui.compose.utils.blockBorder import com.machiav3lli.fdroid.ui.navigation.NavRoute import com.machiav3lli.fdroid.utility.extension.android.Android import com.machiav3lli.fdroid.utility.isRunningOnTV @@ -88,9 +87,8 @@ fun PermissionsPage(navController: NavHostController) { ) { paddingValues -> LazyColumn( modifier = Modifier - .blockBorder() - .fillMaxSize() - .padding(paddingValues), + .padding(paddingValues) + .fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp), contentPadding = PaddingValues(8.dp) ) { diff --git a/src/main/kotlin/com/machiav3lli/fdroid/pages/SearchPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/pages/SearchPage.kt index f7e9653a4..f87d07ee2 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/pages/SearchPage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/pages/SearchPage.kt @@ -113,7 +113,7 @@ fun SearchPage(viewModel: MainVM) { Preferences.Key.TargetSDKSearch, Preferences.Key.MinSDKSearch, Preferences.Key.SearchApps, - -> viewModel.setSortFilter( + -> viewModel.setSortFilter( Page.SEARCH, listOf( Preferences[Preferences.Key.ReposFilterSearch],