From 4c12ca9ee11a8efcc349ad637a2731b38b7cb9d4 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Sat, 17 Sep 2022 03:47:40 +0200 Subject: [PATCH] Update: Use Preferences.Key explicitly for (on)PrefDialog --- .../fdroid/ui/compose/components/prefs/PrefsBuilder.kt | 2 +- .../fdroid/ui/compose/components/prefs/PrefsGroup.kt | 2 +- .../kotlin/com/machiav3lli/fdroid/ui/pages/PrefsOtherPage.kt | 5 +++-- .../com/machiav3lli/fdroid/ui/pages/PrefsPersonalPage.kt | 5 +++-- .../com/machiav3lli/fdroid/ui/pages/PrefsUpdatesPage.kt | 5 +++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/prefs/PrefsBuilder.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/prefs/PrefsBuilder.kt index 199da5fa..57fd6eb4 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/prefs/PrefsBuilder.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/prefs/PrefsBuilder.kt @@ -8,7 +8,7 @@ import com.machiav3lli.fdroid.content.PrefsDependencies @Composable fun PrefsBuilder( prefKey: Preferences.Key<*>, - onDialogPref: (Any) -> Unit, + onDialogPref: (Preferences.Key<*>) -> Unit, enabledSetState: SnapshotStateList>, index: Int, size: Int diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/prefs/PrefsGroup.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/prefs/PrefsGroup.kt index fdd3575d..cb259df3 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/prefs/PrefsGroup.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/prefs/PrefsGroup.kt @@ -46,7 +46,7 @@ fun PreferenceGroup( modifier: Modifier = Modifier, heading: String? = null, keys: List>, - onPrefDialog: (Any) -> Unit, + onPrefDialog: (Preferences.Key<*>) -> Unit, ) { val size = keys.size val enabledList = remember() { diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsOtherPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsOtherPage.kt index 5af1ef8c..a85e4e02 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsOtherPage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsOtherPage.kt @@ -25,8 +25,8 @@ import com.machiav3lli.fdroid.ui.dialog.BaseDialog fun PrefsOtherPage() { val context = LocalContext.current val openDialog = remember { mutableStateOf(false) } - var dialogPref by remember { mutableStateOf(null) } - val onPrefDialog = { pref: Any -> + var dialogPref by remember { mutableStateOf?>(null) } + val onPrefDialog = { pref: Preferences.Key<*> -> dialogPref = pref openDialog.value = true } @@ -67,6 +67,7 @@ fun PrefsOtherPage() { BaseDialog(openDialogCustom = openDialog) { when (dialogPref) { // TODO + else -> {} } } } diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsPersonalPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsPersonalPage.kt index 304cdb37..9829ba88 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsPersonalPage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsPersonalPage.kt @@ -25,8 +25,8 @@ import com.machiav3lli.fdroid.ui.dialog.BaseDialog fun PrefsPersonalPage() { val context = LocalContext.current val openDialog = remember { mutableStateOf(false) } - var dialogPref by remember { mutableStateOf(null) } - val onPrefDialog = { pref: Any -> + var dialogPref by remember { mutableStateOf?>(null) } + val onPrefDialog = { pref: Preferences.Key<*> -> dialogPref = pref openDialog.value = true } @@ -73,6 +73,7 @@ fun PrefsPersonalPage() { BaseDialog(openDialogCustom = openDialog) { when (dialogPref) { // TODO + else -> {} } } } diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsUpdatesPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsUpdatesPage.kt index bd2d5769..8383808c 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsUpdatesPage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsUpdatesPage.kt @@ -25,8 +25,8 @@ import com.machiav3lli.fdroid.ui.dialog.BaseDialog fun PrefsUpdatesPage() { val context = LocalContext.current val openDialog = remember { mutableStateOf(false) } - var dialogPref by remember { mutableStateOf(null) } - val onPrefDialog = { pref: Any -> + var dialogPref by remember { mutableStateOf?>(null) } + val onPrefDialog = { pref: Preferences.Key<*> -> dialogPref = pref openDialog.value = true } @@ -82,6 +82,7 @@ fun PrefsUpdatesPage() { BaseDialog(openDialogCustom = openDialog) { when (dialogPref) { // TODO + else -> {} } } }