Refactor for refreshing info dialog

w2sv · w2sv · commit d4a0043882c3 · 2023-03-22T15:09:44.000+01:00
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/ConfigurationDialog.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/ConfigurationDialog.kt
@@ -31,19 +31,18 @@ import com.w2sv.wifiwidget.ui.shared.diagonalGradient
 @Composable
 private fun WidgetConfigurationDialogPrev() {
     WifiWidgetTheme {
-        WidgetConfigurationDialog {}
+        WidgetConfigurationDialog(setInfoDialogPropertyIndex = {}, showRefreshingInfoDialog = {})
     }
 }
 
 @Composable
 fun WidgetConfigurationDialog(
     modifier: Modifier = Modifier,
     viewModel: HomeActivity.ViewModel = viewModel(),
-    setInfoDialogPropertyIndex: (Int) -> Unit
+    setInfoDialogPropertyIndex: (Int) -> Unit,
+    showRefreshingInfoDialog: () -> Unit
 ) {
-    Dialog(onDismissRequest = {
-        viewModel.onDismissWidgetConfigurationDialog()
-    }) {
+    Dialog(onDismissRequest = { viewModel.onDismissWidgetConfigurationDialog() }) {
         ElevatedCard(
             modifier = modifier,
             shape = RoundedCornerShape(12.dp),
@@ -77,7 +76,8 @@ fun WidgetConfigurationDialog(
                     modifier = Modifier
                         .fillMaxWidth()
                         .heightIn(260.dp, 420.dp),
-                    setInfoDialogPropertyIndex = setInfoDialogPropertyIndex
+                    setInfoDialogPropertyIndex = setInfoDialogPropertyIndex,
+                    showRefreshingInfoDialog = showRefreshingInfoDialog
                 )
                 StatefulButtonRow(modifier = Modifier.fillMaxWidth())
             }
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/InflationButton.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/InflationButton.kt
@@ -15,6 +15,7 @@ import androidx.compose.ui.Modifier
 import androidx.lifecycle.viewmodel.compose.viewModel
 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(
@@ -25,16 +26,22 @@ fun StatefulWidgetConfigurationDialogButton(
         viewModel.showWidgetConfigurationDialog.value = true
     }
 
+    val inflateDialog by viewModel.showWidgetConfigurationDialog.collectAsState()
+
     var infoDialogPropertyIndex by rememberSaveable {
         mutableStateOf<Int?>(null)
     }
-
-    val inflateDialog by viewModel.showWidgetConfigurationDialog.collectAsState()
+    val (showRefreshingInfoDialog, setShowRefreshingInfoDialog) = rememberSaveable {
+        mutableStateOf(false)
+    }
 
     if (inflateDialog) {
         WidgetConfigurationDialog(
             setInfoDialogPropertyIndex = {
                 infoDialogPropertyIndex = it
+            },
+            showRefreshingInfoDialog = {
+                setShowRefreshingInfoDialog(true)
             }
         )
 
@@ -43,6 +50,11 @@ fun StatefulWidgetConfigurationDialogButton(
                 infoDialogPropertyIndex = null
             }
         }
+        if (showRefreshingInfoDialog) {
+            InfoDialog(title = "Data Refreshing", text = "BlubBlub") {
+                setShowRefreshingInfoDialog(false)
+            }
+        }
     }
 }
 
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/content/ContentColumn.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/content/ContentColumn.kt
@@ -40,15 +40,16 @@ import com.w2sv.wifiwidget.ui.shared.WifiWidgetTheme
 @Composable
 private fun Prev() {
     WifiWidgetTheme {
-        StatefulContentColumn {}
+        StatefulContentColumn(setInfoDialogPropertyIndex = {}, showRefreshingInfoDialog = {})
     }
 }
 
 @Composable
 fun StatefulContentColumn(
     modifier: Modifier = Modifier,
     viewModel: HomeActivity.ViewModel = androidx.lifecycle.viewmodel.compose.viewModel(),
-    setInfoDialogPropertyIndex: (Int) -> Unit
+    setInfoDialogPropertyIndex: (Int) -> Unit,
+    showRefreshingInfoDialog: () -> Unit
 ) {
     val scrollState = rememberScrollState()
 
@@ -102,7 +103,8 @@ fun StatefulContentColumn(
         },
         onInfoButtonClick = {
             setInfoDialogPropertyIndex(it)
-        }
+        },
+        showRefreshingInfoDialog = showRefreshingInfoDialog
     )
 }
 
@@ -116,7 +118,8 @@ internal fun ContentColumn(
     onOpacityChanged: (Float) -> Unit,
     propertyChecked: (String) -> Boolean,
     onCheckedChange: (String, Boolean) -> Unit,
-    onInfoButtonClick: (Int) -> Unit
+    onInfoButtonClick: (Int) -> Unit,
+    showRefreshingInfoDialog: () -> Unit,
 ) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
