1.1.1

Author: w2sv

app/build.gradle

@@ -16,8 +16,8 @@ android {
         minSdk libs.versions.minSdk.get().toInteger()
         targetSdk libs.versions.compileSdk.get().toInteger()
 
-        versionCode 4
-        versionName '1.1.0'
+        versionCode 5
+        versionName '1.1.1'
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
@@ -69,6 +69,7 @@ android {
 dependencies {
     implementation libs.typedpreferences
     implementation libs.androidutils
+    implementation libs.permissionhandler
 
     // androidx
     implementation libs.androidx.core

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

@@ -60,6 +60,8 @@ class HomeActivity : AppActivity() {
             savedStateHandle.contains(EXTRA_OPEN_PROPERTIES_CONFIGURATION_DIALOG_ON_START)
                 .also { i { "openPropertiesConfigurationDialog: $it" } }
 
+        val ssidKey: String = widgetProperties::SSID.name
+
         /**
          * Widget Creation Listening
          */
@@ -84,6 +86,13 @@ class HomeActivity : AppActivity() {
             widgetProperties.getMutableStateMap()
         }
 
+        fun setSSIDState(value: Boolean, updatePropertyStatesDissimilar: Boolean = true) {
+            when (updatePropertyStatesDissimilar) {
+                true -> onChangePropertyState(ssidKey, value)
+                false -> widgetPropertyStates[ssidKey] = value
+            }
+        }
+
         fun syncWidgetPropertyStates() {
             widgetProperties.putAll(widgetPropertyStates)
             _propertyStatesDissimilar.value = false
@@ -187,15 +196,7 @@ class HomeActivity : AppActivity() {
     )
 
     val lapRequestLauncher by lazy {
-        LocationAccessPermissionHandler(this) { permissionGrantedMap ->
-            if (permissionGrantedMap.containsValue(true)) {
-                with(viewModel) {
-                    widgetPropertyStates[widgetProperties::SSID.name] = true
-                    syncWidgetPropertyStates()
-                }
-            }
-            requestWidgetPin()
-        }
+        LocationAccessPermissionHandler(this)
     }
 }
 

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

@@ -1,25 +1,24 @@
 package com.w2sv.wifiwidget.activities
 
 import android.Manifest
+import android.widget.Toast
 import androidx.activity.ComponentActivity
-import androidx.activity.result.contract.ActivityResultContracts
-import com.w2sv.androidutils.ActivityCallContractHandler
+import com.w2sv.androidutils.extensions.showToast
+import com.w2sv.permissionhandler.AssociatedPermissionsHandler
 
-class LocationAccessPermissionHandler(
-    activity: ComponentActivity,
-    override val resultCallback: (Map<String, Boolean>) -> Unit
-) :
-    ActivityCallContractHandler.Impl<Array<String>, Map<String, Boolean>>(
+class LocationAccessPermissionHandler(activity: ComponentActivity) :
+    AssociatedPermissionsHandler(
         activity,
-        ActivityResultContracts.RequestMultiplePermissions()
+        arrayOf(
+            Manifest.permission.ACCESS_COARSE_LOCATION,
+            Manifest.permission.ACCESS_FINE_LOCATION
+        ),
+        "LocationAccessPermissionHandler"
     ) {
-
-    fun launch() {
-        resultLauncher.launch(
-            arrayOf(
-                Manifest.permission.ACCESS_COARSE_LOCATION,
-                Manifest.permission.ACCESS_FINE_LOCATION
-            )
+    override fun onPermissionRationalSuppressed() {
+        activity.showToast(
+            "Go to app settings and grant location access permission",
+            Toast.LENGTH_LONG
         )
     }
 }

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

@@ -18,8 +18,10 @@ import com.w2sv.wifiwidget.ui.WifiWidgetTheme
 
 @Composable
 fun LocationAccessPermissionDialog(
+    dismissButtonText: String,
     onConfirmButtonPressed: () -> Unit,
     onDismissButtonPressed: () -> Unit,
+    onAnyButtonPressed: () -> Unit,
     onCloseDialog: () -> Unit
 ) {
     AlertDialog(
@@ -44,14 +46,16 @@ fun LocationAccessPermissionDialog(
         confirmButton = {
             DialogButton({
                 onConfirmButtonPressed()
+                onAnyButtonPressed()
                 onCloseDialog()
             }, modifier = Modifier.fillMaxWidth()) { JostText(text = "Go ahead") }
         },
         dismissButton = {
             DialogButton({
                 onDismissButtonPressed()
+                onAnyButtonPressed()
                 onCloseDialog()
-            }, modifier = Modifier.fillMaxWidth()) { JostText(text = "Proceed without SSID") }
+            }, modifier = Modifier.fillMaxWidth()) { JostText(text = dismissButtonText) }
         },
         onDismissRequest = onCloseDialog
     )
@@ -61,9 +65,6 @@ fun LocationAccessPermissionDialog(
 @Composable
 private fun LocationAccessPermissionDialogPrev() {
     WifiWidgetTheme {
-        LocationAccessPermissionDialog(
-            onConfirmButtonPressed = { /*TODO*/ },
-            onDismissButtonPressed = { /*TODO*/ }) {
-        }
+        LocationAccessPermissionDialog("Proceed without SSID", {}, {}, {}, {})
     }
 }

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

@@ -33,12 +33,24 @@ fun PinWidgetButton() {
     if (triggerOnClickListener) {
         when (viewModel.lapDialogAnswered) {
             false -> LocationAccessPermissionDialog(
+                "Proceed without SSID",
                 onConfirmButtonPressed = {
-                    homeActivity.lapRequestLauncher.launch()
-                    viewModel.onLapDialogAnswered()
+                    homeActivity.lapRequestLauncher.requestPermissionIfRequired(
+                        onGranted = {
+                            with(viewModel) {
+                                setSSIDState(true, updatePropertyStatesDissimilar = false)
+                                syncWidgetPropertyStates()
+                            }
+                        },
+                        onRequestDismissed = {
+                            homeActivity.requestWidgetPin()
+                        }
+                    )
                 },
                 onDismissButtonPressed = {
                     homeActivity.requestWidgetPin()
+                },
+                onAnyButtonPressed = {
                     viewModel.onLapDialogAnswered()
                 },
                 onCloseDialog = {

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

@@ -8,11 +8,8 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
@@ -28,6 +25,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.w2sv.androidutils.extensions.requireCastActivity
 import com.w2sv.androidutils.extensions.showToast
 import com.w2sv.wifiwidget.R
 import com.w2sv.wifiwidget.activities.HomeActivity
@@ -43,6 +41,7 @@ fun PropertySelectionDialog(
 ) {
     val viewModel: HomeActivity.ViewModel = viewModel()
     val context = LocalContext.current
+    val homeActivity = context.requireCastActivity<HomeActivity>()
 
     var infoDialogPropertyIndex by rememberSaveable {
         mutableStateOf<Int?>(null)
@@ -54,6 +53,26 @@ fun PropertySelectionDialog(
         }
     }
 
+    var showLAPDialog by rememberSaveable {
+        mutableStateOf(false)
+    }
+
+    fun launchLAPRequestIfRequired() {
+        homeActivity.lapRequestLauncher.requestPermissionIfRequired(
+            onDenied = { viewModel.setSSIDState(false) },
+            onGranted = { viewModel.setSSIDState(true) }
+        )
+    }
+
+    if (showLAPDialog)
+        LocationAccessPermissionDialog(
+            "Never mind",
+            onConfirmButtonPressed = { launchLAPRequestIfRequired() },
+            onDismissButtonPressed = { viewModel.setSSIDState(false) },
+            onAnyButtonPressed = { viewModel.onLapDialogAnswered() },
+            onCloseDialog = { showLAPDialog = false }
+        )
+
     StatelessPropertySelectionDialog(
         onCancel = onCancel,
         onConfirm = onConfirm,
@@ -64,7 +83,12 @@ fun PropertySelectionDialog(
                 viewModel.widgetPropertyStates.getValue(property)
             },
             onCheckedChange = { property, newValue ->
-                if (!viewModel.onChangePropertyState(property, newValue))
+                if (property == viewModel.ssidKey && newValue) {
+                    if (!viewModel.lapDialogAnswered)
+                        showLAPDialog = true
+                    else
+                        launchLAPRequestIfRequired()
+                } else if (!viewModel.onChangePropertyState(property, newValue))
                     context.showToast(context.getString(R.string.uncheck_all_properties_toast))
             },
             inflateInfoDialog = { propertyIndex ->
@@ -123,31 +147,6 @@ private fun StatelessPropertySelectionDialog(
     }
 }
 
-@Composable
-private fun ButtonRow(onCancel: () -> Unit, onConfirm: () -> Unit, confirmButtonEnabled: Boolean) {
-    Row(
-        modifier = Modifier
-            .padding(vertical = 24.dp)
-            .fillMaxWidth(),
-        horizontalArrangement = Arrangement.SpaceEvenly
-    ) {
-        DialogButton(onClick = onCancel) {
-            JostText(text = "Cancel")
-        }
-        DialogButton(onClick = onConfirm, enabled = confirmButtonEnabled) {
-            JostText(text = "Confirm")
-        }
-    }
-}
-
-@Preview
-@Composable
-private fun ButtonRowPrev() {
-    WifiWidgetTheme {
-        ButtonRow(onCancel = { /*TODO*/ }, onConfirm = { /*TODO*/ }, confirmButtonEnabled = true)
-    }
-}
-
 @Composable
 private fun ColumnScope.StatelessPropertyRows(
     propertyChecked: (String) -> Boolean,
@@ -204,4 +203,29 @@ private fun StatelessPropertyRowsPrev() {
             StatelessPropertyRows({ true }, { _, _ -> }, {})
         }
     }
+}
+
+@Composable
+private fun ButtonRow(onCancel: () -> Unit, onConfirm: () -> Unit, confirmButtonEnabled: Boolean) {
+    Row(
+        modifier = Modifier
+            .padding(vertical = 24.dp)
+            .fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceEvenly
+    ) {
+        DialogButton(onClick = onCancel) {
+            JostText(text = "Cancel")
+        }
+        DialogButton(onClick = onConfirm, enabled = confirmButtonEnabled) {
+            JostText(text = "Confirm")
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun ButtonRowPrev() {
+    WifiWidgetTheme {
+        ButtonRow(onCancel = { /*TODO*/ }, onConfirm = { /*TODO*/ }, confirmButtonEnabled = true)
+    }
 }

app/src/main/res/values/string_arrays.xml

@@ -25,7 +25,7 @@
         <item>https://en.wikipedia.org/wiki/List_of_WLAN_channels</item>
     </string-array>
     <string-array name="gateway">
-        <item>@string/frequency</item>
+        <item>@string/gateway</item>
         <item>A Gateway is a device uniting the functionality of a modem, i.e., communicating with your ISP (Internet Service Provider), and a router, i.e., translating the data received by the modem and distributing it as WiFi signal to the client devices being present in the network.</item>
         <item>https://en.wikipedia.org/wiki/Gateway_(telecommunications)#Network_gateway</item>
     </string-array>

app/src/main/res/values/strings.xml

@@ -15,7 +15,7 @@
     <string name="no_wifi_connection">No WiFi Connection</string>
     <string name="wifi_disabled">WiFi Disabled</string>
     <string name="updated_widget_properties">Updated Widget Properties</string>
-    <string name="widget_properties_will_apply">Updated Widget Properties will apply</string>
+    <string name="widget_properties_will_apply">Updated Widget Properties, yet no Widget in use</string>
     <string name="pinned_widget">Pinned Widget</string>
     <string name="lap_dialog_text">If you want your device\'s SSID to be displayed amongst the WiFi properties, you\'ll have to grant location access permission.</string>
     <string name="configure_widget">Configure widget</string>

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ compileSdk = '33'
 
 compose-compiler = '1.4.0'
 compose-tooling = '1.3.3'
-gradle-plugin = '7.4.0'
+gradle-plugin = '7.4.1'
 kotlin = '1.8.0'
 hilt = '2.44.2'
 junit = '5.9.2'
@@ -13,6 +13,7 @@ lifecycle = '2.6.0-alpha05'
 [libraries]
 typedpreferences = 'com.github.w2sv:TypedPreferences:1.0.0'
 androidutils = 'com.github.w2sv:AndroidUtils:0.0.15-rc3'
+permissionhandler = 'com.github.w2sv:PermissionHandler:1.0.0-rc2'
 
 # androidx
 androidx-appcompat = 'androidx.appcompat:appcompat:1.7.0-alpha01'