refactor: compose user params list

Author: Lennoard

app/build.gradle.kts

@@ -113,6 +113,7 @@ dependencies {
 
     implementation(AndroidX.splashScreen)
     implementation(AndroidX.lifecycleLiveData)
+    implementation(AndroidX.lifecycleRuntimeCompose)
     implementation(AndroidX.navigationFragment)
     implementation(AndroidX.navigationUi)
     implementation(AndroidX.preference)

app/src/main/AndroidManifest.xml

@@ -20,6 +20,7 @@
         <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"
@@ -31,6 +32,7 @@
             android:theme="@style/AppTheme" />
         <activity
             android:name=".ui.params.user.ManageOnStartUpParamsActivity"
+            android:launchMode="singleTask"
             android:label="@string/manage_parameters"
             android:theme="@style/AppTheme" />
         <activity

app/src/main/kotlin/com/androidvip/sysctlgui/data/models/KernelParam.kt

@@ -1,8 +1,8 @@
 package com.androidvip.sysctlgui.data.models
 
 import android.os.Parcelable
-import com.androidvip.sysctlgui.utils.Consts
 import com.androidvip.sysctlgui.domain.models.DomainKernelParam
+import com.androidvip.sysctlgui.utils.Consts
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -15,21 +15,6 @@ data class KernelParam(
     override var taskerParam: Boolean = false,
     override var taskerList: Int = Consts.LIST_NUMBER_PRIMARY_TASKER
 ) : DomainKernelParam(), Parcelable {
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as KernelParam
-        if (name != other.name) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return name.hashCode()
-    }
-
     override fun toString(): String {
         if (name.isEmpty()) setNameFromPath(path)
         return "$name = $value"

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

@@ -3,6 +3,7 @@ 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.edit.EditParamViewModel
 import com.androidvip.sysctlgui.ui.params.list.ListParamsViewModel
 import com.androidvip.sysctlgui.ui.params.user.UserParamsViewModel
 import com.androidvip.sysctlgui.widgets.FavoriteWidgetParamUpdater
@@ -15,6 +16,7 @@ internal val presentationModules = module {
     viewModel { BrowseParamsViewModel(get(), get()) }
     viewModelOf(::ListParamsViewModel)
     viewModelOf(::UserParamsViewModel)
+    viewModelOf(::EditParamViewModel)
     viewModelOf(::MainViewModel)
     viewModel { ExportOptionsViewModel(get(), get(), get()) }
 

app/src/main/kotlin/com/androidvip/sysctlgui/helpers/SwipeToDeleteCallback.kt

@@ -2,7 +2,6 @@ package com.androidvip.sysctlgui.ui.params.browse
 
 import android.annotation.SuppressLint
 import android.app.Dialog
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
@@ -27,12 +26,12 @@ import androidx.compose.material.pullrefresh.rememberPullRefreshState
 import androidx.compose.material3.Divider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -47,7 +46,6 @@ import com.androidvip.sysctlgui.ui.base.BaseSearchFragment
 import com.androidvip.sysctlgui.ui.params.EmptyParamsWarning
 import com.androidvip.sysctlgui.ui.params.OnParamItemClickedListener
 import com.androidvip.sysctlgui.ui.params.edit.EditKernelParamActivity
-import com.androidvip.sysctlgui.ui.params.user.RemovableParamAdapter
 import com.androidvip.sysctlgui.utils.Consts
 import com.google.android.material.color.MaterialColors
 import java.io.File
@@ -67,7 +65,7 @@ class KernelParamBrowseFragment : BaseSearchFragment(), OnParamItemClickedListen
         return ComposeView(requireContext()).apply {
             setContent {
                 SysctlGuiTheme {
-                    val state by viewModel.uiState.collectAsState()
+                    val state by viewModel.uiState.collectAsStateWithLifecycle()
                     val refreshing = state.isLoading
                     val refreshState = rememberPullRefreshState(
                         refreshing = refreshing,
@@ -179,10 +177,7 @@ class KernelParamBrowseFragment : BaseSearchFragment(), OnParamItemClickedListen
     }
 
     private fun navigateToParamDetails(param: KernelParam) {
-        Intent(requireContext(), EditKernelParamActivity::class.java).apply {
-            putExtra(RemovableParamAdapter.EXTRA_PARAM, param)
-            startActivity(this)
-        }
+        startActivity(EditKernelParamActivity.getIntent(requireContext(), param))
     }
 
     private fun refresh() {

app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/KernelParamBrowseFragment.kt

@@ -1,6 +1,7 @@
 package com.androidvip.sysctlgui.ui.params.edit
 
 import android.app.Activity
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -12,17 +13,13 @@ import com.androidvip.sysctlgui.R
 import com.androidvip.sysctlgui.data.models.KernelParam
 import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme
 import com.androidvip.sysctlgui.toast
-import com.androidvip.sysctlgui.ui.params.user.RemovableParamAdapter
 import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class EditKernelParamActivity : ComponentActivity() {
     private val viewModel by viewModel<EditParamViewModel>()
     private val isEditingSavedParam: Boolean
-        get() = intent.getBooleanExtra(
-            RemovableParamAdapter.EXTRA_EDIT_SAVED_PARAM,
-            false
-        )
+        get() = intent.getBooleanExtra(EXTRA_EDIT_SAVED_PARAM, false)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -46,8 +43,7 @@ class EditKernelParamActivity : ComponentActivity() {
     }
 
     private fun handleIntent(intent: Intent) {
-        val extraParam = RemovableParamAdapter.EXTRA_PARAM
-        val param = intent.getParcelableExtra(extraParam) as? KernelParam
+        val param = intent.getParcelableExtra(EXTRA_PARAM) as? KernelParam
         if (param != null) {
             viewModel.onEvent(EditParamViewEvent.ReceivedParam(param, this))
         } else {
@@ -105,7 +101,13 @@ class EditKernelParamActivity : ComponentActivity() {
     }
 
     companion object {
-        const val NAME_TRANSITION_NAME = "transition_title"
-        const val VALUE_TRANSITION_NAME = "transition_value"
+        const val EXTRA_EDIT_SAVED_PARAM = "edit_saved_param"
+        const val EXTRA_PARAM = "param"
+
+        fun getIntent(context: Context, param: KernelParam): Intent {
+            return Intent(context, EditKernelParamActivity::class.java).apply {
+                putExtra(EXTRA_PARAM, param)
+            }
+        }
     }
 }