perf: rm hilt

gkd-kit · Aug 18, 2024 · dbc4a28 · dbc4a28
1 parent b4474f5
commit dbc4a28
Show file tree

Hide file tree

Showing 31 changed files with 65 additions and 108 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -44,7 +44,6 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.google.ksp)
-    alias(libs.plugins.google.hilt)
     alias(libs.plugins.rikka.refine)
 }
 
@@ -243,10 +242,6 @@ dependencies {
     implementation(libs.destinations.core)
     ksp(libs.destinations.ksp)
 
-    implementation(libs.google.hilt.android)
-    ksp(libs.google.hilt.android.compiler)
-    implementation(libs.androidx.hilt.navigation.compose)
-
     implementation(libs.reorderable)
 
     implementation(libs.androidx.splashscreen)

diff --git a/app/src/main/kotlin/li/songe/gkd/App.kt b/app/src/main/kotlin/li/songe/gkd/App.kt
@@ -8,7 +8,6 @@ import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.Utils
 import com.hjq.toast.Toaster
 import com.tencent.mmkv.MMKV
-import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import li.songe.gkd.debug.clearHttpSubs
@@ -38,7 +37,6 @@ val applicationInfo by lazy {
 
 val channel by lazy { applicationInfo.metaData.getString("channel") }
 
-@HiltAndroidApp
 class App : Application() {
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)

diff --git a/app/src/main/kotlin/li/songe/gkd/MainActivity.kt b/app/src/main/kotlin/li/songe/gkd/MainActivity.kt
@@ -14,7 +14,6 @@ import com.blankj.utilcode.util.ServiceUtils
 import com.dylanc.activityresult.launcher.PickContentLauncher
 import com.dylanc.activityresult.launcher.StartActivityLauncher
 import com.ramcosta.composedestinations.DestinationsNavHost
-import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
@@ -42,7 +41,6 @@ import li.songe.gkd.util.launchTry
 import li.songe.gkd.util.map
 import li.songe.gkd.util.storeFlow
 
-@AndroidEntryPoint
 class MainActivity : CompositionActivity({
     this as MainActivity
     useLifeCycleLog()
@@ -120,7 +118,8 @@ class MainActivity : CompositionActivity({
         activityVisibleFlow.update { it - 1 }
     }
 
-    var lastBackPressedTime = 0L
+    private var lastBackPressedTime = 0L
+
     @Suppress("OVERRIDE_DEPRECATION")
     override fun onBackPressed() {
         // onBackPressedDispatcher.addCallback is not work, it will be covered by compose navigation

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/ActivityLogPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/ActivityLogPage.kt
@@ -29,8 +29,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
 import com.ramcosta.composedestinations.annotation.Destination
@@ -52,7 +52,7 @@ import li.songe.gkd.util.throttle
 fun ActivityLogPage() {
     val context = LocalContext.current as MainActivity
     val mainVm = context.mainVm
-    val vm = hiltViewModel<ActivityLogVm>()
+    val vm = viewModel<ActivityLogVm>()
     val navController = LocalNavController.current
 
     val logCount by vm.logCountFlow.collectAsState()

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/ActivityLogVm.kt b/app/src/main/kotlin/li/songe/gkd/ui/ActivityLogVm.kt
@@ -1,19 +1,15 @@
 package li.songe.gkd.ui
 
-import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
-import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.stateIn
 import li.songe.gkd.db.DbSet
-import javax.inject.Inject
 
-@HiltViewModel
-class ActivityLogVm @Inject constructor(stateHandle: SavedStateHandle) : ViewModel() {
+class ActivityLogVm : ViewModel() {
     val pagingDataFlow = Pager(PagingConfig(pageSize = 100)) { DbSet.activityLogDao.pagingSource() }
         .flow.cachedIn(viewModelScope)
 

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/AdvancedPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/AdvancedPage.kt
@@ -52,8 +52,8 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.core.content.ContextCompat
-import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.compose.viewModel
 import com.blankj.utilcode.util.LogUtils
 import com.dylanc.activityresult.launcher.launchForResult
 import com.ramcosta.composedestinations.annotation.Destination
@@ -107,7 +107,7 @@ import rikka.shizuku.Shizuku
 @Composable
 fun AdvancedPage() {
     val context = LocalContext.current as MainActivity
-    val vm = hiltViewModel<AdvancedVm>()
+    val vm = viewModel<AdvancedVm>()
     val launcher = LocalLauncher.current
     val navController = LocalNavController.current
     val store by storeFlow.collectAsState()

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/AdvancedVm.kt b/app/src/main/kotlin/li/songe/gkd/ui/AdvancedVm.kt
@@ -2,16 +2,13 @@ package li.songe.gkd.ui
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.stateIn
 import li.songe.gkd.db.DbSet
 import li.songe.gkd.ui.component.UploadOptions
-import javax.inject.Inject
 
-@HiltViewModel
-class AdvancedVm @Inject constructor() : ViewModel() {
+class AdvancedVm : ViewModel() {
     val snapshotCountFlow =
         DbSet.snapshotDao.count().stateIn(viewModelScope, SharingStarted.Eagerly, 0)
 

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/AppConfigPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/AppConfigPage.kt
@@ -46,8 +46,8 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.compose.viewModel
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootNavGraph
 import com.ramcosta.composedestinations.navigation.navigate
@@ -80,7 +80,7 @@ import li.songe.gkd.util.throttle
 @Composable
 fun AppConfigPage(appId: String) {
     val navController = LocalNavController.current
-    val vm = hiltViewModel<AppConfigVm>()
+    val vm = viewModel<AppConfigVm>()
     val ruleSortType by vm.ruleSortTypeFlow.collectAsState()
     val appInfoCache by appInfoCacheFlow.collectAsState()
     val appInfo = appInfoCache[appId]

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/AppConfigVm.kt b/app/src/main/kotlin/li/songe/gkd/ui/AppConfigVm.kt
@@ -3,7 +3,6 @@ package li.songe.gkd.ui
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
@@ -20,10 +19,8 @@ import li.songe.gkd.util.collator
 import li.songe.gkd.util.getGroupRawEnable
 import li.songe.gkd.util.subsIdToRawFlow
 import li.songe.gkd.util.subsItemsFlow
-import javax.inject.Inject
 
-@HiltViewModel
-class AppConfigVm @Inject constructor(stateHandle: SavedStateHandle) : ViewModel() {
+class AppConfigVm (stateHandle: SavedStateHandle) : ViewModel() {
     private val args = AppConfigPageDestination.argsFrom(stateHandle)
 
     private val latestGlobalLogsFlow = DbSet.clickLogDao.queryAppLatest(

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/AppItemPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/AppItemPage.kt
@@ -51,8 +51,8 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.compose.viewModel
 import com.blankj.utilcode.util.ClipboardUtils
 import com.blankj.utilcode.util.LogUtils
 import com.ramcosta.composedestinations.annotation.Destination
@@ -75,7 +75,6 @@ import li.songe.gkd.util.LocalMainViewModel
 import li.songe.gkd.util.LocalNavController
 import li.songe.gkd.util.ProfileTransitions
 import li.songe.gkd.util.appInfoCacheFlow
-import li.songe.json5.encodeToJson5String
 import li.songe.gkd.util.getGroupRawEnable
 import li.songe.gkd.util.json
 import li.songe.gkd.util.launchAsFn
@@ -84,6 +83,7 @@ import li.songe.gkd.util.throttle
 import li.songe.gkd.util.toast
 import li.songe.gkd.util.updateSubscription
 import li.songe.json5.Json5
+import li.songe.json5.encodeToJson5String
 
 @RootNavGraph
 @Destination(style = ProfileTransitions::class)
@@ -95,7 +95,7 @@ fun AppItemPage(
 ) {
     val navController = LocalNavController.current
     val mainVm = LocalMainViewModel.current
-    val vm = hiltViewModel<AppItemVm>()
+    val vm = viewModel<AppItemVm>()
     val subsItem = vm.subsItemFlow.collectAsState().value
     val subsRaw = vm.subsRawFlow.collectAsState().value
     val subsConfigs by vm.subsConfigsFlow.collectAsState()
@@ -285,7 +285,7 @@ fun AppItemPage(
                                     },
                                 )
                             }
-                            if (editable && subsRaw != null) {
+                            if (editable && subsRaw != null && subsItem != null) {
                                 DropdownMenuItem(
                                     text = {
                                         Text(text = "删除", color = MaterialTheme.colorScheme.error)

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/AppItemVm.kt b/app/src/main/kotlin/li/songe/gkd/ui/AppItemVm.kt
@@ -3,7 +3,6 @@ package li.songe.gkd.ui
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
@@ -13,10 +12,8 @@ import li.songe.gkd.ui.destinations.AppItemPageDestination
 import li.songe.gkd.util.map
 import li.songe.gkd.util.subsIdToRawFlow
 import li.songe.gkd.util.subsItemsFlow
-import javax.inject.Inject
 
-@HiltViewModel
-class AppItemVm @Inject constructor(stateHandle: SavedStateHandle) : ViewModel() {
+class AppItemVm (stateHandle: SavedStateHandle) : ViewModel() {
     private val args = AppItemPageDestination.argsFrom(stateHandle)
 
     val subsItemFlow =

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/CategoryPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/CategoryPage.kt
@@ -42,8 +42,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.compose.viewModel
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootNavGraph
 import kotlinx.coroutines.Dispatchers
@@ -72,7 +72,7 @@ fun CategoryPage(subsItemId: Long) {
     val navController = LocalNavController.current
     val mainVm = LocalMainViewModel.current
 
-    val vm = hiltViewModel<CategoryVm>()
+    val vm = viewModel<CategoryVm>()
     val subsItem by vm.subsItemFlow.collectAsState()
     val subsRaw by vm.subsRawFlow.collectAsState()
     val categoryConfigs by vm.categoryConfigsFlow.collectAsState()

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/CategoryVm.kt b/app/src/main/kotlin/li/songe/gkd/ui/CategoryVm.kt
@@ -3,18 +3,15 @@ package li.songe.gkd.ui
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.stateIn
 import li.songe.gkd.db.DbSet
 import li.songe.gkd.ui.destinations.CategoryPageDestination
 import li.songe.gkd.util.map
 import li.songe.gkd.util.subsIdToRawFlow
 import li.songe.gkd.util.subsItemsFlow
-import javax.inject.Inject
 
-@HiltViewModel
-class CategoryVm @Inject constructor(stateHandle: SavedStateHandle) : ViewModel() {
+class CategoryVm (stateHandle: SavedStateHandle) : ViewModel() {
     private val args = CategoryPageDestination.argsFrom(stateHandle)
 
     val subsItemFlow =

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/ClickLogPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/ClickLogPage.kt
@@ -38,8 +38,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
-import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
 import com.ramcosta.composedestinations.annotation.Destination
@@ -78,7 +78,7 @@ fun ClickLogPage() {
     val context = LocalContext.current as MainActivity
     val mainVm = context.mainVm
     val navController = LocalNavController.current
-    val vm = hiltViewModel<ClickLogVm>()
+    val vm = viewModel<ClickLogVm>()
     val clickLogCount by vm.clickLogCountFlow.collectAsState()
     val clickDataItems = vm.pagingDataFlow.collectAsLazyPagingItems()
     val appInfoCache by appInfoCacheFlow.collectAsState()

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/ClickLogVm.kt b/app/src/main/kotlin/li/songe/gkd/ui/ClickLogVm.kt
@@ -6,18 +6,15 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
 import androidx.paging.map
-import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
 import li.songe.gkd.data.SubsConfig
 import li.songe.gkd.data.Tuple3
 import li.songe.gkd.db.DbSet
 import li.songe.gkd.util.subsIdToRawFlow
-import javax.inject.Inject
 
-@HiltViewModel
-class ClickLogVm @Inject constructor() : ViewModel() {
+class ClickLogVm : ViewModel() {
 
     val pagingDataFlow = Pager(PagingConfig(pageSize = 100)) { DbSet.clickLogDao.pagingSource() }
         .flow.cachedIn(viewModelScope)

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludePage.kt b/app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludePage.kt
@@ -56,8 +56,8 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.compose.viewModel
 import com.google.accompanist.drawablepainter.rememberDrawablePainter
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootNavGraph
@@ -84,7 +84,7 @@ import li.songe.gkd.util.toast
 @Composable
 fun GlobalRuleExcludePage(subsItemId: Long, groupKey: Int) {
     val navController = LocalNavController.current
-    val vm = hiltViewModel<GlobalRuleExcludeVm>()
+    val vm = viewModel<GlobalRuleExcludeVm>()
     val rawSubs = vm.rawSubsFlow.collectAsState().value
     val group = vm.groupFlow.collectAsState().value
     val excludeData = vm.excludeDataFlow.collectAsState().value
@@ -221,17 +221,15 @@ fun GlobalRuleExcludePage(subsItemId: Long, groupKey: Int) {
                         )
                         DropdownMenuItem(
                             text = {
-                                Row(
-                                    verticalAlignment = Alignment.CenterVertically
-                                ) {
-                                    Checkbox(
-                                        checked = showHiddenApp,
-                                        onCheckedChange = {
-                                            vm.showHiddenAppFlow.value =
-                                                !vm.showHiddenAppFlow.value
-                                        })
-                                    Text("显示隐藏应用")
-                                }
+                                Text("显示隐藏应用")
+                            },
+                            trailingIcon = {
+                                Checkbox(
+                                    checked = showHiddenApp,
+                                    onCheckedChange = {
+                                        vm.showHiddenAppFlow.value =
+                                            !vm.showHiddenAppFlow.value
+                                    })
                             },
                             onClick = {
                                 vm.showHiddenAppFlow.value = !vm.showHiddenAppFlow.value

diff --git a/app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludeVm.kt b/app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludeVm.kt
@@ -3,7 +3,6 @@ package li.songe.gkd.ui
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
@@ -17,10 +16,8 @@ import li.songe.gkd.util.SortTypeOption
 import li.songe.gkd.util.map
 import li.songe.gkd.util.orderedAppInfosFlow
 import li.songe.gkd.util.subsIdToRawFlow
-import javax.inject.Inject
 
-@HiltViewModel
-class GlobalRuleExcludeVm @Inject constructor(stateHandle: SavedStateHandle) : ViewModel() {
+class GlobalRuleExcludeVm (stateHandle: SavedStateHandle) : ViewModel() {
     private val args = GlobalRuleExcludePageDestination.argsFrom(stateHandle)
 
     val rawSubsFlow = subsIdToRawFlow.map(viewModelScope) { it[args.subsItemId] }