From 3168ec15018f470db7d56edb9703eed0b2c495b8 Mon Sep 17 00:00:00 2001
From: Johnny <j.fontaine@h3campus.fr>
Date: Fri, 3 Jul 2026 09:47:09 +0200
Subject: [PATCH] update + Fix

---
 .../ui/dashboard/DashboardScreen.kt           | 19 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  5 +++++
 2 files changed, 24 insertions(+)

diff --git a/app/src/main/java/com/jttools/datacontrol/ui/dashboard/DashboardScreen.kt b/app/src/main/java/com/jttools/datacontrol/ui/dashboard/DashboardScreen.kt
index c88c9fd..d3f97ab 100644
--- a/app/src/main/java/com/jttools/datacontrol/ui/dashboard/DashboardScreen.kt
+++ b/app/src/main/java/com/jttools/datacontrol/ui/dashboard/DashboardScreen.kt
@@ -190,6 +190,25 @@ fun DashboardScreen(systemActions: SystemActions) {
                     style = MaterialTheme.typography.bodyMedium
                 )
 
+                val nextCutoffText = when {
+                    !settings.controlEnabled -> stringResource(R.string.dashboard_control_disabled)
+                    snapshot.dataState == DataState.WIFI -> stringResource(R.string.dashboard_cutoff_wifi)
+                    snapshot.dataState == DataState.CUT -> stringResource(R.string.dashboard_cutoff_in_progress)
+                    snapshot.nextCutoffAtMillis != null -> {
+                        val remainingMs = (snapshot.nextCutoffAtMillis!! - System.currentTimeMillis()).coerceAtLeast(0L)
+                        stringResource(
+                            R.string.dashboard_cutoff_countdown,
+                            remainingMs / 60_000,
+                            (remainingMs / 1000) % 60
+                        )
+                    }
+                    else -> stringResource(R.string.dashboard_cutoff_unavailable)
+                }
+                Text(
+                    "${stringResource(R.string.dashboard_next_cutoff)}: $nextCutoffText",
+                    style = MaterialTheme.typography.bodyMedium
+                )
+
                 OutlinedButton(onClick = { showResetDialog = true }, modifier = Modifier.fillMaxWidth()) {
                     Text(stringResource(R.string.dashboard_reset_now))
                 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6843126..a307d92 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,11 @@
     <string name="dashboard_reset_confirm_message">Le compteur de données consommées sera remis à zéro immédiatement.</string>
     <string name="dashboard_permissions_needed">Autorisations requises pour fonctionner correctement</string>
     <string name="dashboard_control_disabled">Contrôle désactivé</string>
+    <string name="dashboard_next_cutoff">Prochaine coupure</string>
+    <string name="dashboard_cutoff_wifi">Wi-Fi actif (pas de coupure)</string>
+    <string name="dashboard_cutoff_in_progress">En cours…</string>
+    <string name="dashboard_cutoff_countdown">dans %1$d min %2$d s</string>
+    <string name="dashboard_cutoff_unavailable">indisponible (pare-feu inactif)</string>
 
     <!-- Settings -->
     <string name="settings_title">Réglages</string>