@@ -162,7 +165,10 @@ internal fun ContentColumn(
             iconRes = com.w2sv.widget.R.drawable.ic_refresh_24,
             modifier = defaultSectionHeaderModifier
         )
-        RefreshingSection(checkablePropertiesColumnModifier) {
+        RefreshingSection(
+            checkablePropertiesColumnModifier,
+            showInfoDialog = showRefreshingInfoDialog
+        ) {
             with(scrollState) {
                 animateScrollTo(maxValue)
             }
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/content/PropertyInfoDialog.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/content/PropertyInfoDialog.kt
@@ -1,25 +1,16 @@
 package com.w2sv.wifiwidget.ui.home.configurationdialog.content
 
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.sizeIn
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.AlertDialog
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.w2sv.androidutils.extensions.getNestedStringArray
 import com.w2sv.wifiwidget.R
 import com.w2sv.wifiwidget.extensions.openUrlWithActivityNotFoundHandling
 import com.w2sv.wifiwidget.ui.shared.DialogButton
+import com.w2sv.wifiwidget.ui.shared.InfoDialog
 import com.w2sv.wifiwidget.ui.shared.JostText
 import com.w2sv.wifiwidget.ui.shared.WifiWidgetTheme
 
@@ -28,11 +19,8 @@ import com.w2sv.wifiwidget.ui.shared.WifiWidgetTheme
 private fun Prev() {
     WifiWidgetTheme {
         PropertyInfoDialog(
-            Modifier,
-            "SSID",
-            "Service Set Identifier. Your network's name.",
-            {},
-            {}
+            1,
+            onDismissRequest = {}
         )
     }
 }
@@ -46,65 +34,26 @@ internal fun PropertyInfoDialog(
     val context = LocalContext.current
 
     with(context.resources.getNestedStringArray(R.array.wifi_property_data_arrays, propertyIndex)) {
-        PropertyInfoDialog(
+        InfoDialog(
             modifier = modifier,
             title = get(0),
             text = get(1),
-            learnMoreButtonOnClickListener = get(2).let {
+            learnMoreButton = get(2).let {
                 if (it.isNotEmpty()) {
                     {
-                        context.openUrlWithActivityNotFoundHandling(it)
-                        onDismissRequest()
+                        DialogButton(
+                            onClick = {
+                                context.openUrlWithActivityNotFoundHandling(it)
+                                onDismissRequest()
+                            },
+                            modifier = Modifier.padding(top = 20.dp, bottom = 12.dp)
+                        ) {
+                            JostText(text = "Learn more")
+                        }
                     }
                 } else null
             },
             onDismissRequest = onDismissRequest
         )
     }
-}
-
-@Composable
-private fun PropertyInfoDialog(
-    modifier: Modifier = Modifier,
-    title: String,
-    text: String,
-    learnMoreButtonOnClickListener: (() -> Unit)?,
-    onDismissRequest: () -> Unit
-) {
-    AlertDialog(
-        modifier = modifier,
-        onDismissRequest = onDismissRequest,
-        confirmButton = {
-            DialogButton(onClick = onDismissRequest) {
-                JostText(text = stringResource(R.string.close))
-            }
-        },
-        title = {
-            JostText(
-                text = title,
-                modifier = Modifier.fillMaxWidth(),
-                textAlign = TextAlign.Center
-            )
-        },
-        text = {
-            Column(
-                Modifier
-                    .sizeIn(maxHeight = 520.dp)
-                    .fillMaxWidth()
-                    .verticalScroll(rememberScrollState()),
-                Arrangement.Center,
-                Alignment.CenterHorizontally
-            ) {
-                JostText(text = text, textAlign = TextAlign.Center)
-                learnMoreButtonOnClickListener?.let {
-                    DialogButton(
-                        onClick = it,
-                        modifier = Modifier.padding(top = 20.dp, bottom = 12.dp)
-                    ) {
-                        JostText(text = "Learn more")
-                    }
-                }
-            }
-        }
-    )
 }
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/content/PropertySelection.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/content/PropertySelection.kt
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material3.Checkbox
-import androidx.compose.material3.CheckboxDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -17,6 +16,7 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.unit.sp
 import com.w2sv.wifiwidget.R
+import com.w2sv.wifiwidget.ui.shared.InfoIconButton
 import com.w2sv.wifiwidget.ui.shared.JostText
 
 @Composable
@@ -59,23 +59,10 @@ private fun PropertyRow(
         )
         Checkbox(
             checked = propertyChecked(property),
-            onCheckedChange = { onCheckedChange(property, it) },
-            colors = CheckboxDefaults.colors(
-                checkedColor = MaterialTheme.colorScheme.primary,
-                uncheckedColor = MaterialTheme.colorScheme.onSurfaceVariant
-            )
+            onCheckedChange = { onCheckedChange(property, it) }
         )
-        IconButton(onClick = {
+        InfoIconButton {
             onInfoButtonClick(propertyIndex)
-        }) {
-            Icon(
-                imageVector = Icons.Outlined.Info,
-                contentDescription = "Click to toggle the property info dialog",
-                modifier = Modifier.size(
-                    dimensionResource(id = R.dimen.size_icon)
-                ),
-                tint = MaterialTheme.colorScheme.onSurfaceVariant
-            )
         }
     }
 }
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/content/Refreshing.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/ui/home/configurationdialog/content/Refreshing.kt
@@ -20,13 +20,15 @@ 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()
@@ -35,7 +37,9 @@ internal fun RefreshingSection(
         RefreshingParameterRow(
             label = R.string.refresh_periodically,
             parameterName = "refreshPeriodically",
-            viewModel = viewModel
+            infoIconButton = {
+                InfoIconButton(showInfoDialog)
+            }
         )
         AnimatedVisibility(
             visible = viewModel.widgetRefreshingParametersState.getValue("refreshPeriodically"),
@@ -44,7 +48,6 @@ internal fun RefreshingSection(
             RefreshingParameterRow(
                 label = R.string.refresh_on_low_battery,
                 parameterName = "refreshOnBatteryLow",
-                viewModel = viewModel,
                 modifier = Modifier.padding(start = 12.dp),
                 fontSize = 14.sp
             )
@@ -56,9 +59,10 @@ internal fun RefreshingSection(
 private fun RefreshingParameterRow(
     @StringRes label: Int,
     parameterName: String,
-    viewModel: HomeActivity.ViewModel,
     modifier: Modifier = Modifier,
-    fontSize: TextUnit = TextUnit.Unspecified
+    viewModel: HomeActivity.ViewModel = androidx.lifecycle.viewmodel.compose.viewModel(),
+    fontSize: TextUnit = TextUnit.Unspecified,
+    infoIconButton: (@Composable () -> Unit)? = null
 ) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
@@ -74,5 +78,6 @@ private fun RefreshingParameterRow(
                 viewModel.widgetRefreshingParametersState[parameterName] = it
             }
         )
+        infoIconButton?.invoke()
     }
 }
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/ui/shared/InfoDialog.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/ui/shared/InfoDialog.kt
diff --git a/app/src/main/kotlin/com/w2sv/wifiwidget/ui/shared/InfoIconButton.kt b/app/src/main/kotlin/com/w2sv/wifiwidget/ui/shared/InfoIconButton.kt

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import androidx.compose.ui.Modifier`
`15`	`15`	`import androidx.lifecycle.viewmodel.compose.viewModel`
`16`	`16`	`import com.w2sv.wifiwidget.activities.HomeActivity`
`17`	`17`	`import com.w2sv.wifiwidget.ui.home.configurationdialog.content.PropertyInfoDialog`
	`18`	`+import com.w2sv.wifiwidget.ui.shared.InfoDialog`
`18`	`19`
`19`	`20`	`@Composable`
`20`	`21`	`fun StatefulWidgetConfigurationDialogButton(`
`@@ -25,16 +26,22 @@ fun StatefulWidgetConfigurationDialogButton(`
`25`	`26`	`viewModel.showWidgetConfigurationDialog.value = true`
`26`	`27`	`}`
`27`	`28`
	`29`	`+ val inflateDialog by viewModel.showWidgetConfigurationDialog.collectAsState()`
	`30`	`+`
`28`	`31`	`var infoDialogPropertyIndex by rememberSaveable {`
`29`	`32`	`mutableStateOf<Int?>(null)`
`30`	`33`	`}`
`31`		`-`
`32`		`- val inflateDialog by viewModel.showWidgetConfigurationDialog.collectAsState()`
	`34`	`+ val (showRefreshingInfoDialog, setShowRefreshingInfoDialog) = rememberSaveable {`
	`35`	`+ mutableStateOf(false)`
	`36`	`+ }`
`33`	`37`
`34`	`38`	`if (inflateDialog) {`
`35`	`39`	`WidgetConfigurationDialog(`
`36`	`40`	`setInfoDialogPropertyIndex = {`
`37`	`41`	`infoDialogPropertyIndex = it`
	`42`	`+ },`
	`43`	`+ showRefreshingInfoDialog = {`
	`44`	`+ setShowRefreshingInfoDialog(true)`
`38`	`45`	`}`
`39`	`46`	`)`
`40`	`47`
`@@ -43,6 +50,11 @@ fun StatefulWidgetConfigurationDialogButton(`
`43`	`50`	`infoDialogPropertyIndex = null`
`44`	`51`	`}`
`45`	`52`	`}`
	`53`	`+ if (showRefreshingInfoDialog) {`
	`54`	`+ InfoDialog(title = "Data Refreshing", text = "BlubBlub") {`
	`55`	`+ setShowRefreshingInfoDialog(false)`
	`56`	`+ }`
	`57`	`+ }`
`46`	`58`	`}`
`47`	`59`	`}`
`48`	`60`