refactor: [WIP] updated presentation layer

Author: Lennoard

app/build.gradle.kts

@@ -6,7 +6,6 @@ plugins {
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.ksp)
     alias(libs.plugins.jetbrains.kotlin.serialization)
-    kotlin("kapt")
     id("kotlin-parcelize")
 }
 
@@ -65,7 +64,6 @@ android {
 
     buildFeatures {
         viewBinding = true
-        dataBinding = true
         compose = true
     }
 
@@ -108,12 +106,14 @@ dependencies {
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlinx.coroutines.android)
 
-    implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.core.splashscreen)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.material)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.window)
+    implementation(libs.androidx.work.runtime.ktx)
 
     // Lifecycle
     implementation(libs.androidx.lifecycle.runtime.ktx)
@@ -124,23 +124,7 @@ dependencies {
     implementation(libs.androidx.lifecycle.viewmodel.savedstate)
     //ksp(libs.androidx.lifecycle.compiler)
 
-    implementation(AndroidX.splashScreen)
-    implementation(AndroidX.lifecycleLiveData)
-    implementation(AndroidX.navigationFragment)
-    implementation(AndroidX.navigationUi)
-    implementation(AndroidX.preference)
-    implementation(AndroidX.room)
-    implementation(AndroidX.roomRuntime)
-    implementation(AndroidX.workManager)
-    ksp(AndroidX.roomCompiler)
-
-    implementation(Google.gson)
-
     implementation(libs.koin)
     implementation(libs.koin.compose)
     implementation(libs.bundles.libsu)
-
-    implementation(Dependencies.libSuIo)
-    implementation(Dependencies.liveEvent)
-    implementation(Dependencies.tapTargetView)
 }

app/src/main/AndroidManifest.xml

@@ -22,25 +22,7 @@
         android:theme="@style/AppTheme"
         android:enableOnBackInvokedCallback="true"
         tools:ignore="GoogleAppIndexingWarning">
-
-        <activity
-            android:name=".ui.params.user.ManageFavoritesParamsActivity"
-            android:label="@string/tasker_list_plugin_favorites"
-            android:launchMode="singleTask"
-            android:theme="@style/AppTheme" />
-        <activity
-            android:name=".ui.params.edit.EditKernelParamActivity"
-            android:label="@string/edit_params"
-            android:launchMode="singleTask"
-            android:theme="@style/AppTheme" />
-        <activity
-            android:name=".ui.main.MainActivity"
-            android:theme="@style/AppTheme" />
-        <activity
-            android:name=".ui.params.user.ManageOnStartUpParamsActivity"
-            android:launchMode="singleTask"
-            android:label="@string/manage_parameters"
-            android:theme="@style/AppTheme" />
+        <activity android:name=".ui.main.MainActivity" />
         <activity
             android:name=".ui.start.StartActivity"
             android:exported="true"

app/src/main/kotlin/com/androidvip/sysctlgui/SysctlGuiApp.kt

@@ -2,7 +2,7 @@ package com.androidvip.sysctlgui
 
 import android.app.Application
 import com.androidvip.sysctlgui.data.di.dataModules
-import com.androidvip.sysctlgui.di.presentationModules
+import com.androidvip.sysctlgui.di.presentationModule
 import com.androidvip.sysctlgui.domain.di.domainModule
 import com.androidvip.sysctlgui.domain.repository.AppPrefs
 import com.google.android.material.color.DynamicColors
