From 623c4c3e3947af62914bafabe293ceba71429ee0 Mon Sep 17 00:00:00 2001 From: Dude so hot Date: Thu, 16 Jan 2025 19:57:13 +0800 Subject: [PATCH] Remove unused functions --- .../ehviewer/ui/settings/PreferenceWidgets.kt | 15 ---------- .../hippo/ehviewer/ui/tools/ViewModelState.kt | 28 ------------------- 2 files changed, 43 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt index e142b8aaf..cff0311b1 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt @@ -35,7 +35,6 @@ import arrow.atomic.Atomic import com.hippo.ehviewer.ui.openBrowser import com.hippo.ehviewer.ui.settings.PreferenceTokens.PreferenceTextPadding import com.hippo.ehviewer.util.ProgressDialog -import com.jamal.composeprefs3.ui.prefs.DropDownPref import com.jamal.composeprefs3.ui.prefs.DropDownPrefInt import com.jamal.composeprefs3.ui.prefs.SliderPref import com.jamal.composeprefs3.ui.prefs.SpannedTextPref @@ -135,20 +134,6 @@ fun SimpleMenuPreferenceInt(title: String, summary: String? = null, @ArrayRes en DropDownPrefInt(title = title, summary = summary, defaultValue = v, onValueChange = ::set, useSelectedAsSummary = summary.isNullOrBlank(), entries = map) } -@Composable -fun SimpleMenuPreference(title: String, @ArrayRes entry: Int, @ArrayRes entryValueRes: Int, value: KMutableProperty0) { - val entryArray = stringArrayResource(id = entry) - val valuesArray = stringArrayResource(id = entryValueRes) - val map = remember { - val iter = entryArray.iterator() - valuesArray.associateWith { iter.next() } - } - var v by remember { mutableStateOf(value.get()) } - fun set(new: String) = value.set(new.also { v = it }) - check(entryArray.size == valuesArray.size) - DropDownPref(title = title, defaultValue = v, onValueChange = ::set, useSelectedAsSummary = true, entries = map) -} - @Composable fun WorkPreference(title: String, summary: String? = null, work: suspend CoroutineScope.() -> Unit) { val coroutineScope = rememberCoroutineScope { Dispatchers.IO } diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/ViewModelState.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/ViewModelState.kt index 6d1069b22..8ba407ea1 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/ViewModelState.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/ViewModelState.kt @@ -81,34 +81,6 @@ fun launchInVM( viewModelScope.launch(context, start, block) } -@Composable -fun launchInVM( - key: Any?, - context: CoroutineContext = EmptyCoroutineContext, - start: CoroutineStart = CoroutineStart.DEFAULT, - block: suspend CoroutineScope.() -> Unit, -) = rememberUpdatedStateInVM(key).let { key -> - val f by rememberUpdatedStateInVM(block) - rememberInVM { - nonNullState { - viewModelScope.launch(start = CoroutineStart.UNDISPATCHED) { - snapshotFlow { key.value }.mapLatest { - coroutineScope { value = launch(context, start, f) } - }.collect() - } - } - } -} - -@Composable -fun asyncInVM( - context: CoroutineContext = EmptyCoroutineContext, - start: CoroutineStart = CoroutineStart.DEFAULT, - block: suspend CoroutineScope.() -> R, -) = rememberInVM { - viewModelScope.async(context, start, block) -} - @Composable fun asyncInVM( key: Any?,