Adds a progress dialog as provisioning may take a few seconds to comp…

…lete.

feature/softap/src/main/java/no/nordicsemi/android/wifi/provisioner/softap/view/SoftApConnectorDialog.kt

@@ -1,6 +1,5 @@
 package no.nordicsemi.android.wifi.provisioner.softap.view
 
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -10,7 +9,6 @@ import androidx.compose.material.icons.outlined.Visibility
 import androidx.compose.material.icons.outlined.VisibilityOff
 import androidx.compose.material.icons.outlined.Wifi
 import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -22,7 +20,6 @@ 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.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.PasswordVisualTransformation
@@ -32,6 +29,7 @@ import androidx.compose.ui.unit.dp
 import no.nordicsemi.android.wifi.provisioner.feature.softap.R
 import no.nordicsemi.android.wifi.provisioner.softap.Open
 import no.nordicsemi.android.wifi.provisioner.softap.PassphraseConfiguration
+import no.nordicsemi.android.wifi.provisioner.ui.CircularProgressIndicatorContent
 
 
 @Composable
@@ -130,20 +128,4 @@ private fun SoftApConnectorContent(
             }
         )
     }
-}
-
-@Composable
-fun CircularProgressIndicatorContent(text: String) {
-    Column(
-        modifier = Modifier.fillMaxWidth(),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        CircularProgressIndicator()
-        Spacer(modifier = Modifier.size(16.dp))
-        Text(
-            text = text,
-            style = MaterialTheme.typography.bodyMedium
-        )
-    }
 }

feature/softap/src/main/java/no/nordicsemi/android/wifi/provisioner/softap/view/SoftApProvisioningDialog.kt

@@ -0,0 +1,40 @@
+package no.nordicsemi.android.wifi.provisioner.softap.view
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import no.nordicsemi.android.wifi.provisioner.feature.softap.R
+import no.nordicsemi.android.wifi.provisioner.ui.CircularProgressIndicatorContent
+
+
+@Composable
+internal fun SoftApProvisioningDialog(dismiss: () -> Unit) {
+
+    AlertDialog(
+        onDismissRequest = dismiss,
+        icon = { Icon(imageVector = Icons.Outlined.Settings, contentDescription = null) },
+        title = {
+            Text(
+                text = stringResource(id = R.string.provisioning),
+                modifier = Modifier.fillMaxWidth(),
+                textAlign = TextAlign.Center,
+                style = MaterialTheme.typography.titleLarge
+            )
+        },
+        text = {
+            CircularProgressIndicatorContent(
+                text = stringResource(id = R.string.provisioning_device_rationale)
+            )
+        },
+        dismissButton = {},
+        confirmButton = {}
+    )
+}

feature/softap/src/main/java/no/nordicsemi/android/wifi/provisioner/softap/view/SoftApProvisioningScreen.kt

@@ -75,7 +75,7 @@ fun SoftApProvisioningScreen() {
     val viewModel = hiltViewModel<SoftApProvisioningViewModel>()
 
     val state by viewModel.state.collectAsStateWithLifecycle()
-    val onEvent: (ProvisioningViewEvent) -> Unit = { viewModel.onEvent(it) }
+    val onEvent: (ProvisioningViewEvent) -> Unit = viewModel::onEvent
     Column {
         NordicAppBar(
             text = stringResource(id = R.string.label_wifi_provisioner),
@@ -113,6 +113,12 @@ fun SoftApProvisioningScreen() {
             onEvent(OnHidePasswordDialog)
         }
     }
+
+    if(state.showProvisioningDialog){
+        SoftApProvisioningDialog{
+            onEvent(OnFinishedEvent)
+        }
+    }
 }
 
 @Composable

feature/softap/src/main/java/no/nordicsemi/android/wifi/provisioner/softap/view/entity/SoftApViewEntity.kt

@@ -19,6 +19,7 @@ data class SoftApViewEntity(
     override val isConnected: Boolean = true,
     val isAuthorized: Boolean = false,
     val showSoftApDialog: Boolean = false,
+    val showProvisioningDialog: Boolean = false,
     val isNetworkServiceDiscoveryCompleted: Boolean? = null
 ) : ViewEntity {
 

feature/softap/src/main/java/no/nordicsemi/android/wifi/provisioner/softap/viewmodel/SoftApProvisioningViewModel.kt

@@ -97,7 +97,10 @@ class SoftApProvisioningViewModel @Inject constructor(
     @RequiresApi(Build.VERSION_CODES.Q)
     fun onEvent(event: ProvisioningViewEvent) {
         when (event) {
-            OnFinishedEvent -> finish()
+            OnFinishedEvent -> {
+                _state.value = _state.value.copy(showProvisioningDialog = false)
+                finish()
+            }
             is OnPasswordSelectedEvent -> onPasswordSelected(event.password)
             OnSelectDeviceClickEvent -> provisionNextDevice()
             is OnSoftApConnectEvent -> {
@@ -180,14 +183,21 @@ class SoftApProvisioningViewModel @Inject constructor(
     }
 
     private fun provision() {
+        _state.value = _state.value.copy(showProvisioningDialog = true)
         val state = _state.value
         val network = state.network ?: return
         val handler = CoroutineExceptionHandler { _, throwable ->
             // There is always chance that a socket timeout is thrown from the DK during
             // provisioning due to timing constraints. In such cases, we can ignore the response
             // and assume that the provisioning was successful.
             if (throwable is SocketTimeoutException) {
-                handleResponse(state)
+                _state.value = state.copy(
+                    device = softApManager.softAp,
+                    provisioningStatus = Resource.createSuccess(
+                        data = WifiConnectionStateDomain.CONNECTED,
+                    ),
+                    showProvisioningDialog = false
+                )
             }
         }
         viewModelScope.launch(Dispatchers.IO + handler) {
@@ -219,8 +229,9 @@ class SoftApProvisioningViewModel @Inject constructor(
                 _state.value = state.copy(
                     device = softApManager.softAp,
                     provisioningStatus = Resource.createSuccess(
-                        data = WifiConnectionStateDomain.CONNECTED
-                    )
+                        data = WifiConnectionStateDomain.CONNECTED,
+                    ),
+                    showProvisioningDialog = false
                 )
             }
         }

feature/softap/src/main/res/values/strings.xml

@@ -27,5 +27,8 @@
     <string name="section_device">Device status</string>
     <string name="section_provisioning">Provisioning data</string>
     <string name="section_status">Upload status</string>
+    <string name="provisioning">Provisioning</string>
+    <string name="provisioning_device_rationale">Please wait while the device is being provisioned.
+        This may take around 5-10 seconds to complete.</string>
 
 </resources>

feature/ui/src/main/java/no/nordicsemi/android/wifi/provisioner/ui/CircularProgressIndicatorContent.kt

@@ -0,0 +1,30 @@
+package no.nordicsemi.android.wifi.provisioner.ui
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun CircularProgressIndicatorContent(text: String) {
+    Column(
+        modifier = Modifier.fillMaxWidth(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        CircularProgressIndicator()
+        Spacer(modifier = Modifier.size(16.dp))
+        Text(
+            text = text,
+            style = MaterialTheme.typography.bodyMedium
+        )
+    }
+}