Update HomeScreen.kt

Author: Themrmba

android/app/src/main/java/com/therealaleph/mhrv/ui/HomeScreen.kt

@@ -26,7 +26,7 @@ import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.material.icons.filled.Stop
 import androidx.compose.material.icons.filled.HourglassBottom
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple.rememberRipple   // <-- added
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -66,7 +66,21 @@ import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeoutOrNull
 import org.json.JSONObject
 
-// ... (sealed classes remain unchanged) ...
+/**
+ * UI state returned by the Activity after the CA install flow finishes,
+ * so the screen can show a matching snackbar.
+ */
+sealed class CaInstallOutcome {
+    object Installed : CaInstallOutcome()
+    data class NotInstalled(val downloadPath: String?) : CaInstallOutcome()
+    data class Failed(val message: String) : CaInstallOutcome()
+}
+
+// probe result classification (used by parseProbeResult)
+sealed class ProbeState {
+    data class Ok(val latencyMs: Int) : ProbeState()
+    data class Err(val message: String) : ProbeState()
+}
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -90,7 +104,7 @@ fun HomeScreen(
 
     var showInstallDialog by rememberSaveable { mutableStateOf(false) }
 
-    // Auto update check (kept, but no UI button for it now)
+    // Auto update check
     var autoUpdateChecked by rememberSaveable { mutableStateOf(false) }
     LaunchedEffect(autoUpdateChecked) {
         if (autoUpdateChecked) return@LaunchedEffect
@@ -143,12 +157,6 @@ fun HomeScreen(
     }
 
     Scaffold(
-        topBar = {
-            TopAppBar(
-                title = { Text("Mooz VPN") },   // changed title
-                // actions removed (no language toggle, no update check button)
-            )
-        },
         snackbarHost = { SnackbarHost(snackbar) },
     ) { inner ->
         Column(
@@ -160,44 +168,6 @@ fun HomeScreen(
             verticalArrangement = Arrangement.Center,
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            // ========== REPLACED ConfigSharingBar ==========
-            // Only Import (from clipboard) and Scan QR remain
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceEvenly
-            ) {
-                // Import button: reads from clipboard and calls onImport
-                val clipboardManager = LocalClipboardManager.current
-                Button(
-                    onClick = {
-                        val clip = clipboardManager.getText()?.text
-                        if (!clip.isNullOrBlank()) {
-                            // Assume the clipboard contains a valid config string
-                            // (JSON or the format expected by ConfigStore)
-                            persist(MhrvConfig.fromJson(clip) ?: run {
-                                snackbar.showSnackbar("Invalid config in clipboard")
-                                return@Button
-                            })
-                            snackbar.showSnackbar("Config imported from clipboard")
-                        } else {
-                            snackbar.showSnackbar("Clipboard is empty")
-                        }
-                    }
-                ) {
-                    Text("Import")
-                }
-
-                // Scan button (placeholder – integrate your QR scanner here)
-                Button(
-                    onClick = {
-                        // TODO: Replace with actual QR scanning logic
-                        // For now, show a snackbar suggesting to implement
-                        snackbar.showSnackbar("QR scanning not yet implemented")
-                    }
-                ) {
-                    Text("Scan QR")
-                }
-            }
 
             Spacer(Modifier.height(32.dp))
 
@@ -241,26 +211,80 @@ fun HomeScreen(
 
             Spacer(Modifier.height(24.dp))
 
+            // وضعیت فعلی (اختیاری)
             if (transitioning) {
                 Text("…", style = MaterialTheme.typography.titleMedium)
             } else {
                 Text(
-                    if (isVpnRunning) "متصل" else "قطع",
+                    if (isVpnRunning) "Connected" else "Disconnected",
                     style = MaterialTheme.typography.titleMedium,
                     color = if (isVpnRunning) OkGreen else MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
         }
     }
 
-    // CA install dialog unchanged
+    // دیالوگ نصب گواهی (حذف نشده ولی چون دکمه‌اش رو برداشتیم نمایش داده نمیشه)
     if (showInstallDialog) {
-        // ... (unchanged, same as original) ...
+        val exported = remember { CaInstall.export(ctx) }
+        val fp = remember(exported) { if (exported) CaInstall.fingerprint(ctx) else null }
+        val cn = remember(exported) { if (exported) CaInstall.subjectCn(ctx) else null }
+
+        AlertDialog(
+            onDismissRequest = { showInstallDialog = false },
+            title = { Text(stringResource(R.string.dialog_install_mitm_title)) },
+            text = {
+                Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Text(
+                        "mhrv-rs creates a local certificate authority so it can decrypt " +
+                        "and re-encrypt HTTPS traffic before tunnelling it through the Apps " +
+                        "Script relay. Without this CA installed as trusted, apps will show " +
+                        "certificate errors."
+                    )
+                    Text(
+                        "On Android 11+ the system removed the inline install path, so " +
+                        "tapping Install will: (1) save a PEM copy to Downloads/mhrv-ca.crt, " +
+                        "(2) open the Settings app.\n\n" +
+                        "Inside Settings, tap the search bar and type \"CA certificate\". " +
+                        "Open the result labelled \"CA certificate\" (NOT \"VPN & app user " +
+                        "certificate\" or \"Wi-Fi certificate\"). Pick mhrv-ca.crt from " +
+                        "Downloads when prompted. If you don't have a screen lock, Android " +
+                        "will ask you to add one first — that's an OS requirement for " +
+                        "installing any user CA."
+                    )
+                    if (fp != null) {
+                        Text("Subject: ${cn ?: "(unknown)"}", style = MaterialTheme.typography.labelMedium)
+                        Text(
+                            text = "SHA-256: ${CaInstall.fingerprintHex(fp)}",
+                            style = MaterialTheme.typography.labelSmall,
+                            fontFamily = FontFamily.Monospace,
+                        )
+                    } else {
+                        Text(
+                            "Could not read the CA cert yet. Tap Start once so the " +
+                            "proxy generates it, then come back.",
+                            color = MaterialTheme.colorScheme.error,
+                        )
+                    }
+                }
+            },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        showInstallDialog = false
+                        if (fp != null) onInstallCaConfirmed()
+                    },
+                    enabled = fp != null,
+                ) { Text("Install") }
+            },
+            dismissButton = {
+                TextButton(onClick = { showInstallDialog = false }) { Text("Cancel") }
+            },
+        )
     }
 }
 
