Move stuff to ViewModel

Author: w2sv

app/src/main/kotlin/com/w2sv/wifiwidget/activities/HomeActivity.kt

@@ -136,6 +136,8 @@ class HomeActivity : LifecycleObserversRegisteringActivity() {
 
         val showWidgetConfigurationDialog = MutableStateFlow(false)
 
+        val propertyInfoDialogIndex: MutableStateFlow<Int?> = MutableStateFlow(null)
+
         val widgetPropertyStateMap = NonAppliedSnapshotStateMap(
             { widgetProperties },
             { widgetProperties.putAll(it) }

app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/ConfigurationDialog.kt

@@ -31,16 +31,14 @@ import com.w2sv.wifiwidget.ui.shared.diagonalGradient
 @Composable
 private fun WidgetConfigurationDialogPrev() {
     WifiWidgetTheme {
-        WidgetConfigurationDialog(setInfoDialogPropertyIndex = {}, showRefreshingInfoDialog = {})
+        WidgetConfigurationDialog()
     }
 }
 
 @Composable
 fun WidgetConfigurationDialog(
     modifier: Modifier = Modifier,
-    viewModel: HomeActivity.ViewModel = viewModel(),
-    setInfoDialogPropertyIndex: (Int) -> Unit,
-    showRefreshingInfoDialog: () -> Unit
+    viewModel: HomeActivity.ViewModel = viewModel()
 ) {
     Dialog(onDismissRequest = { viewModel.onDismissWidgetConfigurationDialog() }) {
         ElevatedCard(
@@ -75,9 +73,7 @@ fun WidgetConfigurationDialog(
                 StatefulContentColumn(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .heightIn(260.dp, 420.dp),
-                    setInfoDialogPropertyIndex = setInfoDialogPropertyIndex,
-                    showRefreshingInfoDialog = showRefreshingInfoDialog
+                        .heightIn(260.dp, 420.dp)
                 )
                 StatefulButtonRow(modifier = Modifier.fillMaxWidth())
             }

app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/InflationButton.kt

@@ -8,14 +8,11 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.w2sv.androidutils.extensions.reset
 import com.w2sv.wifiwidget.activities.HomeActivity
 import com.w2sv.wifiwidget.ui.home.configurationdialog.content.PropertyInfoDialog
-import com.w2sv.wifiwidget.ui.shared.InfoDialog
 
 @Composable
 fun StatefulWidgetConfigurationDialogButton(
@@ -27,32 +24,14 @@ fun StatefulWidgetConfigurationDialogButton(
     }
 
     val inflateDialog by viewModel.showWidgetConfigurationDialog.collectAsState()
-
-    var infoDialogPropertyIndex by rememberSaveable {
-        mutableStateOf<Int?>(null)
-    }
-    val (showRefreshingInfoDialog, setShowRefreshingInfoDialog) = rememberSaveable {
-        mutableStateOf(false)
-    }
+    val propertyInfoDialogIndex by viewModel.propertyInfoDialogIndex.collectAsState()
 
     if (inflateDialog) {
-        WidgetConfigurationDialog(
-            setInfoDialogPropertyIndex = {
-                infoDialogPropertyIndex = it
-            },
-            showRefreshingInfoDialog = {
-                setShowRefreshingInfoDialog(true)
-            }
-        )
+        WidgetConfigurationDialog()
 
-        infoDialogPropertyIndex?.let {
+        propertyInfoDialogIndex?.let {
             PropertyInfoDialog(it) {
-                infoDialogPropertyIndex = null
-            }
-        }
-        if (showRefreshingInfoDialog) {
-            InfoDialog(title = "Data Refreshing", text = "BlubBlub") {
-                setShowRefreshingInfoDialog(false)
+                viewModel.propertyInfoDialogIndex.reset()
             }
         }
     }

app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/content/ContentColumn.kt

@@ -40,16 +40,14 @@ import com.w2sv.wifiwidget.ui.shared.WifiWidgetTheme
 @Composable
 private fun Prev() {
     WifiWidgetTheme {
-        StatefulContentColumn(setInfoDialogPropertyIndex = {}, showRefreshingInfoDialog = {})
+        StatefulContentColumn()
     }
 }
 
 @Composable
 fun StatefulContentColumn(
     modifier: Modifier = Modifier,
-    viewModel: HomeActivity.ViewModel = androidx.lifecycle.viewmodel.compose.viewModel(),
-    setInfoDialogPropertyIndex: (Int) -> Unit,
-    showRefreshingInfoDialog: () -> Unit
+    viewModel: HomeActivity.ViewModel = androidx.lifecycle.viewmodel.compose.viewModel()
 ) {
     val scrollState = rememberScrollState()
 
@@ -102,9 +100,8 @@ fun StatefulContentColumn(
             }
         },
         onInfoButtonClick = {
-            setInfoDialogPropertyIndex(it)
-        },
-        showRefreshingInfoDialog = showRefreshingInfoDialog
+            viewModel.propertyInfoDialogIndex.value = it
+        }
     )
 }
 
@@ -118,8 +115,7 @@ internal fun ContentColumn(
     onOpacityChanged: (Float) -> Unit,
     propertyChecked: (String) -> Boolean,
     onCheckedChange: (String, Boolean) -> Unit,
-    onInfoButtonClick: (Int) -> Unit,
-    showRefreshingInfoDialog: () -> Unit,
+    onInfoButtonClick: (Int) -> Unit
 ) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
@@ -165,10 +161,7 @@ internal fun ContentColumn(
             iconRes = com.w2sv.widget.R.drawable.ic_refresh_24,
             modifier = defaultSectionHeaderModifier
         )
-        RefreshingSection(
-            checkablePropertiesColumnModifier,
-            showInfoDialog = showRefreshingInfoDialog
-        ) {
+        RefreshingSection(checkablePropertiesColumnModifier) {
             with(scrollState) {
                 animateScrollTo(maxValue)
             }

app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/content/Refreshing.kt

@@ -20,26 +20,21 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.w2sv.wifiwidget.R
 import com.w2sv.wifiwidget.activities.HomeActivity
-import com.w2sv.wifiwidget.ui.shared.InfoIconButton
 import com.w2sv.wifiwidget.ui.shared.JostText
 import kotlinx.coroutines.launch
 
 @Composable
 internal fun RefreshingSection(
     modifier: Modifier = Modifier,
     viewModel: HomeActivity.ViewModel = androidx.lifecycle.viewmodel.compose.viewModel(),
-    showInfoDialog: () -> Unit,
     scrollToContentColumnBottom: suspend () -> Unit
 ) {
     val scope = rememberCoroutineScope()
 
     Column(modifier = modifier, horizontalAlignment = Alignment.Start) {
         RefreshingParameterRow(
             label = R.string.refresh_periodically,
-            parameterName = "refreshPeriodically",
-            infoIconButton = {
-                InfoIconButton(showInfoDialog)
-            }
+            parameterName = "refreshPeriodically"
         )
         AnimatedVisibility(
             visible = viewModel.widgetRefreshingParametersState.getValue("refreshPeriodically"),
@@ -61,8 +56,7 @@ private fun RefreshingParameterRow(
     parameterName: String,
     modifier: Modifier = Modifier,
     viewModel: HomeActivity.ViewModel = androidx.lifecycle.viewmodel.compose.viewModel(),
-    fontSize: TextUnit = TextUnit.Unspecified,
-    infoIconButton: (@Composable () -> Unit)? = null
+    fontSize: TextUnit = TextUnit.Unspecified
 ) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
@@ -78,6 +72,5 @@ private fun RefreshingParameterRow(
                 viewModel.widgetRefreshingParametersState[parameterName] = it
             }
         )
-        infoIconButton?.invoke()
     }
 }