1.4.06

Author: w2sv

app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/components/widget/configurationdialog/WidgetConfigurationDialogContent.kt

@@ -17,6 +17,7 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.w2sv.domain.model.WidgetBottomRowElement
 import com.w2sv.domain.model.WidgetRefreshingParameter
+import com.w2sv.domain.model.WidgetWifiProperty
 import com.w2sv.wifiwidget.R
 import com.w2sv.wifiwidget.ui.components.IconHeader
 import com.w2sv.wifiwidget.ui.screens.home.components.locationaccesspermission.states.LocationAccessState
@@ -27,6 +28,7 @@ import com.w2sv.wifiwidget.ui.screens.home.components.widget.configurationdialog
 import com.w2sv.wifiwidget.ui.screens.home.components.widget.configurationdialog.model.UnconfirmedWidgetConfiguration
 import com.w2sv.wifiwidget.ui.utils.toColor
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toPersistentList
 
 private val verticalSectionHeaderPadding = 22.dp
@@ -78,6 +80,7 @@ fun WidgetConfigurationDialogContent(
                 locationAccessState = locationAccessState
             ),
             showInfoDialog = showPropertyInfoDialog,
+            propertyToSubTitleResId = widgetWifiPropertyToSubTitleResId
         )
 
         SectionHeader(
@@ -127,6 +130,12 @@ fun WidgetConfigurationDialogContent(
     }
 }
 
+private val widgetWifiPropertyToSubTitleResId = persistentMapOf(
+    WidgetWifiProperty.NonIP.LocationAccessRequiring.entries.first() to R.string.location_access_requiring,
+    WidgetWifiProperty.IP.entries.first() to R.string.ip_addresses,
+    WidgetWifiProperty.NonIP.Other.entries.first() to R.string.other
+)
+
 @Composable
 private fun SectionHeader(
     @DrawableRes iconRes: Int,

app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/components/widget/configurationdialog/components/PropertyCheckRow.kt

@@ -34,18 +34,20 @@ import com.w2sv.wifiwidget.ui.screens.home.components.widget.configurationdialog
 import com.w2sv.wifiwidget.ui.screens.home.components.widget.configurationdialog.model.PropertyCheckRowData
 import com.w2sv.wifiwidget.ui.utils.thenIf
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
 
 @Composable
 fun PropertyCheckRows(
     dataList: ImmutableList<PropertyCheckRowData<*>>,
     modifier: Modifier = Modifier,
+    propertyToSubTitleResId: ImmutableMap<*, Int>? = null,
     showInfoDialog: ((InfoDialogData) -> Unit)? = null
 ) {
     Column(modifier = modifier) {
         dataList
             .forEach { data ->
                 // Display PropertySubTypeHeader if applicable
-                propertyToSubTitleResId[data.property as? WidgetWifiProperty]?.let { resId ->
+                propertyToSubTitleResId?.get(data.property)?.let { resId ->
                     Text(
                         text = stringResource(id = resId),
                         color = MaterialTheme.colorScheme.secondary,
@@ -81,12 +83,6 @@ fun PropertyCheckRows(
     }
 }
 
-private val propertyToSubTitleResId = mapOf(
-    WidgetWifiProperty.NonIP.LocationAccessRequiring.entries.first() to R.string.location_access_requiring,
-    WidgetWifiProperty.IP.entries.first() to R.string.ip_addresses,
-    WidgetWifiProperty.NonIP.Other.entries.first() to R.string.other
-)
-
 @Composable
 private fun SubPropertyCheckRowColumn(
     dataList: ImmutableList<PropertyCheckRowData<*>>,

app/src/main/play/release-notes/en-US/production.txt

@@ -1,2 +1,3 @@
 - Performance improvements
-- Fixed a bug that would lead to all IP address versions of an address kind being displayed, regardless of the respectively selected ones
+- Hide bottom bar upon deselection of all comprised elements
+- Remove 'Buttons' category and display all buttons alongside with 'Last refresh time display' under the category 'Bottom Row' in the widget configuration dialog