-// ========== CircularConnectButton and helper functions remain exactly the same ==========
-// (no changes below this line)
+// ========== دکمه دایره‌ای شیک ==========
 
 @Composable
 private fun CircularConnectButton(
@@ -270,17 +294,104 @@ private fun CircularConnectButton(
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    // ... (unchanged) ...
+    val interactionSource = remember { MutableInteractionSource() }
+    val isPressed by interactionSource.collectIsPressedAsState()
+    val scale by animateFloatAsState(
+        targetValue = if (isPressed) 0.92f else 1f,
+        animationSpec = spring(dampingRatio = 0.5f, stiffness = 400f),
+        label = "buttonScale"
+    )
+
+    val buttonColor = when {
+        !enabled -> MaterialTheme.colorScheme.surfaceVariant
+        isRunning -> OkGreen
+        else -> Color(0xFF9E9E9E) // خاکستری
+    }
+
+    Box(
+        modifier = modifier
+            .size(140.dp)
+            .scale(scale)
+            .clip(CircleShape)
+            .background(buttonColor)
+            .clickable(
+                interactionSource = interactionSource,
+                indication = rememberRipple(bounded = true, radius = 70.dp),
+                enabled = enabled && !transitioning,
+                onClick = onClick
+            ),
+        contentAlignment = Alignment.Center
+    ) {
+        Column(horizontalAlignment = Alignment.CenterHorizontally) {
+            if (transitioning) {
+                CircularProgressIndicator(
+                    modifier = Modifier.size(48.dp),
+                    color = Color.White,
+                    strokeWidth = 4.dp
+                )
+            } else {
+                Icon(
+                    imageVector = if (isRunning) Icons.Default.Stop else Icons.Default.PlayArrow,
+                    contentDescription = if (isRunning) "Disconnect" else "Connect",
+                    tint = Color.White,
+                    modifier = Modifier.size(56.dp)
+                )
+                Spacer(Modifier.height(4.dp))
+                Text(
+                    text = if (isRunning) "قطع" else "اتصال",
+                    color = Color.White,
+                    style = MaterialTheme.typography.labelLarge,
+                )
+            }
+        }
+    }
 }
 
+// ========== توابع کمکی (بدون تغییر) ==========
+
 private fun summarizeUpdateCheck(json: String?): String {
-    // ... (unchanged) ...
+    if (json.isNullOrBlank()) return "Update check failed (no response)"
+    return try {
+        val obj = JSONObject(json)
+        when (obj.optString("kind")) {
+            "upToDate" -> "Up to date (running v${obj.optString("current")})"
+            "updateAvailable" -> {
+                val cur = obj.optString("current")
+                val latest = obj.optString("latest")
+                val url = obj.optString("url")
+                "Update available: v$cur → v$latest   $url"
+            }
+            "offline" -> "Offline: ${obj.optString("reason", "no details")}"
+            "error" -> "Check failed: ${obj.optString("reason", "no details")}"
+            else -> "Check failed (unknown response)"
+        }
+    } catch (_: Throwable) {
+        "Check failed (bad json)"
+    }
 }
 
 private fun String.parseAsIpOrNull(): java.net.InetAddress? {
-    // ... (unchanged) ...
+    val s = trim()
+    if (s.isEmpty() || s.any { it.isLetter() }) return null
+    return try {
+        java.net.InetAddress.getByName(s).takeIf {
+            it.hostAddress?.let { addr -> addr == s || addr.contains(s) } == true
+        }
+    } catch (_: Throwable) {
+        null
+    }
 }
 
 private fun parseProbeResult(json: String?): ProbeState {
-    // ... (unchanged) ...
+    if (json.isNullOrBlank()) return ProbeState.Err("no response")
+    return try {
+        val obj = JSONObject(json)
+        if (obj.optBoolean("ok", false)) {
+            ProbeState.Ok(obj.optInt("latencyMs", -1))
+        } else {
+            ProbeState.Err(obj.optString("error", "failed"))
+        }
+    } catch (_: Throwable) {
+        ProbeState.Err("bad json")
+    }
 }