bugfix: import presets

Author: Lennoard

app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt

@@ -19,7 +19,7 @@ internal val presentationModule = module {
     viewModelOf(::ParamBrowseViewModel)
     viewModelOf(::EditParamViewModel)
     viewModelOf(::SearchViewModel)
-    viewModelOf(::PresetsViewModel)
+    singleOf(::PresetsViewModel)
     viewModelOf(::UserParamsViewModel)
 
     single { FavoriteWidgetParamUpdater(androidContext()).getListener() }

app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt

@@ -37,6 +37,10 @@ class MainActivity : ComponentActivity() {
         )
 
         setContent {
+            // TODO: Make the switch dynamic with the view model
+            // TODO: Test presets
+            // TODO: Translations
+            // TODO: Handle shortcuts / widgets
             SysctlGuiTheme(
                 darkTheme = prefs.forceDark || isSystemInDarkTheme(),
                 contrastLevel = prefs.contrastLevel,

app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainNavBar.kt

@@ -1,13 +1,14 @@
 package com.androidvip.sysctlgui.ui.main
 
+import androidx.compose.animation.AnimatedContent
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Favorite
-import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.icons.outlined.Build
 import androidx.compose.material.icons.outlined.FavoriteBorder
 import androidx.compose.material.icons.outlined.Home
 import androidx.compose.material.icons.outlined.Settings
 import androidx.compose.material.icons.rounded.Build
+import androidx.compose.material.icons.rounded.Favorite
+import androidx.compose.material.icons.rounded.Home
 import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material3.Icon
 import androidx.compose.material3.NavigationBar
@@ -42,7 +43,7 @@ internal fun MainNavBar(navController: NavHostController = rememberNavController
             TopLevelRoute(
                 name = browseParamsTitle,
                 route = UiRoute.BrowseParams,
-                selectedIcon = Icons.Filled.Home,
+                selectedIcon = Icons.Rounded.Home,
                 unselectedIcon = Icons.Outlined.Home
             ),
             TopLevelRoute(
@@ -54,7 +55,7 @@ internal fun MainNavBar(navController: NavHostController = rememberNavController
             TopLevelRoute(
                 name = favoritesTitle,
                 route = UiRoute.Favorites,
-                selectedIcon = Icons.Filled.Favorite,
+                selectedIcon = Icons.Rounded.Favorite,
                 unselectedIcon = Icons.Outlined.FavoriteBorder
             ),
             TopLevelRoute(
@@ -77,10 +78,16 @@ internal fun MainNavBar(navController: NavHostController = rememberNavController
 
             NavigationBarItem(
                 icon = {
-                    Icon(
-                        imageVector = if (selected) route.selectedIcon else route.unselectedIcon,
-                        contentDescription = route.name,
-                    )
+                    AnimatedContent(targetState = selected) { selectedState ->
+                        Icon(
+                            imageVector = if (selectedState) {
+                                route.selectedIcon
+                            } else {
+                                route.unselectedIcon
+                            },
+                            contentDescription = route.name,
+                        )
+                    }
                 },
                 label = {
                     Text(

app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/PresetsScreen.kt

@@ -63,7 +63,7 @@ fun PresetsScreen(
         }
     )
     val createFileLauncher = rememberLauncherForActivityResult(
-        contract = ActivityResultContracts.CreateDocument("text/plain"),
+        contract = ActivityResultContracts.CreateDocument("*/*"),
         onResult = { uri ->
             viewModel.onEvent(PresetsViewEvent.BackUpFileCreated(uri))
         }

data/src/main/java/com/androidvip/sysctlgui/data/repository/UserRepositoryImpl.kt

@@ -38,11 +38,20 @@ class UserRepositoryImpl(
         paramDao.upsert(newParam)
     }
 
-    override suspend fun upsertUserParams(params: List<KernelParam>) =
-        withContext(coroutineContext) {
-            paramDao.upsertAll(params.map { KernelParamDTO.fromKernelParam(it) })
+    override suspend fun upsertUserParams(
+        params: List<KernelParam>
+    ) = withContext(coroutineContext) {
+        val currentDatabaseParams = paramDao.getAll()
+        val newParams = params.map { param ->
+            val currentDatabaseParam = currentDatabaseParams.find { it.name == param.name }
+            KernelParamDTO.fromKernelParam(param).copy(
+                id = currentDatabaseParam?.id ?: 0
+            )
         }
 
+        paramDao.upsertAll(newParams)
+    }
+
     override suspend fun removeUserParam(param: KernelParam) = withContext(coroutineContext) {
         paramDao.delete(KernelParamDTO.fromKernelParam(param))
     }

domain/src/main/java/com/androidvip/sysctlgui/domain/usecase/ApplyParamUseCase.kt

@@ -71,6 +71,6 @@ class ApplyParamUseCase(
             CommitMode.SYSCTL -> "Failed to execute sysctl command for '${param.name}'"
             CommitMode.ECHO -> "Failed to write value '${param.value}' to '${param.path}'"
         }
-        throw ApplyValueException(errorMessage)
+        throw ApplyValueException(errorMessage + message)
     }
 }