@@ -17,7 +17,7 @@ class SysctlGuiApp : Application() {
 
         startKoin {
             androidContext(this@SysctlGuiApp)
-            modules(dataModules + presentationModules + domainModule)
+            modules(dataModules + presentationModule + domainModule)
         }
 
         val prefs: AppPrefs = get()

app/src/main/kotlin/com/androidvip/sysctlgui/core/navigation/TopLevelRoute.kt

@@ -0,0 +1,20 @@
+package com.androidvip.sysctlgui.core.navigation
+
+import androidx.compose.ui.graphics.vector.ImageVector
+
+/**
+ * Represents a top-level destination in the application's navigation.
+ *
+ * @param T The type of [UiRoute] this top-level route represents. This allows for specific
+ *          route information to be associated with the top-level destination.
+ * @property name The human-readable name of the top-level destination, used for labels.
+ * @property route The actual [UiRoute] object that defines the navigation destination.
+ * @property selectedIcon The icon to display when this top-level route is currently selected.
+ * @property unselectedIcon The icon to display when this top-level route is not selected.
+ */
+data class TopLevelRoute<T : UiRoute>(
+    val name: String,
+    val route: T,
+    val selectedIcon: ImageVector,
+    val unselectedIcon: ImageVector
+)

app/src/main/kotlin/com/androidvip/sysctlgui/core/navigation/UiRoute.kt

@@ -0,0 +1,27 @@
+package com.androidvip.sysctlgui.core.navigation
+
+import kotlinx.serialization.Serializable
+
+/**
+ * Represents the different routes in the application's UI.
+ * This is used for navigation purposes.
+ */
+@Serializable
+sealed interface UiRoute {
+    @Serializable
+    data object BrowseParams : UiRoute
+    @Serializable
+    data class EditParam(val paramName: String) : UiRoute
+    @Serializable
+    data object Presets : UiRoute
+    @Serializable
+    data object ImportPresets : UiRoute
+    @Serializable
+    data object Favorites : UiRoute
+    @Serializable
+    data object UserParams : UiRoute
+    @Serializable
+    data object Search : UiRoute
+    @Serializable
+    data object Settings : UiRoute
+}

app/src/main/kotlin/com/androidvip/sysctlgui/data/mapper/DomainParamMapper.kt

@@ -1,24 +1,25 @@
 package com.androidvip.sysctlgui.di
 
-import com.androidvip.sysctlgui.ui.export.ExportOptionsViewModel
 import com.androidvip.sysctlgui.ui.main.MainViewModel
-import com.androidvip.sysctlgui.ui.params.browse.BrowseParamsViewModel
+import com.androidvip.sysctlgui.ui.params.browse.ParamBrowseViewModel
 import com.androidvip.sysctlgui.ui.params.edit.EditParamViewModel
-import com.androidvip.sysctlgui.ui.params.list.ListParamsViewModel
-import com.androidvip.sysctlgui.ui.params.user.UserParamsViewModel
+import com.androidvip.sysctlgui.ui.presets.PresetsViewModel
+import com.androidvip.sysctlgui.ui.search.SearchViewModel
+import com.androidvip.sysctlgui.ui.settings.SettingsViewModel
+import com.androidvip.sysctlgui.ui.user.UserParamsViewModel
 import com.androidvip.sysctlgui.widgets.FavoriteWidgetParamUpdater
 import org.koin.android.ext.koin.androidContext
-import org.koin.androidx.viewmodel.dsl.viewModel
-import org.koin.androidx.viewmodel.dsl.viewModelOf
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
-internal val presentationModules = module {
-    viewModel { BrowseParamsViewModel(get(), get()) }
-    viewModelOf(::ListParamsViewModel)
-    viewModelOf(::UserParamsViewModel)
-    viewModelOf(::EditParamViewModel)
+internal val presentationModule = module {
     viewModelOf(::MainViewModel)
-    viewModel { ExportOptionsViewModel(get(), get(), get()) }
+    viewModelOf(::SettingsViewModel)
+    viewModelOf(::ParamBrowseViewModel)
+    viewModelOf(::EditParamViewModel)
+    viewModelOf(::SearchViewModel)
+    viewModelOf(::PresetsViewModel)
+    viewModelOf(::UserParamsViewModel)
 
     single { FavoriteWidgetParamUpdater(androidContext()).getListener() }
 }