Make wifi rescan automatic and show progress

Author: adriantache

app/src/main/java/com/adriantache/greatimagedownloader/domain/DownloadPhotosUseCaseImpl.kt

@@ -112,7 +112,7 @@ class DownloadPhotosUseCaseImpl(
         scanningTimeoutJob?.cancel()
 
         scanningTimeoutJob = scope.launch {
-            delay(20.seconds)
+            delay(30.seconds)
 
             connectToWifi(isSoftTimeout = true)
         }

app/src/main/java/com/adriantache/greatimagedownloader/ui/view/StartView.kt

@@ -25,6 +25,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
+import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
@@ -33,6 +34,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -46,7 +48,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.LifecycleResumeEffect
 import com.adriantache.greatimagedownloader.R
+import com.adriantache.greatimagedownloader.domain.utils.model.delay
 import com.adriantache.greatimagedownloader.ui.util.KeepScreenOn
+import kotlinx.coroutines.launch
 
 // TODO: rename this file and split it into a loading view and a start view
 // TODO: make some nice animations between the two states
@@ -146,6 +150,25 @@ fun StartView(
                 }
 
                 AnimatedVisibility(isSoftWifiTimeout) {
+                    var waitingProgress by remember { mutableIntStateOf(0) }
+
+                    LaunchedEffect(Unit) {
+                        val delayDurationMs = 5000
+
+                        launch {
+                            val delayInterval = delayDurationMs / 100
+
+                            while (true) {
+                                delay(delayInterval)
+                                waitingProgress = (++waitingProgress).coerceAtMost(100)
+                            }
+                        }
+
+                        delay(delayDurationMs) // Give people time to read the message.
+
+                        onSoftWifiTimeoutRetry()
+                    }
+
                     Column(
                         modifier = Modifier
                             .fillMaxWidth()
@@ -161,24 +184,13 @@ fun StartView(
                             color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
 
-                        Box(
+                        Spacer(modifier = Modifier.height(4.dp))
+
+                        LinearProgressIndicator(
                             modifier = Modifier.fillMaxWidth(),
-                            contentAlignment = Alignment.Center,
-                        ) {
-                            Button(
-                                onClick = onSoftWifiTimeoutRetry,
-                                colors = ButtonDefaults.filledTonalButtonColors(
-                                    containerColor = MaterialTheme.colorScheme.secondary,
-                                    contentColor = MaterialTheme.colorScheme.onSecondary,
-                                ),
-                            ) {
-                                Text(
-                                    text = stringResource(R.string.wifi_soft_timeout_retry),
-                                    style = MaterialTheme.typography.labelSmall,
-                                    color = MaterialTheme.colorScheme.onSecondary,
-                                )
-                            }
-                        }
+                            progress = { waitingProgress.toFloat() / 100 },
+                            drawStopIndicator = { Unit }
+                        )
                     }
                 }
 

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

@@ -8,7 +8,6 @@
     <string name="save">Save</string>
     <string name="wifi_is_not_enabled">WiFi is not enabled!</string>
     <string name="connecting_to_camera">Connecting to camera…</string>
-    <string name="wifi_soft_timeout">It seems that it\'s taking a long time to connect to the camera. Please check that the camera is turned on and that WiFi is enabled.</string>
-    <string name="wifi_soft_timeout_retry">Force rescan</string>
+    <string name="wifi_soft_timeout">It seems that it\'s taking a long time to connect to the camera. Please check that the camera is turned on and that WiFi is enabled. \n\nRescanning for WiFi networks…</string>
     <string name="wifi_hard_timeout">The system is limiting the amount of WiFi scans we can perform. The app will automatically retry the connection once possible.</string>
 </resources>