Clean up

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")

settings.gradle.kts

@@ -13,4 +13,4 @@ dependencyResolutionManagement {
         maven(url = "https://jitpack.io")
     }
 }
-rootProject.name = "Neo-Store"
+rootProject.name = "Neo Store"

src/main/kotlin/com/machiav3lli/fdroid/database/DatabaseX.kt

@@ -353,7 +353,7 @@ abstract class DatabaseX : RoomDatabase() {
 
     fun cleanUp(vararg pairs: Pair<Long, Boolean>) {
         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<DatabaseX>().getRepositoryDao() }
+    single { get<DatabaseX>().getRepositoryDao() }
-    factory { get<DatabaseX>().getProductDao() }
+    single { get<DatabaseX>().getProductDao() }
-    factory { get<DatabaseX>().getReleaseDao() }
+    single { get<DatabaseX>().getReleaseDao() }
-    factory { get<DatabaseX>().getReleaseTempDao() }
+    single { get<DatabaseX>().getReleaseTempDao() }
-    factory { get<DatabaseX>().getProductTempDao() }
+    single { get<DatabaseX>().getProductTempDao() }
-    factory { get<DatabaseX>().getCategoryDao() }
+    single { get<DatabaseX>().getCategoryDao() }
-    factory { get<DatabaseX>().getCategoryTempDao() }
+    single { get<DatabaseX>().getCategoryTempDao() }
-    factory { get<DatabaseX>().getInstalledDao() }
+    single { get<DatabaseX>().getInstalledDao() }
-    factory { get<DatabaseX>().getExtrasDao() }
+    single { get<DatabaseX>().getExtrasDao() }
-    factory { get<DatabaseX>().getExodusInfoDao() }
+    single { get<DatabaseX>().getExodusInfoDao() }
-    factory { get<DatabaseX>().getTrackerDao() }
+    single { get<DatabaseX>().getTrackerDao() }
-    factory { get<DatabaseX>().getDownloadedDao() }
+    single { get<DatabaseX>().getDownloadedDao() }
-    factory { get<DatabaseX>().getInstallTaskDao() }
+    single { get<DatabaseX>().getInstallTaskDao() }
 }

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],

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],

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()
+                .padding(paddingValues)
-                .fillMaxSize()
+                .fillMaxSize(),
-                .padding(paddingValues),
             verticalArrangement = Arrangement.spacedBy(8.dp),
             contentPadding = PaddingValues(8.dp)
         ) {

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],