Skip to content

Commit 188ed3e

Browse files
lisongelisonge
committed
refactor: BaseViewModel
1 parent 9170ad0 commit 188ed3e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+181
-196
lines changed

‎app/src/main/kotlin/li/songe/gkd/MainActivity.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ import li.songe.gkd.ui.component.ShareDataDialog
7979
import li.songe.gkd.ui.component.SubsSheet
8080
import li.songe.gkd.ui.component.TermsAcceptDialog
8181
import li.songe.gkd.ui.component.UrlDetailDialog
82-
import li.songe.gkd.ui.local.LocalMainViewModel
83-
import li.songe.gkd.ui.local.LocalNavController
82+
import li.songe.gkd.ui.share.LocalMainViewModel
83+
import li.songe.gkd.ui.share.LocalNavController
8484
import li.songe.gkd.ui.theme.AppTheme
8585
import li.songe.gkd.util.EditGithubCookieDlg
8686
import li.songe.gkd.util.ShortUrlSet
@@ -89,7 +89,7 @@ import li.songe.gkd.util.componentName
8989
import li.songe.gkd.util.copyText
9090
import li.songe.gkd.util.fixSomeProblems
9191
import li.songe.gkd.util.launchTry
92-
import li.songe.gkd.util.map
92+
import li.songe.gkd.util.mapState
9393
import li.songe.gkd.util.openApp
9494
import li.songe.gkd.util.openUri
9595
import li.songe.gkd.util.shizukuAppId
@@ -162,7 +162,7 @@ class MainActivity : ComponentActivity() {
162162
pickContentLauncher
163163
StatusService.autoStart()
164164
lifecycleScope.launch {
165-
storeFlow.map(lifecycleScope) { s -> s.excludeFromRecents }.collect {
165+
storeFlow.mapState(lifecycleScope) { s -> s.excludeFromRecents }.collect {
166166
app.activityManager.appTasks.forEach { task ->
167167
task.setExcludeFromRecents(it)
168168
}

‎app/src/main/kotlin/li/songe/gkd/permission/PermissionState.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import li.songe.gkd.app
2525
import li.songe.gkd.appScope
2626
import li.songe.gkd.isActivityVisible
2727
import li.songe.gkd.shizuku.shizukuCheckGranted
28-
import li.songe.gkd.ui.local.LocalMainViewModel
28+
import li.songe.gkd.ui.share.LocalMainViewModel
2929
import li.songe.gkd.util.forceUpdateAppList
3030
import li.songe.gkd.util.initOrResetAppInfoCache
3131
import li.songe.gkd.util.launchTry

‎app/src/main/kotlin/li/songe/gkd/service/A11yService.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import li.songe.gkd.util.UpdateTimeOption
5454
import li.songe.gkd.util.checkSubsUpdate
5555
import li.songe.gkd.util.componentName
5656
import li.songe.gkd.util.launchTry
57-
import li.songe.gkd.util.map
57+
import li.songe.gkd.util.mapState
5858
import li.songe.gkd.util.showActionToast
5959
import li.songe.gkd.util.toast
6060
import li.songe.selector.MatchOption
@@ -576,7 +576,7 @@ private fun A11yService.useAliveView() {
576576

577577
onA11yConnected {
578578
scope.launchTry {
579-
storeFlow.map(scope) { s -> s.enableAbFloatWindow }.collect {
579+
storeFlow.mapState(scope) { s -> s.enableAbFloatWindow }.collect {
580580
if (it) {
581581
addA11View()
582582
} else {
@@ -627,7 +627,7 @@ private fun A11yService.useCaptureVolume() {
627627
var captureVolumeReceiver: BroadcastReceiver? = null
628628
onCreated {
629629
scope.launch {
630-
storeFlow.map(scope) { s -> s.captureVolumeChange }.collect {
630+
storeFlow.mapState(scope) { s -> s.captureVolumeChange }.collect {
631631
if (captureVolumeReceiver != null) {
632632
unregisterReceiver(captureVolumeReceiver)
633633
}

‎app/src/main/kotlin/li/songe/gkd/service/HttpService.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import li.songe.gkd.util.getIpAddressInLocalNetwork
5656
import li.songe.gkd.util.isPortAvailable
5757
import li.songe.gkd.util.keepNullJson
5858
import li.songe.gkd.util.launchTry
59-
import li.songe.gkd.util.map
59+
import li.songe.gkd.util.mapState
6060
import li.songe.gkd.util.startForegroundServiceByClass
6161
import li.songe.gkd.util.stopServiceByClass
6262
import li.songe.gkd.util.subsItemsFlow
@@ -79,7 +79,7 @@ class HttpService : Service(), OnCreateToDestroy {
7979

8080
val scope = useScope()
8181

82-
private val httpServerPortFlow = storeFlow.map(scope) { s -> s.httpServerPort }
82+
private val httpServerPortFlow = storeFlow.mapState(scope) { s -> s.httpServerPort }
8383

8484
init {
8585
useLogLifecycle()

‎app/src/main/kotlin/li/songe/gkd/service/MatchTileService.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package li.songe.gkd.service
22

33
import li.songe.gkd.store.storeFlow
44
import li.songe.gkd.store.switchStoreEnableMatch
5-
import li.songe.gkd.util.map
5+
import li.songe.gkd.util.mapState
66

77
class MatchTileService : BaseTileService() {
8-
override val activeFlow = storeFlow.map(scope) { it.enableMatch }
8+
override val activeFlow = storeFlow.mapState(scope) { it.enableMatch }
99

1010
init {
1111
onTileClicked { switchStoreEnableMatch() }

‎app/src/main/kotlin/li/songe/gkd/ui/AboutPage.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ import li.songe.gkd.ui.component.RotatingLoadingIcon
6868
import li.songe.gkd.ui.component.SettingItem
6969
import li.songe.gkd.ui.component.TextMenu
7070
import li.songe.gkd.ui.component.waitResult
71-
import li.songe.gkd.ui.local.LocalDarkTheme
72-
import li.songe.gkd.ui.local.LocalMainViewModel
73-
import li.songe.gkd.ui.local.LocalNavController
71+
import li.songe.gkd.ui.share.LocalDarkTheme
72+
import li.songe.gkd.ui.share.LocalMainViewModel
73+
import li.songe.gkd.ui.share.LocalNavController
7474
import li.songe.gkd.ui.style.EmptyHeight
7575
import li.songe.gkd.ui.style.ProfileTransitions
7676
import li.songe.gkd.ui.style.itemPadding

‎app/src/main/kotlin/li/songe/gkd/ui/ActionLogPage.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ import li.songe.gkd.ui.component.measureNumberTextWidth
6666
import li.songe.gkd.ui.component.useListScrollState
6767
import li.songe.gkd.ui.component.useSubs
6868
import li.songe.gkd.ui.component.waitResult
69-
import li.songe.gkd.ui.local.LocalMainViewModel
70-
import li.songe.gkd.ui.local.LocalNavController
69+
import li.songe.gkd.ui.share.LocalMainViewModel
70+
import li.songe.gkd.ui.share.LocalNavController
7171
import li.songe.gkd.ui.style.EmptyHeight
7272
import li.songe.gkd.ui.style.ProfileTransitions
7373
import li.songe.gkd.ui.style.itemHorizontalPadding
7474
import li.songe.gkd.ui.style.scaffoldPadding
7575
import li.songe.gkd.util.LIST_PLACEHOLDER_KEY
7676
import li.songe.gkd.util.launchAsFn
77-
import li.songe.gkd.util.map
77+
import li.songe.gkd.util.mapState
7878
import li.songe.gkd.util.subsIdToRawFlow
7979
import li.songe.gkd.util.subsItemsFlow
8080
import li.songe.gkd.util.throttle
@@ -368,7 +368,7 @@ private fun ActionLogDialog(
368368

369369
if (actionLog.groupType == SubsConfig.GlobalGroupType) {
370370
val subs = remember(actionLog.subsId) {
371-
subsIdToRawFlow.map(scope) { it[actionLog.subsId] }
371+
subsIdToRawFlow.mapState(scope) { it[actionLog.subsId] }
372372
}.collectAsState().value
373373
val group = subs?.globalGroups?.find { g -> g.key == actionLog.groupKey }
374374
val appChecked = if (group != null) {

‎app/src/main/kotlin/li/songe/gkd/ui/ActivityLogPage.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import li.songe.gkd.ui.component.LocalNumberCharWidth
4949
import li.songe.gkd.ui.component.measureNumberTextWidth
5050
import li.songe.gkd.ui.component.useListScrollState
5151
import li.songe.gkd.ui.component.waitResult
52-
import li.songe.gkd.ui.local.LocalNavController
52+
import li.songe.gkd.ui.share.LocalNavController
5353
import li.songe.gkd.ui.style.EmptyHeight
5454
import li.songe.gkd.ui.style.ProfileTransitions
5555
import li.songe.gkd.ui.style.itemHorizontalPadding

‎app/src/main/kotlin/li/songe/gkd/ui/AdvancedPage.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ import li.songe.gkd.ui.component.SettingItem
8282
import li.songe.gkd.ui.component.TextSwitch
8383
import li.songe.gkd.ui.component.autoFocus
8484
import li.songe.gkd.ui.component.updateDialogOptions
85-
import li.songe.gkd.ui.local.LocalMainViewModel
86-
import li.songe.gkd.ui.local.LocalNavController
85+
import li.songe.gkd.ui.share.LocalMainViewModel
86+
import li.songe.gkd.ui.share.LocalNavController
8787
import li.songe.gkd.ui.style.EmptyHeight
8888
import li.songe.gkd.ui.style.ProfileTransitions
8989
import li.songe.gkd.ui.style.itemPadding

‎app/src/main/kotlin/li/songe/gkd/ui/AppConfigPage.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ import li.songe.gkd.ui.component.animateListItem
6969
import li.songe.gkd.ui.component.toGroupState
7070
import li.songe.gkd.ui.component.useListScrollState
7171
import li.songe.gkd.ui.icon.BackCloseIcon
72-
import li.songe.gkd.ui.local.LocalMainViewModel
73-
import li.songe.gkd.ui.local.LocalNavController
72+
import li.songe.gkd.ui.share.LocalMainViewModel
73+
import li.songe.gkd.ui.share.LocalNavController
7474
import li.songe.gkd.ui.style.EmptyHeight
7575
import li.songe.gkd.ui.style.ProfileTransitions
7676
import li.songe.gkd.ui.style.menuPadding
@@ -96,7 +96,7 @@ fun AppConfigPage(appId: String, focusLog: ActionLog? = null) {
9696

9797
val ruleSortType by vm.ruleSortTypeFlow.collectAsState()
9898
val groupSize by vm.groupSizeFlow.collectAsState()
99-
val firstLoading by vm.linkLoad.firstLoadingFlow.collectAsState()
99+
val firstLoading by vm.firstLoadingFlow.collectAsState()
100100
val (scrollBehavior, listState) = useListScrollState(groupSize > 0, ruleSortType.value)
101101
if (focusLog != null && groupSize > 0) {
102102
LaunchedEffect(null) {

0 commit comments

Comments
 (0)