From 536a981f9e909bc6ea5e56d2a2f8f6096e9c35be Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 2 Jul 2026 18:37:45 +0200 Subject: [PATCH] =?UTF-8?q?DataControl=20v0.1.0=20:=20contr=C3=B4le=20du?= =?UTF-8?q?=20forfait=20data=20mobile=20via=20pare-feu=20VPN=20local?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Surveillance de la consommation de données mobiles avec coupure automatique en cas de dépassement de forfait, sans root ni impact sur le Wi-Fi. - Pare-feu local (VpnService) actif uniquement sur données mobiles - Liste blanche d'applications toujours autorisées - Coupure cyclique totale après dépassement (intervalle paramétrable) - Réglages complets (forfait, prix, date de début, reset auto/manuel) - Estimation du coût total en temps réel - Notification permanente colorée par état - UI Compose Material 3 Co-Authored-By: Claude Sonnet 5 --- .gitignore | 13 + CHANGELOG.md | 15 + Makefile | 82 +++++ README.md | 81 +++++ app/build.gradle.kts | 98 ++++++ app/proguard-rules.pro | 9 + app/src/main/AndroidManifest.xml | 62 ++++ .../com/jttools/datacontrol/DataControlApp.kt | 7 + .../com/jttools/datacontrol/MainActivity.kt | 27 ++ .../com/jttools/datacontrol/data/AppInfo.kt | 10 + .../jttools/datacontrol/data/AppSettings.kt | 51 ++++ .../data/InstalledAppsRepository.kt | 34 +++ .../datacontrol/data/SettingsRepository.kt | 98 ++++++ .../datacontrol/data/UsageRepository.kt | 46 +++ .../datacontrol/service/BootReceiver.kt | 39 +++ .../service/ConnectivityObserver.kt | 56 ++++ .../datacontrol/service/DataMonitorService.kt | 281 ++++++++++++++++++ .../datacontrol/service/FirewallVpnService.kt | 171 +++++++++++ .../datacontrol/service/MonitorStateHolder.kt | 33 ++ .../jttools/datacontrol/ui/SystemActions.kt | 78 +++++ .../ui/dashboard/DashboardScreen.kt | 224 ++++++++++++++ .../ui/dashboard/DashboardViewModel.kt | 35 +++ .../ui/navigation/DataControlNavHost.kt | 74 +++++ .../datacontrol/ui/settings/SettingsScreen.kt | 234 +++++++++++++++ .../ui/settings/SettingsViewModel.kt | 40 +++ .../com/jttools/datacontrol/ui/theme/Color.kt | 45 +++ .../com/jttools/datacontrol/ui/theme/Theme.kt | 75 +++++ .../com/jttools/datacontrol/ui/theme/Type.kt | 39 +++ .../ui/whitelist/WhitelistScreen.kt | 129 ++++++++ .../ui/whitelist/WhitelistViewModel.kt | 51 ++++ .../res/drawable/ic_launcher_background.xml | 14 + .../res/drawable/ic_launcher_foreground.xml | 23 ++ app/src/main/res/drawable/ic_notification.xml | 11 + app/src/main/res/mipmap-hdpi/ic_launcher.xml | 5 + .../res/mipmap-hdpi/ic_launcher_round.xml | 5 + app/src/main/res/mipmap-mdpi/ic_launcher.xml | 5 + .../res/mipmap-mdpi/ic_launcher_round.xml | 5 + app/src/main/res/mipmap-xhdpi/ic_launcher.xml | 5 + .../res/mipmap-xhdpi/ic_launcher_round.xml | 5 + .../main/res/mipmap-xxhdpi/ic_launcher.xml | 5 + .../res/mipmap-xxhdpi/ic_launcher_round.xml | 5 + .../main/res/mipmap-xxxhdpi/ic_launcher.xml | 5 + .../res/mipmap-xxxhdpi/ic_launcher_round.xml | 5 + app/src/main/res/values/colors.xml | 4 + app/src/main/res/values/strings.xml | 77 +++++ app/src/main/res/values/themes.xml | 6 + app/src/main/res/xml/backup_rules.xml | 4 + .../main/res/xml/data_extraction_rules.xml | 6 + build.gradle.kts | 7 + gradle.properties | 5 + gradle/libs.versions.toml | 50 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++ gradlew.bat | 94 ++++++ settings.gradle.kts | 23 ++ version.properties | 2 + 57 files changed, 2871 insertions(+) create mode 100644 .gitignore create mode 100644 CHANGELOG.md create mode 100644 Makefile create mode 100644 app/build.gradle.kts create mode 100644 app/proguard-rules.pro create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/jttools/datacontrol/DataControlApp.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/MainActivity.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/data/AppInfo.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/data/AppSettings.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/data/InstalledAppsRepository.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/data/SettingsRepository.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/data/UsageRepository.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/service/BootReceiver.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/service/ConnectivityObserver.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/service/DataMonitorService.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/service/FirewallVpnService.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/service/MonitorStateHolder.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/ui/SystemActions.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/ui/dashboard/DashboardScreen.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/ui/dashboard/DashboardViewModel.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/ui/navigation/DataControlNavHost.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/ui/settings/SettingsScreen.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/ui/settings/SettingsViewModel.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/ui/theme/Color.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/ui/theme/Theme.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/ui/theme/Type.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/ui/whitelist/WhitelistScreen.kt create mode 100644 app/src/main/java/com/jttools/datacontrol/ui/whitelist/WhitelistViewModel.kt create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ic_notification.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.xml create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/xml/backup_rules.xml create mode 100644 app/src/main/res/xml/data_extraction_rules.xml create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts create mode 100644 version.properties diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ae17d2e --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +*.iml +.gradle/ +/local.properties +/.idea/ +.DS_Store +/build/ +/app/build/ +/captures/ +.externalNativeBuild/ +.cxx/ +local.properties +*.apk +!DataControl-*.apk diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..31db75f --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,15 @@ +# Changelog + +## v0.1.0 – 2026-07-02 + +Première version. + +- Pare-feu local basé sur `VpnService` (sans root), actif uniquement sur données mobiles — le Wi-Fi n'est jamais filtré. +- Liste blanche d'applications autorisées à accéder aux données mobiles, active en permanence. +- Coupure totale cyclique (toutes les X minutes, paramétrable) une fois le forfait dépassé. +- Réglages du forfait : volume (Mo), prix du forfait, prix par Mo hors-forfait, date de début. +- Réinitialisation automatique mensuelle du compteur + réinitialisation manuelle. +- Estimation du coût total en temps réel (forfait + hors-forfait). +- Notification permanente avec code couleur d'état et rafraîchissement automatique. +- Redémarrage automatique de la surveillance après reboot de l'appareil. +- Interface Material 3 (thème clair/sombre, couleurs dynamiques Android 12+). diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..91b78c8 --- /dev/null +++ b/Makefile @@ -0,0 +1,82 @@ +## DataControl – Android Build & Release Makefile +## Author: JT-Tools by Johnny + +VERSION_NAME := $(shell grep 'versionName' version.properties | cut -d= -f2 | tr -d ' ') +VERSION_CODE := $(shell grep 'versionCode' version.properties | cut -d= -f2 | tr -d ' ') + +GRADLEW := ./gradlew +APK_RELEASE := app/build/outputs/apk/release/app-release.apk +APK_DEBUG := app/build/outputs/apk/debug/app-debug.apk +OUTPUT_APK := DataControl-$(VERSION_NAME).apk + +.DEFAULT_GOAL := help + +.PHONY: help build release install push version-bump changelog clean + +## help: Show this help message +help: + @echo "DataControl v$(VERSION_NAME) (build $(VERSION_CODE))" + @echo "" + @echo "Available targets:" + @grep -E '^## [a-z]' Makefile | sed 's/## / make /' | column -t -s ':' + +## build: Build debug APK +build: + @echo "[BUILD] Building debug APK..." + $(GRADLEW) assembleDebug + @echo "[BUILD] Done: $(APK_DEBUG)" + +## release: Build release APK and copy to project root +release: + @echo "[RELEASE] Building release APK for v$(VERSION_NAME) ($(VERSION_CODE))..." + $(GRADLEW) assembleRelease + @cp $(APK_RELEASE) $(OUTPUT_APK) + @echo "[RELEASE] Done: $(OUTPUT_APK)" + +## install: Install debug APK on connected device +install: + @echo "[INSTALL] Installing debug APK..." + $(GRADLEW) installDebug + @echo "[INSTALL] Done." + +## push: Git add, commit, tag and push (uses current version) +push: + @echo "[PUSH] Committing and pushing v$(VERSION_NAME)..." + git add -A + git commit -m "Release v$(VERSION_NAME) (build $(VERSION_CODE))" + git tag -a "v$(VERSION_NAME)" -m "Release v$(VERSION_NAME)" + git push origin main + git push origin "v$(VERSION_NAME)" + @echo "[PUSH] Done." + +## version-bump: Increment versionCode and update versionName patch +version-bump: + @NEW_CODE=$$(( $(VERSION_CODE) + 1 )); \ + PATCH=$$(echo $(VERSION_NAME) | cut -d. -f3); \ + MAJOR=$$(echo $(VERSION_NAME) | cut -d. -f1); \ + MINOR=$$(echo $(VERSION_NAME) | cut -d. -f2); \ + NEW_PATCH=$$(( PATCH + 1 )); \ + NEW_VERSION="$${MAJOR}.$${MINOR}.$${NEW_PATCH}"; \ + sed -i "s/versionName=.*/versionName=$${NEW_VERSION}/" version.properties; \ + sed -i "s/versionCode=.*/versionCode=$${NEW_CODE}/" version.properties; \ + echo "[VERSION-BUMP] Bumped to $${NEW_VERSION} (build $${NEW_CODE})" + +## changelog: Generate a changelog entry from git log since last tag +changelog: + @echo "[CHANGELOG] Generating entries since last tag..." + @LAST_TAG=$$(git describe --tags --abbrev=0 2>/dev/null || echo ""); \ + if [ -z "$$LAST_TAG" ]; then \ + git log --oneline --pretty=format:"- %s" >> CHANGELOG.md; \ + else \ + echo "" >> CHANGELOG.md; \ + echo "## v$(VERSION_NAME) – $$(date +%Y-%m-%d)" >> CHANGELOG.md; \ + git log $$LAST_TAG..HEAD --oneline --pretty=format:"- %s" >> CHANGELOG.md; \ + fi; \ + echo "[CHANGELOG] Done." + +## clean: Clean build artifacts +clean: + @echo "[CLEAN] Cleaning build artifacts..." + $(GRADLEW) clean + @rm -f DataControl-*.apk + @echo "[CLEAN] Done." diff --git a/README.md b/README.md index e69de29..c96b54a 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,81 @@ +# DataControl + +**DataControl** est une application Android qui surveille en arrière-plan la consommation de données mobiles et coupe automatiquement l'accès à Internet en cas de dépassement du forfait — sans jamais toucher au Wi-Fi. + +> JT-Tools by Johnny — v0.1.0 + +--- + +## Fonctionnalités + +- **Suivi de la consommation** — Mesure en continu les données mobiles consommées depuis le début du cycle de forfait (`TrafficStats`, aucune permission spéciale requise). +- **Forfait configurable** — Volume du forfait (Mo), prix du forfait (€), prix par Mo hors-forfait (€), date de début du cycle. +- **Estimation du coût** — Calcul automatique : prix du forfait + (Mo hors-forfait × prix/Mo), affiché en temps réel sur le tableau de bord. +- **Réinitialisation** — Automatique chaque mois à la date anniversaire du début de forfait, ou manuelle à tout moment depuis le tableau de bord. +- **Liste blanche d'applications** — Les applications cochées gardent toujours accès aux données mobiles ; toutes les autres en sont privées en permanence (voir *Comportement du pare-feu* ci-dessous). Le Wi-Fi n'est jamais filtré. +- **Coupure cyclique en cas de dépassement** — Une fois le forfait dépassé, une coupure totale (même pour la liste blanche) se déclenche automatiquement toutes les X minutes (paramétrable), pendant une courte pulsation, avant de revenir en mode "liste blanche seule". +- **Notification permanente** — Affiche la consommation (Mo / forfait / %), l'état des données avec un code couleur (🟢 sous le forfait, 🟠 proche du forfait, 🔴 hors-forfait/coupure, 🔵 Wi-Fi actif), et le coût estimé. Rafraîchie toutes les 20 secondes et à chaque changement de réseau. +- **Démarrage au boot** — Le service redémarre automatiquement après un redémarrage de l'appareil si le contrôle était actif. +- **Interface Material 3** — Thème clair/sombre avec couleurs dynamiques (Android 12+), 3 écrans : Tableau de bord, Réglages, Liste blanche. + +--- + +## Comportement du pare-feu (important) + +Android interdit depuis longtemps aux applications normales de couper les données mobiles par programmation (l'API historique a été bloquée depuis Android 5). DataControl **ne nécessite ni root ni Shizuku** : il utilise un pare-feu local basé sur `VpnService` (comme NetGuard), qui ne route ni ne transmet aucun paquet — il capture le trafic des applications non autorisées dans un tunnel VPN local et le laisse silencieusement tomber ("trou noir"), tandis que les applications autorisées sont explicitement exclues du tunnel (`addDisallowedApplication`) et continuent de communiquer normalement. + +Règles appliquées : + +| Réseau actif | Sous le forfait | Forfait dépassé | +|---|---|---| +| **Wi-Fi** | Aucun filtrage, jamais | Aucun filtrage, jamais | +| **Données mobiles** | Liste blanche active en permanence : seules les apps cochées ont accès | Liste blanche active **+** coupure totale cyclique toutes les X minutes (pulsation de 30 s, même les apps de la liste blanche sont coupées pendant la pulsation) | + +Le pare-feu est démarré/arrêté automatiquement selon le transport réseau actif détecté (`ConnectivityManager.NetworkCallback`) : dès que l'appareil bascule sur le Wi-Fi, le tunnel VPN est entièrement fermé. + +--- + +## Autorisations requises + +| Permission | Usage | +|---|---| +| VPN (consentement système) | Établir le pare-feu local — demandé au premier `Activer le contrôle` | +| Notifications (Android 13+) | Afficher la notification permanente d'état | +| Ignorer l'optimisation de la batterie | Éviter que le système ne tue le service de surveillance | +| `QUERY_ALL_PACKAGES` | Lister toutes les applications installées dans l'écran Liste blanche | +| `RECEIVE_BOOT_COMPLETED` | Relancer la surveillance après redémarrage si le contrôle était actif | + +--- + +## Limites connues + +- Le compteur de consommation repose sur `TrafficStats` (cumul depuis le dernier redémarrage de l'appareil). Un redémarrage réinitialise ce compteur système ; DataControl détecte cette situation et rebascule automatiquement sa référence à 0 pour éviter un calcul négatif, mais la consommation entre le redémarrage et la détection n'est pas comptabilisée. +- `QUERY_ALL_PACKAGES` est soumis à restriction sur le Google Play Store pour les apps grand public ; sans distribution via le Store, cela ne pose pas de problème. +- Le pare-feu VPN local est incompatible avec l'usage simultané d'un autre VPN (limitation système Android : un seul VPN actif à la fois). + +--- + +## Architecture + +- **Kotlin + Jetpack Compose (Material 3)**, Hilt pour l'injection de dépendances. +- `data/` — `SettingsRepository` (DataStore Preferences), `UsageRepository` (TrafficStats), `InstalledAppsRepository` (PackageManager). +- `service/` — `FirewallVpnService` (VpnService), `ConnectivityObserver` (détection Wi-Fi/cellulaire), `DataMonitorService` (orchestration + notification), `MonitorStateHolder` (pont service ↔ UI), `BootReceiver`. +- `ui/` — écrans Compose (`dashboard`, `settings`, `whitelist`), navigation par `NavigationBar`, thème dynamique. + +--- + +## Build + +```bash +make build # APK debug +make release # APK release signé, copié en DataControl-.apk +make install # Installe le debug sur un appareil connecté (adb) +``` + +Prérequis : Android SDK (API 34), JDK 17. Le wrapper Gradle télécharge Gradle 8.13 au premier lancement. + +--- + +## Licence + +Projet personnel — JT-Tools by Johnny. diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..8cf504f --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,98 @@ +import java.util.Properties +import java.util.Date +import java.text.SimpleDateFormat + +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.hilt.android) + alias(libs.plugins.kotlin.kapt) +} + +val versionProps = Properties().apply { + load(rootProject.file("version.properties").inputStream()) +} + +android { + namespace = "com.jttools.datacontrol" + compileSdk = 34 + + defaultConfig { + applicationId = "com.jttools.datacontrol" + minSdk = 26 + targetSdk = 34 + versionCode = versionProps.getProperty("versionCode").toInt() + versionName = versionProps.getProperty("versionName") + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + + buildConfigField("String", "BUILD_DATE", "\"${SimpleDateFormat("yyyy-MM-dd").format(Date())}\"") + } + + buildTypes { + release { + isMinifyEnabled = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + signingConfig = signingConfigs.getByName("debug") + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = "17" + } + + buildFeatures { + compose = true + buildConfig = true + } + + composeOptions { + kotlinCompilerExtensionVersion = "1.5.14" + } + + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + implementation(libs.androidx.material.icons.extended) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.androidx.lifecycle.service) + implementation(libs.androidx.navigation.compose) + implementation(libs.hilt.android) + kapt(libs.hilt.android.compiler) + implementation(libs.androidx.hilt.navigation.compose) + implementation(libs.androidx.datastore.preferences) + implementation(libs.kotlinx.coroutines.android) + implementation(libs.androidx.work.runtime.ktx) + + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..0dabd4c --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,9 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. + +# Keep data models (DataStore / VPN service reflection safety) +-keep class com.jttools.datacontrol.data.** { *; } + +# Hilt +-dontwarn dagger.hilt.** diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..1222356 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/jttools/datacontrol/DataControlApp.kt b/app/src/main/java/com/jttools/datacontrol/DataControlApp.kt new file mode 100644 index 0000000..20095bc --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/DataControlApp.kt @@ -0,0 +1,7 @@ +package com.jttools.datacontrol + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class DataControlApp : Application() diff --git a/app/src/main/java/com/jttools/datacontrol/MainActivity.kt b/app/src/main/java/com/jttools/datacontrol/MainActivity.kt new file mode 100644 index 0000000..13ef1dd --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/MainActivity.kt @@ -0,0 +1,27 @@ +package com.jttools.datacontrol + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import com.jttools.datacontrol.ui.SystemActions +import com.jttools.datacontrol.ui.navigation.DataControlNavHost +import com.jttools.datacontrol.ui.theme.DataControlTheme +import dagger.hilt.android.AndroidEntryPoint + +@AndroidEntryPoint +class MainActivity : ComponentActivity() { + + private lateinit var systemActions: SystemActions + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + systemActions = SystemActions(this) + enableEdgeToEdge() + setContent { + DataControlTheme { + DataControlNavHost(systemActions = systemActions) + } + } + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/data/AppInfo.kt b/app/src/main/java/com/jttools/datacontrol/data/AppInfo.kt new file mode 100644 index 0000000..0d5a875 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/data/AppInfo.kt @@ -0,0 +1,10 @@ +package com.jttools.datacontrol.data + +import android.graphics.drawable.Drawable + +data class AppInfo( + val packageName: String, + val label: String, + val icon: Drawable?, + val isSystemApp: Boolean +) diff --git a/app/src/main/java/com/jttools/datacontrol/data/AppSettings.kt b/app/src/main/java/com/jttools/datacontrol/data/AppSettings.kt new file mode 100644 index 0000000..e248913 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/data/AppSettings.kt @@ -0,0 +1,51 @@ +package com.jttools.datacontrol.data + +import java.time.LocalDate + +/** + * Réglages persistés de l'application, avec leurs valeurs par défaut. + */ +data class AppSettings( + val controlEnabled: Boolean = false, + val planLimitMo: Long = 5000L, + val planPriceEuro: Double = 19.99, + val overagePricePerMoEuro: Double = 0.01, + val planStartDateEpochDay: Long = LocalDate.now().toEpochDay(), + val autoResetEnabled: Boolean = true, + val cutoffIntervalMinutes: Int = 15, + val baselineMobileBytesAtReset: Long = 0L, + val whitelistedPackages: Set = emptySet(), + val showSystemApps: Boolean = false +) { + val planStartDate: LocalDate get() = LocalDate.ofEpochDay(planStartDateEpochDay) + + /** Prochaine date de réinitialisation automatique (anniversaire mensuel du début de forfait). */ + fun nextAutoResetDate(): LocalDate { + var next = planStartDate.plusMonths(1) + val today = LocalDate.now() + while (!next.isAfter(today)) { + next = next.plusMonths(1) + } + return next + } +} + +/** État calculé de la consommation, dérivé des réglages + de la mesure de données réelle. */ +data class UsageState( + val consumedMo: Long, + val planLimitMo: Long, + val overageMo: Long, + val isOverPlan: Boolean, + val estimatedTotalPriceEuro: Double +) { + val percentOfPlan: Float + get() = if (planLimitMo <= 0) 0f else (consumedMo.toFloat() / planLimitMo.toFloat()).coerceAtLeast(0f) +} + +enum class DataState { + OK, // sous le forfait + WARNING, // proche du forfait (>= 80%) + OVERRUN_FILTER, // dépassé, liste blanche seule active + OVERRUN_CUT, // dépassé, coupure totale cyclique en cours + WIFI // Wi-Fi actif, aucun filtrage appliqué +} diff --git a/app/src/main/java/com/jttools/datacontrol/data/InstalledAppsRepository.kt b/app/src/main/java/com/jttools/datacontrol/data/InstalledAppsRepository.kt new file mode 100644 index 0000000..f5a37d6 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/data/InstalledAppsRepository.kt @@ -0,0 +1,34 @@ +package com.jttools.datacontrol.data + +import android.content.Context +import android.content.pm.ApplicationInfo +import android.content.pm.PackageManager +import dagger.hilt.android.qualifiers.ApplicationContext +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class InstalledAppsRepository @Inject constructor( + @ApplicationContext private val context: Context +) { + @Suppress("DEPRECATION") + suspend fun listInstalledApps(): List = withContext(Dispatchers.Default) { + val pm = context.packageManager + val ownPackage = context.packageName + pm.getInstalledApplications(PackageManager.GET_META_DATA) + .asSequence() + .filter { it.packageName != ownPackage } + .map { appInfo -> + AppInfo( + packageName = appInfo.packageName, + label = pm.getApplicationLabel(appInfo).toString(), + icon = runCatching { pm.getApplicationIcon(appInfo) }.getOrNull(), + isSystemApp = (appInfo.flags and ApplicationInfo.FLAG_SYSTEM) != 0 + ) + } + .sortedBy { it.label.lowercase() } + .toList() + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/data/SettingsRepository.kt b/app/src/main/java/com/jttools/datacontrol/data/SettingsRepository.kt new file mode 100644 index 0000000..00f9276 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/data/SettingsRepository.kt @@ -0,0 +1,98 @@ +package com.jttools.datacontrol.data + +import android.content.Context +import androidx.datastore.preferences.core.booleanPreferencesKey +import androidx.datastore.preferences.core.doublePreferencesKey +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.longPreferencesKey +import androidx.datastore.preferences.core.intPreferencesKey +import androidx.datastore.preferences.core.stringSetPreferencesKey +import androidx.datastore.preferences.preferencesDataStore +import dagger.hilt.android.qualifiers.ApplicationContext +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map +import java.time.LocalDate +import javax.inject.Inject +import javax.inject.Singleton + +private val Context.dataStore by preferencesDataStore(name = "datacontrol_settings") + +@Singleton +class SettingsRepository @Inject constructor( + @ApplicationContext private val context: Context +) { + private object Keys { + val CONTROL_ENABLED = booleanPreferencesKey("control_enabled") + val PLAN_LIMIT_MO = longPreferencesKey("plan_limit_mo") + val PLAN_PRICE_EURO = doublePreferencesKey("plan_price_euro") + val OVERAGE_PRICE_PER_MO = doublePreferencesKey("overage_price_per_mo") + val PLAN_START_DATE_EPOCH_DAY = longPreferencesKey("plan_start_date_epoch_day") + val AUTO_RESET_ENABLED = booleanPreferencesKey("auto_reset_enabled") + val CUTOFF_INTERVAL_MINUTES = intPreferencesKey("cutoff_interval_minutes") + val BASELINE_MOBILE_BYTES = longPreferencesKey("baseline_mobile_bytes") + val WHITELISTED_PACKAGES = stringSetPreferencesKey("whitelisted_packages") + val SHOW_SYSTEM_APPS = booleanPreferencesKey("show_system_apps") + } + + val settingsFlow: Flow = context.dataStore.data.map { prefs -> + val defaults = AppSettings() + AppSettings( + controlEnabled = prefs[Keys.CONTROL_ENABLED] ?: defaults.controlEnabled, + planLimitMo = prefs[Keys.PLAN_LIMIT_MO] ?: defaults.planLimitMo, + planPriceEuro = prefs[Keys.PLAN_PRICE_EURO] ?: defaults.planPriceEuro, + overagePricePerMoEuro = prefs[Keys.OVERAGE_PRICE_PER_MO] ?: defaults.overagePricePerMoEuro, + planStartDateEpochDay = prefs[Keys.PLAN_START_DATE_EPOCH_DAY] ?: defaults.planStartDateEpochDay, + autoResetEnabled = prefs[Keys.AUTO_RESET_ENABLED] ?: defaults.autoResetEnabled, + cutoffIntervalMinutes = prefs[Keys.CUTOFF_INTERVAL_MINUTES] ?: defaults.cutoffIntervalMinutes, + baselineMobileBytesAtReset = prefs[Keys.BASELINE_MOBILE_BYTES] ?: defaults.baselineMobileBytesAtReset, + whitelistedPackages = prefs[Keys.WHITELISTED_PACKAGES] ?: defaults.whitelistedPackages, + showSystemApps = prefs[Keys.SHOW_SYSTEM_APPS] ?: defaults.showSystemApps + ) + } + + suspend fun setControlEnabled(enabled: Boolean) { + context.dataStore.edit { it[Keys.CONTROL_ENABLED] = enabled } + } + + suspend fun updatePlan( + planLimitMo: Long, + planPriceEuro: Double, + overagePricePerMoEuro: Double, + cutoffIntervalMinutes: Int, + autoResetEnabled: Boolean + ) { + context.dataStore.edit { prefs -> + prefs[Keys.PLAN_LIMIT_MO] = planLimitMo + prefs[Keys.PLAN_PRICE_EURO] = planPriceEuro + prefs[Keys.OVERAGE_PRICE_PER_MO] = overagePricePerMoEuro + prefs[Keys.CUTOFF_INTERVAL_MINUTES] = cutoffIntervalMinutes + prefs[Keys.AUTO_RESET_ENABLED] = autoResetEnabled + } + } + + /** Change uniquement la date de début du cycle (référence pour le reset automatique), sans toucher au compteur en cours. */ + suspend fun setStartDate(date: LocalDate) { + context.dataStore.edit { it[Keys.PLAN_START_DATE_EPOCH_DAY] = date.toEpochDay() } + } + + suspend fun setWhitelistedPackages(packages: Set) { + context.dataStore.edit { it[Keys.WHITELISTED_PACKAGES] = packages } + } + + suspend fun setShowSystemApps(show: Boolean) { + context.dataStore.edit { it[Keys.SHOW_SYSTEM_APPS] = show } + } + + /** Réinitialise le compteur de consommation : nouvelle date de début + nouvelle base de référence. */ + suspend fun resetPlan(currentMobileBytes: Long, startDate: LocalDate = LocalDate.now()) { + context.dataStore.edit { prefs -> + prefs[Keys.PLAN_START_DATE_EPOCH_DAY] = startDate.toEpochDay() + prefs[Keys.BASELINE_MOBILE_BYTES] = currentMobileBytes + } + } + + /** Corrige la base de référence sans changer la date de début (ex: compteur système remis à zéro après redémarrage). */ + suspend fun rebaseline(currentMobileBytes: Long) { + context.dataStore.edit { it[Keys.BASELINE_MOBILE_BYTES] = currentMobileBytes } + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/data/UsageRepository.kt b/app/src/main/java/com/jttools/datacontrol/data/UsageRepository.kt new file mode 100644 index 0000000..5b71c20 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/data/UsageRepository.kt @@ -0,0 +1,46 @@ +package com.jttools.datacontrol.data + +import android.net.TrafficStats +import javax.inject.Inject +import javax.inject.Singleton + +/** + * Mesure la consommation de données mobiles via TrafficStats (compteur cumulatif depuis + * le dernier redémarrage de l'appareil, aucune permission spéciale requise). + * + * Le compteur total est comparé à une "baseline" capturée au dernier reset du forfait + * (voir [SettingsRepository.resetPlan]) pour obtenir la consommation depuis le début du cycle. + */ +@Singleton +class UsageRepository @Inject constructor() { + + /** Total d'octets mobiles (émis + reçus) depuis le dernier redémarrage de l'appareil. -1 si indisponible. */ + fun totalMobileBytes(): Long { + val rx = TrafficStats.getMobileRxBytes() + val tx = TrafficStats.getMobileTxBytes() + if (rx == TrafficStats.UNSUPPORTED.toLong() || tx == TrafficStats.UNSUPPORTED.toLong()) { + return -1L + } + return rx + tx + } + + /** + * Octets consommés depuis [baselineBytes]. Si le compteur système est inférieur à la baseline + * (redémarrage de l'appareil détecté), retourne 0 — l'appelant doit alors rebasculer la baseline. + */ + fun consumedBytesSince(baselineBytes: Long): Long { + val total = totalMobileBytes() + if (total < 0) return 0L + return (total - baselineBytes).coerceAtLeast(0L) + } + + fun hasCounterReset(baselineBytes: Long): Boolean { + val total = totalMobileBytes() + return total in 0 until baselineBytes + } + + companion object { + fun bytesToMo(bytes: Long): Long = bytes / (1024L * 1024L) + fun moToBytes(mo: Long): Long = mo * 1024L * 1024L + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/service/BootReceiver.kt b/app/src/main/java/com/jttools/datacontrol/service/BootReceiver.kt new file mode 100644 index 0000000..bc3f3dd --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/service/BootReceiver.kt @@ -0,0 +1,39 @@ +package com.jttools.datacontrol.service + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.jttools.datacontrol.data.SettingsRepository +import dagger.hilt.android.AndroidEntryPoint +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.flow.first +import dagger.hilt.android.EntryPointAccessors +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import dagger.hilt.EntryPoint + +class BootReceiver : BroadcastReceiver() { + + @EntryPoint + @InstallIn(SingletonComponent::class) + interface BootReceiverEntryPoint { + fun settingsRepository(): SettingsRepository + } + + override fun onReceive(context: Context, intent: Intent?) { + if (intent?.action != Intent.ACTION_BOOT_COMPLETED) return + val appContext = context.applicationContext + val entryPoint = EntryPointAccessors.fromApplication(appContext, BootReceiverEntryPoint::class.java) + val pendingResult = goAsync() + CoroutineScope(Dispatchers.Default).launch { + try { + val enabled = entryPoint.settingsRepository().settingsFlow.first().controlEnabled + if (enabled) DataMonitorService.start(appContext) + } finally { + pendingResult.finish() + } + } + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/service/ConnectivityObserver.kt b/app/src/main/java/com/jttools/datacontrol/service/ConnectivityObserver.kt new file mode 100644 index 0000000..e0d6399 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/service/ConnectivityObserver.kt @@ -0,0 +1,56 @@ +package com.jttools.datacontrol.service + +import android.content.Context +import android.net.ConnectivityManager +import android.net.Network +import android.net.NetworkCapabilities +import android.net.NetworkRequest +import dagger.hilt.android.qualifiers.ApplicationContext +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.callbackFlow +import kotlinx.coroutines.flow.distinctUntilChanged +import javax.inject.Inject +import javax.inject.Singleton + +enum class NetworkTransport { CELLULAR, WIFI, OTHER, NONE } + +/** + * Observe le réseau par défaut de l'appareil et expose son transport (cellulaire / Wi-Fi / autre). + * Le pare-feu VPN ne doit être actif QUE lorsque le transport actif est CELLULAR — sur Wi-Fi, + * l'accès Internet de toutes les applications reste totalement libre. + */ +@Singleton +class ConnectivityObserver @Inject constructor( + @ApplicationContext private val context: Context +) { + fun observe(): Flow = callbackFlow { + val cm = context.getSystemService(ConnectivityManager::class.java) + + fun transportOf(caps: NetworkCapabilities?): NetworkTransport = when { + caps == null -> NetworkTransport.NONE + caps.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> NetworkTransport.CELLULAR + caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> NetworkTransport.WIFI + else -> NetworkTransport.OTHER + } + + val callback = object : ConnectivityManager.NetworkCallback() { + override fun onCapabilitiesChanged(network: Network, caps: NetworkCapabilities) { + trySend(transportOf(caps)) + } + + override fun onLost(network: Network) { + trySend(NetworkTransport.NONE) + } + } + + val request = NetworkRequest.Builder() + .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + .build() + + trySend(transportOf(cm.getNetworkCapabilities(cm.activeNetwork))) + cm.registerNetworkCallback(request, callback) + + awaitClose { cm.unregisterNetworkCallback(callback) } + }.distinctUntilChanged() +} diff --git a/app/src/main/java/com/jttools/datacontrol/service/DataMonitorService.kt b/app/src/main/java/com/jttools/datacontrol/service/DataMonitorService.kt new file mode 100644 index 0000000..19f5976 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/service/DataMonitorService.kt @@ -0,0 +1,281 @@ +package com.jttools.datacontrol.service + +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.graphics.Color +import android.os.Build +import androidx.core.app.NotificationCompat +import androidx.core.content.ContextCompat +import androidx.lifecycle.LifecycleService +import androidx.lifecycle.lifecycleScope +import com.jttools.datacontrol.MainActivity +import com.jttools.datacontrol.R +import com.jttools.datacontrol.data.AppSettings +import com.jttools.datacontrol.data.DataState +import com.jttools.datacontrol.data.SettingsRepository +import com.jttools.datacontrol.data.UsageRepository +import dagger.hilt.android.AndroidEntryPoint +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch +import java.time.LocalDate +import javax.inject.Inject +import kotlin.math.max + +/** + * Service de premier plan qui surveille en continu la consommation de données mobiles, + * pilote le pare-feu [FirewallVpnService] et met à jour la notification permanente. + * + * Règles appliquées (voir README) : + * - Sur Wi-Fi : aucun filtrage, jamais (le pare-feu est arrêté). + * - Sur données mobiles, sous le forfait : liste blanche déjà active en permanence + * (seules les apps cochées ont accès aux données mobiles). + * - Sur données mobiles, forfait dépassé : la liste blanche reste active, ET une coupure + * totale (même liste blanche) se déclenche cycliquement toutes les X minutes pendant + * une courte pulsation avant de revenir en mode "liste blanche seule". + */ +@AndroidEntryPoint +class DataMonitorService : LifecycleService() { + + @Inject lateinit var settingsRepository: SettingsRepository + @Inject lateinit var usageRepository: UsageRepository + @Inject lateinit var connectivityObserver: ConnectivityObserver + @Inject lateinit var stateHolder: MonitorStateHolder + + private var latestSettings: AppSettings = AppSettings() + private var latestTransport: NetworkTransport = NetworkTransport.NONE + private var vpnRevoked = false + + private var lastAppliedMode: VpnMode? = null + private var lastAppliedWhitelist: Set = emptySet() + + private var cutoffCycleAnchorMillis: Long? = null + private var inPulse = false + private var pulseStartMillis: Long = 0L + + private val vpnRevokedReceiver = object : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + vpnRevoked = true + lifecycleScope.launch { settingsRepository.setControlEnabled(false) } + } + } + + private enum class VpnMode { FILTER, BLOCK_ALL, STOPPED } + + override fun onCreate() { + super.onCreate() + ContextCompat.registerReceiver( + this, vpnRevokedReceiver, IntentFilter(FirewallVpnService.ACTION_VPN_REVOKED), + ContextCompat.RECEIVER_NOT_EXPORTED + ) + startForeground(NOTIF_ID, buildNotification(stateHolder.snapshot.value)) + + lifecycleScope.launch { + settingsRepository.settingsFlow.collect { + latestSettings = it + if (!it.controlEnabled) vpnRevoked = false + tick() + } + } + lifecycleScope.launch { + connectivityObserver.observe().collect { + latestTransport = it + tick() + } + } + lifecycleScope.launch { + while (isActive) { + tick() + kotlinx.coroutines.delay(TICK_INTERVAL_MS) + } + } + } + + private fun tick() { + val settings = latestSettings + + if (!settings.controlEnabled) { + applyVpnMode(VpnMode.STOPPED, emptySet()) + stateHolder.update { it.copy(serviceRunning = false) } + updateNotification(stateHolder.snapshot.value) + return + } + + maybeAutoReset(settings) + + val consumedBytes = usageRepository.consumedBytesSince(settings.baselineMobileBytesAtReset) + if (usageRepository.hasCounterReset(settings.baselineMobileBytesAtReset)) { + lifecycleScope.launch { settingsRepository.rebaseline(usageRepository.totalMobileBytes()) } + } + val consumedMo = UsageRepository.bytesToMo(consumedBytes) + val overageMo = max(0L, consumedMo - settings.planLimitMo) + val isOverPlan = consumedMo > settings.planLimitMo + val estimatedTotal = settings.planPriceEuro + overageMo * settings.overagePricePerMoEuro + val percent = if (settings.planLimitMo > 0) consumedMo.toFloat() / settings.planLimitMo else 0f + + val dataState: DataState + var nextCutoffAt: Long? = null + + when { + latestTransport == NetworkTransport.WIFI -> { + applyVpnMode(VpnMode.STOPPED, emptySet()) + resetCutoffCycle() + dataState = DataState.WIFI + } + latestTransport == NetworkTransport.CELLULAR && !vpnRevoked && FirewallVpnService.isPrepared(this) -> { + if (!isOverPlan) { + resetCutoffCycle() + applyVpnMode(VpnMode.FILTER, settings.whitelistedPackages) + dataState = if (percent >= WARNING_THRESHOLD) DataState.WARNING else DataState.OK + } else { + val now = System.currentTimeMillis() + val intervalMs = settings.cutoffIntervalMinutes * 60_000L + val anchor = cutoffCycleAnchorMillis ?: now.also { cutoffCycleAnchorMillis = it } + + if (inPulse) { + if (now - pulseStartMillis >= PULSE_DURATION_MS) { + inPulse = false + cutoffCycleAnchorMillis = now + applyVpnMode(VpnMode.FILTER, settings.whitelistedPackages) + } else { + applyVpnMode(VpnMode.BLOCK_ALL, emptySet()) + } + } else if (now - anchor >= intervalMs) { + inPulse = true + pulseStartMillis = now + applyVpnMode(VpnMode.BLOCK_ALL, emptySet()) + } else { + applyVpnMode(VpnMode.FILTER, settings.whitelistedPackages) + } + nextCutoffAt = if (inPulse) pulseStartMillis + PULSE_DURATION_MS else anchor + intervalMs + dataState = if (inPulse) DataState.OVERRUN_CUT else DataState.OVERRUN_FILTER + } + } + else -> { + // Pas de réseau, transport inconnu, ou VPN non préparé/révoqué : rien à filtrer. + applyVpnMode(VpnMode.STOPPED, emptySet()) + resetCutoffCycle() + dataState = if (percent >= WARNING_THRESHOLD) DataState.WARNING else DataState.OK + } + } + + stateHolder.update { + it.copy( + consumedMo = consumedMo, + planLimitMo = settings.planLimitMo, + overageMo = overageMo, + estimatedTotalPriceEuro = estimatedTotal, + dataState = dataState, + nextAutoResetDate = settings.nextAutoResetDate(), + nextCutoffAtMillis = nextCutoffAt, + serviceRunning = true + ) + } + updateNotification(stateHolder.snapshot.value) + } + + private fun resetCutoffCycle() { + cutoffCycleAnchorMillis = null + inPulse = false + } + + private fun maybeAutoReset(settings: AppSettings) { + if (settings.autoResetEnabled && !LocalDate.now().isBefore(settings.nextAutoResetDate())) { + lifecycleScope.launch { + settingsRepository.resetPlan(usageRepository.totalMobileBytes(), settings.nextAutoResetDate()) + } + } + } + + private fun applyVpnMode(mode: VpnMode, whitelist: Set) { + if (mode == lastAppliedMode && (mode != VpnMode.FILTER || whitelist == lastAppliedWhitelist)) return + lastAppliedMode = mode + lastAppliedWhitelist = whitelist + when (mode) { + VpnMode.STOPPED -> ContextCompat.startForegroundService(this, FirewallVpnService.stopIntent(this)) + VpnMode.FILTER -> ContextCompat.startForegroundService( + this, FirewallVpnService.startFilterIntent(this, whitelist) + ) + VpnMode.BLOCK_ALL -> ContextCompat.startForegroundService( + this, FirewallVpnService.startBlockAllIntent(this) + ) + } + } + + private fun buildNotification(snapshot: MonitorSnapshot): Notification { + val nm = getSystemService(NotificationManager::class.java) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val channel = NotificationChannel( + CHANNEL_ID, + getString(R.string.notification_channel_name), + NotificationManager.IMPORTANCE_LOW + ).apply { description = getString(R.string.notification_channel_description) } + nm.createNotificationChannel(channel) + } + + val (emoji, stateLabel, color) = when { + !snapshot.serviceRunning -> Triple("⚪", getString(R.string.dashboard_control_disabled), Color.parseColor("#757575")) + snapshot.dataState == DataState.OK -> Triple("🟢", getString(R.string.dashboard_state_ok), Color.parseColor("#2E7D32")) + snapshot.dataState == DataState.WARNING -> Triple("🟠", getString(R.string.dashboard_state_warning), Color.parseColor("#EF6C00")) + snapshot.dataState == DataState.OVERRUN_FILTER -> Triple("🔴", getString(R.string.dashboard_state_overrun_filtered), Color.parseColor("#C62828")) + snapshot.dataState == DataState.OVERRUN_CUT -> Triple("🔴", getString(R.string.dashboard_state_overrun_cut), Color.parseColor("#C62828")) + else -> Triple("🔵", getString(R.string.dashboard_state_wifi), Color.parseColor("#1565C0")) + } + + val percentText = if (snapshot.planLimitMo > 0) { + "${(snapshot.consumedMo * 100 / snapshot.planLimitMo)}%" + } else "—" + val priceText = String.format("%.2f", snapshot.estimatedTotalPriceEuro) + + val contentText = "$emoji $stateLabel · ${snapshot.consumedMo}/${snapshot.planLimitMo} Mo ($percentText)" + val bigText = "$contentText\n${getString(R.string.dashboard_cost_total)} : $priceText €" + + val openApp = PendingIntent.getActivity( + this, 0, Intent(this, MainActivity::class.java), PendingIntent.FLAG_IMMUTABLE + ) + + return NotificationCompat.Builder(this, CHANNEL_ID) + .setContentTitle(getString(R.string.notification_title)) + .setContentText(contentText) + .setStyle(NotificationCompat.BigTextStyle().bigText(bigText)) + .setSmallIcon(R.drawable.ic_notification) + .setColor(color) + .setColorized(true) + .setOngoing(true) + .setOnlyAlertOnce(true) + .setPriority(NotificationCompat.PRIORITY_LOW) + .setContentIntent(openApp) + .build() + } + + private fun updateNotification(snapshot: MonitorSnapshot) { + val nm = getSystemService(NotificationManager::class.java) + nm.notify(NOTIF_ID, buildNotification(snapshot)) + } + + override fun onDestroy() { + runCatching { unregisterReceiver(vpnRevokedReceiver) } + super.onDestroy() + } + + companion object { + private const val CHANNEL_ID = "datacontrol_monitor" + private const val NOTIF_ID = 1001 + private const val TICK_INTERVAL_MS = 20_000L + private const val PULSE_DURATION_MS = 30_000L + private const val WARNING_THRESHOLD = 0.8f + + fun start(context: Context) { + ContextCompat.startForegroundService(context, Intent(context, DataMonitorService::class.java)) + } + + fun stop(context: Context) { + context.stopService(Intent(context, DataMonitorService::class.java)) + } + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/service/FirewallVpnService.kt b/app/src/main/java/com/jttools/datacontrol/service/FirewallVpnService.kt new file mode 100644 index 0000000..39c7b6b --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/service/FirewallVpnService.kt @@ -0,0 +1,171 @@ +package com.jttools.datacontrol.service + +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.net.VpnService +import android.os.Build +import android.os.ParcelFileDescriptor +import android.util.Log +import androidx.core.app.NotificationCompat +import com.jttools.datacontrol.MainActivity +import com.jttools.datacontrol.R +import java.io.FileInputStream + +/** + * Pare-feu local basé sur [VpnService], sans root. + * + * Ce service ne route ni ne transmet aucun paquet : les applications "autorisées" sont + * exclues du tunnel via [Builder.addDisallowedApplication] (leur trafic continue de + * transiter normalement par la vraie interface réseau). Toutes les autres applications + * voient leur trafic capturé dans le tunnel VPN puis silencieusement ignoré ("trou noir"), + * ce qui coupe leur accès Internet sans jamais toucher au Wi-Fi : ce service n'est démarré + * par [DataMonitorService] que lorsque le réseau actif est la donnée mobile. + */ +class FirewallVpnService : VpnService() { + + private var tunInterface: ParcelFileDescriptor? = null + private var readerThread: Thread? = null + @Volatile private var running = false + + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + when (intent?.action) { + ACTION_STOP -> { + stopTunnel() + stopSelf() + return START_NOT_STICKY + } + ACTION_START_FILTER, ACTION_START_BLOCK_ALL -> { + val allowed = intent.getStringArrayListExtra(EXTRA_ALLOWED_PACKAGES)?.toSet() ?: emptySet() + startForeground(NOTIF_ID, buildNotification()) + establishTunnel(allowed) + } + } + return START_STICKY + } + + private fun establishTunnel(allowedPackages: Set) { + stopTunnel(keepForeground = true) + + val builder = Builder() + .setSession("DataControl") + .addAddress(TUNNEL_ADDRESS, 32) + .addRoute("0.0.0.0", 0) + .setBlocking(true) + + // Notre propre app doit toujours pouvoir communiquer normalement. + addDisallowed(builder, packageName) + allowedPackages.forEach { addDisallowed(builder, it) } + + tunInterface = runCatching { builder.establish() }.getOrElse { + Log.e(TAG, "Échec établissement du tunnel VPN", it) + null + } + + val fd = tunInterface ?: return + running = true + readerThread = Thread({ blackhole(fd) }, "datacontrol-vpn-blackhole").apply { + isDaemon = true + start() + } + } + + private fun addDisallowed(builder: Builder, packageName: String) { + try { + builder.addDisallowedApplication(packageName) + } catch (e: PackageManager.NameNotFoundException) { + // Application désinstallée entre-temps : rien à exclure. + } + } + + /** Lit et jette tout paquet appartenant aux applications non-autorisées : leur trafic n'aboutit jamais. */ + private fun blackhole(fd: ParcelFileDescriptor) { + val input = FileInputStream(fd.fileDescriptor) + val buffer = ByteArray(32_767) + try { + while (running) { + val read = input.read(buffer) + if (read < 0) break + } + } catch (_ : Exception) { + // Interface fermée depuis stopTunnel() : fin normale du thread. + } + } + + private fun stopTunnel(keepForeground: Boolean = false) { + running = false + readerThread?.interrupt() + readerThread = null + tunInterface?.let { runCatching { it.close() } } + tunInterface = null + if (!keepForeground) { + stopForeground(STOP_FOREGROUND_REMOVE) + } + } + + override fun onRevoke() { + stopTunnel() + sendBroadcast(Intent(ACTION_VPN_REVOKED).setPackage(packageName)) + super.onRevoke() + } + + override fun onDestroy() { + stopTunnel() + super.onDestroy() + } + + private fun buildNotification(): Notification { + val nm = getSystemService(NotificationManager::class.java) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val channel = NotificationChannel( + CHANNEL_ID, + getString(R.string.notification_channel_name), + NotificationManager.IMPORTANCE_MIN + ) + nm.createNotificationChannel(channel) + } + val openApp = PendingIntent.getActivity( + this, 0, Intent(this, MainActivity::class.java), + PendingIntent.FLAG_IMMUTABLE + ) + return NotificationCompat.Builder(this, CHANNEL_ID) + .setContentTitle(getString(R.string.notification_title)) + .setSmallIcon(R.drawable.ic_notification) + .setPriority(NotificationCompat.PRIORITY_MIN) + .setContentIntent(openApp) + .setOngoing(true) + .build() + } + + companion object { + private const val TAG = "FirewallVpnService" + private const val CHANNEL_ID = "datacontrol_vpn" + private const val NOTIF_ID = 2001 + private const val TUNNEL_ADDRESS = "10.10.10.1" + + const val ACTION_START_FILTER = "com.jttools.datacontrol.action.VPN_START_FILTER" + const val ACTION_START_BLOCK_ALL = "com.jttools.datacontrol.action.VPN_START_BLOCK_ALL" + const val ACTION_STOP = "com.jttools.datacontrol.action.VPN_STOP" + const val ACTION_VPN_REVOKED = "com.jttools.datacontrol.action.VPN_REVOKED" + const val EXTRA_ALLOWED_PACKAGES = "allowed_packages" + + fun isPrepared(context: Context): Boolean = prepare(context) == null + + fun startFilterIntent(context: Context, allowedPackages: Collection): Intent = + Intent(context, FirewallVpnService::class.java) + .setAction(ACTION_START_FILTER) + .putStringArrayListExtra(EXTRA_ALLOWED_PACKAGES, ArrayList(allowedPackages)) + + fun startBlockAllIntent(context: Context): Intent = + Intent(context, FirewallVpnService::class.java) + .setAction(ACTION_START_BLOCK_ALL) + .putStringArrayListExtra(EXTRA_ALLOWED_PACKAGES, ArrayList()) + + fun stopIntent(context: Context): Intent = + Intent(context, FirewallVpnService::class.java).setAction(ACTION_STOP) + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/service/MonitorStateHolder.kt b/app/src/main/java/com/jttools/datacontrol/service/MonitorStateHolder.kt new file mode 100644 index 0000000..58680cc --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/service/MonitorStateHolder.kt @@ -0,0 +1,33 @@ +package com.jttools.datacontrol.service + +import com.jttools.datacontrol.data.DataState +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import java.time.LocalDate +import javax.inject.Inject +import javax.inject.Singleton + +data class MonitorSnapshot( + val consumedMo: Long = 0L, + val planLimitMo: Long = 0L, + val overageMo: Long = 0L, + val estimatedTotalPriceEuro: Double = 0.0, + val dataState: DataState = DataState.OK, + val nextAutoResetDate: LocalDate = LocalDate.now(), + val nextCutoffAtMillis: Long? = null, + val serviceRunning: Boolean = false +) + +/** + * Point de partage d'état entre [DataMonitorService] (producteur) et l'UI Compose (consommateur), + * pour que le tableau de bord reflète l'état réel même si l'Activity n'est pas liée au service. + */ +@Singleton +class MonitorStateHolder @Inject constructor() { + private val _snapshot = MutableStateFlow(MonitorSnapshot()) + val snapshot = _snapshot.asStateFlow() + + fun update(transform: (MonitorSnapshot) -> MonitorSnapshot) { + _snapshot.value = transform(_snapshot.value) + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/ui/SystemActions.kt b/app/src/main/java/com/jttools/datacontrol/ui/SystemActions.kt new file mode 100644 index 0000000..b201f47 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/ui/SystemActions.kt @@ -0,0 +1,78 @@ +package com.jttools.datacontrol.ui + +import android.annotation.SuppressLint +import android.app.NotificationManager +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.net.VpnService +import android.os.Build +import android.os.PowerManager +import android.provider.Settings +import androidx.activity.ComponentActivity +import androidx.activity.result.ActivityResultLauncher +import androidx.activity.result.contract.ActivityResultContracts +import androidx.core.content.ContextCompat +import com.jttools.datacontrol.service.FirewallVpnService + +/** + * Regroupe les autorisations système nécessaires (VPN, notifications, batterie) pour que + * les écrans Compose puissent les demander sans dépendre directement de l'Activity. + */ +class SystemActions(private val activity: ComponentActivity) { + + private var onVpnResult: ((Boolean) -> Unit)? = null + private var onNotificationResult: ((Boolean) -> Unit)? = null + + private val vpnLauncher: ActivityResultLauncher = activity.registerForActivityResult( + ActivityResultContracts.StartActivityForResult() + ) { result -> + onVpnResult?.invoke(result.resultCode == android.app.Activity.RESULT_OK) + } + + private val notificationLauncher: ActivityResultLauncher = activity.registerForActivityResult( + ActivityResultContracts.RequestPermission() + ) { granted -> onNotificationResult?.invoke(granted) } + + fun isVpnPrepared(): Boolean = FirewallVpnService.isPrepared(activity) + + fun requestVpnPermission(onResult: (Boolean) -> Unit) { + val intent = VpnService.prepare(activity) + if (intent == null) { + onResult(true) + } else { + onVpnResult = onResult + vpnLauncher.launch(intent) + } + } + + fun hasNotificationPermission(): Boolean { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return true + return ContextCompat.checkSelfPermission( + activity, android.Manifest.permission.POST_NOTIFICATIONS + ) == android.content.pm.PackageManager.PERMISSION_GRANTED + } + + fun requestNotificationPermission(onResult: (Boolean) -> Unit) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { + onResult(true) + return + } + onNotificationResult = onResult + notificationLauncher.launch(android.Manifest.permission.POST_NOTIFICATIONS) + } + + fun isIgnoringBatteryOptimizations(): Boolean { + val pm = activity.getSystemService(Context.POWER_SERVICE) as PowerManager + return pm.isIgnoringBatteryOptimizations(activity.packageName) + } + + @SuppressLint("BatteryLife") + fun requestIgnoreBatteryOptimizations() { + val intent = Intent( + Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, + Uri.parse("package:${activity.packageName}") + ) + activity.startActivity(intent) + } +} 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 new file mode 100644 index 0000000..b3b8cc0 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/ui/dashboard/DashboardScreen.kt @@ -0,0 +1,224 @@ +package com.jttools.datacontrol.ui.dashboard + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Surface +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.jttools.datacontrol.R +import com.jttools.datacontrol.data.DataState +import com.jttools.datacontrol.service.DataMonitorService +import com.jttools.datacontrol.ui.SystemActions +import com.jttools.datacontrol.ui.theme.StateCut +import com.jttools.datacontrol.ui.theme.StateOk +import com.jttools.datacontrol.ui.theme.StateWarning +import com.jttools.datacontrol.ui.theme.StateWifi +import java.time.format.DateTimeFormatter +import java.util.Locale + +@Composable +fun DashboardScreen(systemActions: SystemActions) { + val context = androidx.compose.ui.platform.LocalContext.current + val viewModel: DashboardViewModel = hiltViewModel() + val settings by viewModel.settings.collectAsStateWithLifecycle() + val snapshot by viewModel.snapshot.collectAsStateWithLifecycle() + var showResetDialog by remember { mutableStateOf(false) } + + val stateColor = when { + !snapshot.serviceRunning -> Color.Gray + snapshot.dataState == DataState.OK -> StateOk + snapshot.dataState == DataState.WARNING -> StateWarning + snapshot.dataState == DataState.WIFI -> StateWifi + else -> StateCut + } + val stateLabel = when { + !snapshot.serviceRunning -> stringResource(R.string.dashboard_control_disabled) + snapshot.dataState == DataState.OK -> stringResource(R.string.dashboard_state_ok) + snapshot.dataState == DataState.WARNING -> stringResource(R.string.dashboard_state_warning) + snapshot.dataState == DataState.OVERRUN_FILTER -> stringResource(R.string.dashboard_state_overrun_filtered) + snapshot.dataState == DataState.OVERRUN_CUT -> stringResource(R.string.dashboard_state_overrun_cut) + else -> stringResource(R.string.dashboard_state_wifi) + } + + val consumedMo = if (snapshot.serviceRunning) snapshot.consumedMo else 0L + val planLimitMo = settings.planLimitMo.coerceAtLeast(1L) + val progress = (consumedMo.toFloat() / planLimitMo.toFloat()).coerceIn(0f, 1f) + val overageMo = (consumedMo - settings.planLimitMo).coerceAtLeast(0L) + val estimatedTotal = settings.planPriceEuro + overageMo * settings.overagePricePerMoEuro + + Column( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(20.dp), + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + Text( + stringResource(R.string.dashboard_title), + style = MaterialTheme.typography.headlineMedium + ) + + // Carte état + consommation + Card(shape = RoundedCornerShape(20.dp), elevation = CardDefaults.cardElevation(2.dp)) { + Column(Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + Surface(shape = RoundedCornerShape(50), color = stateColor, modifier = Modifier.size(14.dp)) {} + Text(stateLabel, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + } + + Text(stringResource(R.string.dashboard_consumed), style = MaterialTheme.typography.bodyMedium) + Text( + "$consumedMo / ${settings.planLimitMo} Mo", + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Bold + ) + LinearProgressIndicator( + progress = { progress }, + modifier = Modifier + .fillMaxWidth() + .height(10.dp), + color = stateColor, + trackColor = MaterialTheme.colorScheme.surfaceVariant + ) + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) { + Text( + "${stringResource(R.string.dashboard_remaining)}: ${(settings.planLimitMo - consumedMo).coerceAtLeast(0L)} Mo", + style = MaterialTheme.typography.bodyMedium + ) + if (overageMo > 0) { + Text( + "${stringResource(R.string.dashboard_overage)}: $overageMo Mo", + style = MaterialTheme.typography.bodyMedium, + color = StateCut + ) + } + } + } + } + + // Carte coût estimé + Card(shape = RoundedCornerShape(20.dp), elevation = CardDefaults.cardElevation(2.dp)) { + Column(Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Text(stringResource(R.string.dashboard_cost_title), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + HorizontalDivider() + CostRow(stringResource(R.string.dashboard_cost_plan), settings.planPriceEuro) + CostRow(stringResource(R.string.dashboard_cost_overage), overageMo * settings.overagePricePerMoEuro) + HorizontalDivider() + CostRow(stringResource(R.string.dashboard_cost_total), estimatedTotal, emphasize = true) + } + } + + // Carte contrôle + Card(shape = RoundedCornerShape(20.dp), elevation = CardDefaults.cardElevation(2.dp)) { + Column(Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(14.dp)) { + Row( + Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + if (settings.controlEnabled) stringResource(R.string.dashboard_toggle_disable) + else stringResource(R.string.dashboard_toggle_enable), + style = MaterialTheme.typography.titleMedium + ) + Switch( + checked = settings.controlEnabled, + onCheckedChange = { checked -> + if (checked) { + systemActions.requestNotificationPermission { _ -> + systemActions.requestVpnPermission { granted -> + if (granted) { + viewModel.setControlEnabled(true) + DataMonitorService.start(context) + } + } + } + } else { + viewModel.setControlEnabled(false) + } + } + ) + } + + Text( + "${stringResource(R.string.dashboard_next_reset)}: ${ + settings.nextAutoResetDate().format( + DateTimeFormatter.ofPattern("d MMMM yyyy", Locale.FRENCH) + ) + }", + style = MaterialTheme.typography.bodyMedium + ) + + OutlinedButton(onClick = { showResetDialog = true }, modifier = Modifier.fillMaxWidth()) { + Text(stringResource(R.string.dashboard_reset_now)) + } + } + } + } + + if (showResetDialog) { + AlertDialog( + onDismissRequest = { showResetDialog = false }, + title = { Text(stringResource(R.string.dashboard_reset_confirm_title)) }, + text = { Text(stringResource(R.string.dashboard_reset_confirm_message)) }, + confirmButton = { + Button(onClick = { + viewModel.resetPlanNow() + showResetDialog = false + }) { Text(stringResource(R.string.common_confirm)) } + }, + dismissButton = { + OutlinedButton(onClick = { showResetDialog = false }) { + Text(stringResource(R.string.common_cancel)) + } + } + ) + } +} + +@Composable +private fun CostRow(label: String, value: Double, emphasize: Boolean = false) { + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) { + Text( + label, + style = if (emphasize) MaterialTheme.typography.titleMedium else MaterialTheme.typography.bodyMedium, + fontWeight = if (emphasize) FontWeight.Bold else FontWeight.Normal + ) + Text( + String.format(Locale.FRENCH, "%.2f €", value), + style = if (emphasize) MaterialTheme.typography.titleMedium else MaterialTheme.typography.bodyMedium, + fontWeight = if (emphasize) FontWeight.Bold else FontWeight.Normal + ) + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/ui/dashboard/DashboardViewModel.kt b/app/src/main/java/com/jttools/datacontrol/ui/dashboard/DashboardViewModel.kt new file mode 100644 index 0000000..ecd9ab5 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/ui/dashboard/DashboardViewModel.kt @@ -0,0 +1,35 @@ +package com.jttools.datacontrol.ui.dashboard + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.jttools.datacontrol.data.AppSettings +import com.jttools.datacontrol.data.SettingsRepository +import com.jttools.datacontrol.data.UsageRepository +import com.jttools.datacontrol.service.MonitorStateHolder +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class DashboardViewModel @Inject constructor( + private val settingsRepository: SettingsRepository, + private val usageRepository: UsageRepository, + stateHolder: MonitorStateHolder +) : ViewModel() { + + val settings = settingsRepository.settingsFlow.stateIn( + viewModelScope, SharingStarted.WhileSubscribed(5_000), AppSettings() + ) + + val snapshot = stateHolder.snapshot + + fun setControlEnabled(enabled: Boolean) { + viewModelScope.launch { settingsRepository.setControlEnabled(enabled) } + } + + fun resetPlanNow() { + viewModelScope.launch { settingsRepository.resetPlan(usageRepository.totalMobileBytes()) } + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/ui/navigation/DataControlNavHost.kt b/app/src/main/java/com/jttools/datacontrol/ui/navigation/DataControlNavHost.kt new file mode 100644 index 0000000..5506f5b --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/ui/navigation/DataControlNavHost.kt @@ -0,0 +1,74 @@ +package com.jttools.datacontrol.ui.navigation + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.List +import androidx.compose.material.icons.filled.Dashboard +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material3.Icon +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.foundation.layout.padding +import androidx.compose.ui.Modifier +import androidx.navigation.NavDestination.Companion.hierarchy +import androidx.navigation.NavGraph.Companion.findStartDestination +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.rememberNavController +import androidx.compose.ui.res.stringResource +import com.jttools.datacontrol.R +import com.jttools.datacontrol.ui.SystemActions +import com.jttools.datacontrol.ui.dashboard.DashboardScreen +import com.jttools.datacontrol.ui.settings.SettingsScreen +import com.jttools.datacontrol.ui.whitelist.WhitelistScreen + +private sealed class Destination(val route: String, val labelRes: Int, val icon: androidx.compose.ui.graphics.vector.ImageVector) { + data object Dashboard : Destination("dashboard", R.string.nav_dashboard, Icons.Filled.Dashboard) + data object Settings : Destination("settings", R.string.nav_settings, Icons.Filled.Settings) + data object Whitelist : Destination("whitelist", R.string.nav_whitelist, Icons.AutoMirrored.Filled.List) +} + +private val destinations = listOf(Destination.Dashboard, Destination.Settings, Destination.Whitelist) + +@Composable +fun DataControlNavHost(systemActions: SystemActions) { + val navController = rememberNavController() + + Scaffold( + bottomBar = { + NavigationBar { + val backStackEntry by navController.currentBackStackEntryAsState() + val currentDestination = backStackEntry?.destination + destinations.forEach { destination -> + val selected = currentDestination?.hierarchy?.any { it.route == destination.route } == true + NavigationBarItem( + selected = selected, + onClick = { + navController.navigate(destination.route) { + popUpTo(navController.graph.findStartDestination().id) { saveState = true } + launchSingleTop = true + restoreState = true + } + }, + icon = { Icon(destination.icon, contentDescription = null) }, + label = { Text(stringResource(destination.labelRes)) } + ) + } + } + } + ) { padding -> + NavHost( + navController = navController, + startDestination = Destination.Dashboard.route, + modifier = Modifier.padding(padding) + ) { + composable(Destination.Dashboard.route) { DashboardScreen(systemActions) } + composable(Destination.Settings.route) { SettingsScreen(systemActions) } + composable(Destination.Whitelist.route) { WhitelistScreen() } + } + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/ui/settings/SettingsScreen.kt b/app/src/main/java/com/jttools/datacontrol/ui/settings/SettingsScreen.kt new file mode 100644 index 0000000..4d31f56 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/ui/settings/SettingsScreen.kt @@ -0,0 +1,234 @@ +package com.jttools.datacontrol.ui.settings + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.DatePicker +import androidx.compose.material3.DatePickerDialog +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.material3.rememberDatePickerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +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.font.FontWeight +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.jttools.datacontrol.R +import com.jttools.datacontrol.ui.SystemActions +import java.time.Instant +import java.time.LocalDate +import java.time.ZoneOffset +import java.time.format.DateTimeFormatter +import java.util.Locale + +@OptIn(androidx.compose.material3.ExperimentalMaterial3Api::class) +@Composable +fun SettingsScreen(systemActions: SystemActions) { + val viewModel: SettingsViewModel = hiltViewModel() + val settings by viewModel.settings.collectAsStateWithLifecycle() + + var planLimitText by remember(settings.planLimitMo) { mutableStateOf(settings.planLimitMo.toString()) } + var planPriceText by remember(settings.planPriceEuro) { mutableStateOf(settings.planPriceEuro.toString()) } + var overagePriceText by remember(settings.overagePricePerMoEuro) { mutableStateOf(settings.overagePricePerMoEuro.toString()) } + var cutoffText by remember(settings.cutoffIntervalMinutes) { mutableStateOf(settings.cutoffIntervalMinutes.toString()) } + var autoReset by remember(settings.autoResetEnabled) { mutableStateOf(settings.autoResetEnabled) } + var showDatePicker by remember { mutableStateOf(false) } + + var vpnGranted by remember { mutableStateOf(systemActions.isVpnPrepared()) } + var notifGranted by remember { mutableStateOf(systemActions.hasNotificationPermission()) } + var batteryIgnored by remember { mutableStateOf(systemActions.isIgnoringBatteryOptimizations()) } + + LaunchedEffect(Unit) { + vpnGranted = systemActions.isVpnPrepared() + notifGranted = systemActions.hasNotificationPermission() + batteryIgnored = systemActions.isIgnoringBatteryOptimizations() + } + + Column( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(20.dp), + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + Text(stringResource(R.string.settings_title), style = MaterialTheme.typography.headlineMedium) + + Card(shape = RoundedCornerShape(20.dp), elevation = CardDefaults.cardElevation(2.dp)) { + Column(Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(14.dp)) { + Text(stringResource(R.string.settings_section_plan), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + + OutlinedTextField( + value = planLimitText, + onValueChange = { planLimitText = it.filter(Char::isDigit) }, + label = { Text(stringResource(R.string.settings_plan_limit_mo)) }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = planPriceText, + onValueChange = { planPriceText = it.filter { c -> c.isDigit() || c == '.' } }, + label = { Text(stringResource(R.string.settings_plan_price)) }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal), + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = overagePriceText, + onValueChange = { overagePriceText = it.filter { c -> c.isDigit() || c == '.' } }, + label = { Text(stringResource(R.string.settings_overage_price)) }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal), + modifier = Modifier.fillMaxWidth() + ) + + Row( + Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Column { + Text(stringResource(R.string.settings_start_date), style = MaterialTheme.typography.bodyMedium) + Text( + settings.planStartDate.format(DateTimeFormatter.ofPattern("d MMMM yyyy", Locale.FRENCH)), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold + ) + } + OutlinedButton(onClick = { showDatePicker = true }) { Text(stringResource(R.string.settings_edit_date)) } + } + + Row( + Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text(stringResource(R.string.settings_auto_reset), style = MaterialTheme.typography.bodyMedium) + Switch(checked = autoReset, onCheckedChange = { autoReset = it }) + } + } + } + + Card(shape = RoundedCornerShape(20.dp), elevation = CardDefaults.cardElevation(2.dp)) { + Column(Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { + Text(stringResource(R.string.settings_section_cutoff), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + OutlinedTextField( + value = cutoffText, + onValueChange = { cutoffText = it.filter(Char::isDigit) }, + label = { Text(stringResource(R.string.settings_cutoff_interval)) }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.fillMaxWidth() + ) + Text( + stringResource(R.string.settings_cutoff_help), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + + Card(shape = RoundedCornerShape(20.dp), elevation = CardDefaults.cardElevation(2.dp)) { + Column(Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text(stringResource(R.string.settings_section_permissions), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + HorizontalDivider() + PermissionRow( + title = stringResource(R.string.settings_perm_vpn), + description = stringResource(R.string.settings_perm_vpn_desc), + granted = vpnGranted + ) { systemActions.requestVpnPermission { vpnGranted = it } } + + PermissionRow( + title = stringResource(R.string.settings_perm_notifications), + description = stringResource(R.string.settings_perm_notifications_desc), + granted = notifGranted + ) { systemActions.requestNotificationPermission { notifGranted = it } } + + PermissionRow( + title = stringResource(R.string.settings_perm_battery), + description = stringResource(R.string.settings_perm_battery_desc), + granted = batteryIgnored + ) { + systemActions.requestIgnoreBatteryOptimizations() + batteryIgnored = systemActions.isIgnoringBatteryOptimizations() + } + } + } + + Button( + onClick = { + viewModel.updatePlan( + planLimitMo = planLimitText.toLongOrNull() ?: settings.planLimitMo, + planPriceEuro = planPriceText.toDoubleOrNull() ?: settings.planPriceEuro, + overagePricePerMoEuro = overagePriceText.toDoubleOrNull() ?: settings.overagePricePerMoEuro, + cutoffIntervalMinutes = cutoffText.toIntOrNull()?.coerceAtLeast(1) ?: settings.cutoffIntervalMinutes, + autoResetEnabled = autoReset + ) + }, + modifier = Modifier.fillMaxWidth() + ) { Text(stringResource(R.string.settings_save)) } + } + + if (showDatePicker) { + val datePickerState = rememberDatePickerState( + initialSelectedDateMillis = settings.planStartDate.atStartOfDay(ZoneOffset.UTC).toInstant().toEpochMilli() + ) + DatePickerDialog( + onDismissRequest = { showDatePicker = false }, + confirmButton = { + Button(onClick = { + datePickerState.selectedDateMillis?.let { millis -> + val date = Instant.ofEpochMilli(millis).atZone(ZoneOffset.UTC).toLocalDate() + viewModel.setStartDate(date) + } + showDatePicker = false + }) { Text(stringResource(R.string.common_confirm)) } + }, + dismissButton = { + OutlinedButton(onClick = { showDatePicker = false }) { Text(stringResource(R.string.common_cancel)) } + } + ) { DatePicker(state = datePickerState) } + } +} + +@Composable +private fun PermissionRow(title: String, description: String, granted: Boolean, onRequest: () -> Unit) { + Row( + Modifier.fillMaxWidth().padding(vertical = 10.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Column(Modifier.weight(1f)) { + Text(title, style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Medium) + Text(description, style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant) + } + if (granted) { + Text( + stringResource(R.string.settings_perm_granted), + color = com.jttools.datacontrol.ui.theme.StateOk, + style = MaterialTheme.typography.labelLarge + ) + } else { + OutlinedButton(onClick = onRequest) { Text(stringResource(R.string.settings_perm_missing)) } + } + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/ui/settings/SettingsViewModel.kt b/app/src/main/java/com/jttools/datacontrol/ui/settings/SettingsViewModel.kt new file mode 100644 index 0000000..3914f00 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/ui/settings/SettingsViewModel.kt @@ -0,0 +1,40 @@ +package com.jttools.datacontrol.ui.settings + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.jttools.datacontrol.data.AppSettings +import com.jttools.datacontrol.data.SettingsRepository +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch +import java.time.LocalDate +import javax.inject.Inject + +@HiltViewModel +class SettingsViewModel @Inject constructor( + private val settingsRepository: SettingsRepository +) : ViewModel() { + + val settings = settingsRepository.settingsFlow.stateIn( + viewModelScope, SharingStarted.WhileSubscribed(5_000), AppSettings() + ) + + fun updatePlan( + planLimitMo: Long, + planPriceEuro: Double, + overagePricePerMoEuro: Double, + cutoffIntervalMinutes: Int, + autoResetEnabled: Boolean + ) { + viewModelScope.launch { + settingsRepository.updatePlan( + planLimitMo, planPriceEuro, overagePricePerMoEuro, cutoffIntervalMinutes, autoResetEnabled + ) + } + } + + fun setStartDate(date: LocalDate) { + viewModelScope.launch { settingsRepository.setStartDate(date) } + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/ui/theme/Color.kt b/app/src/main/java/com/jttools/datacontrol/ui/theme/Color.kt new file mode 100644 index 0000000..931e73d --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/ui/theme/Color.kt @@ -0,0 +1,45 @@ +package com.jttools.datacontrol.ui.theme + +import androidx.compose.ui.graphics.Color + +// Primary - Deep Teal +val Primary = Color(0xFF00695C) +val PrimaryVariant = Color(0xFF004D40) +val OnPrimary = Color(0xFFFFFFFF) + +// Secondary - Cyan accent +val Secondary = Color(0xFF00BFA5) +val SecondaryVariant = Color(0xFF00897B) +val OnSecondary = Color(0xFF000000) + +// Tertiary - Amber (alertes) +val Tertiary = Color(0xFFFFA000) +val OnTertiary = Color(0xFF000000) + +// Background/Surface +val Background = Color(0xFFF3F6F5) +val OnBackground = Color(0xFF1B1F1E) +val Surface = Color(0xFFFFFFFF) +val OnSurface = Color(0xFF1B1F1E) +val SurfaceVariant = Color(0xFFDCE9E6) + +// Error +val Error = Color(0xFFB3261E) +val OnError = Color(0xFFFFFFFF) + +// Dark theme variants +val DarkPrimary = Color(0xFF4DB6AC) +val DarkPrimaryVariant = Color(0xFF00897B) +val DarkOnPrimary = Color(0xFF00201C) +val DarkSecondary = Color(0xFF64FFDA) +val DarkBackground = Color(0xFF121212) +val DarkOnBackground = Color(0xFFE4E6E5) +val DarkSurface = Color(0xFF1E1E1E) +val DarkOnSurface = Color(0xFFE4E6E5) +val DarkSurfaceVariant = Color(0xFF1B3B36) + +// États data (utilisés dans Dashboard + notification) +val StateOk = Color(0xFF2E7D32) // vert — sous le forfait +val StateWarning = Color(0xFFEF6C00) // orange — proche du forfait +val StateCut = Color(0xFFC62828) // rouge — coupure / hors-forfait +val StateWifi = Color(0xFF1565C0) // bleu — Wi-Fi, aucun filtrage diff --git a/app/src/main/java/com/jttools/datacontrol/ui/theme/Theme.kt b/app/src/main/java/com/jttools/datacontrol/ui/theme/Theme.kt new file mode 100644 index 0000000..a7e67ca --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/ui/theme/Theme.kt @@ -0,0 +1,75 @@ +package com.jttools.datacontrol.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +private val DarkColorScheme = darkColorScheme( + primary = DarkPrimary, + onPrimary = DarkOnPrimary, + primaryContainer = DarkPrimaryVariant, + secondary = DarkSecondary, + background = DarkBackground, + surface = DarkSurface, + onBackground = DarkOnBackground, + onSurface = DarkOnSurface, + surfaceVariant = DarkSurfaceVariant, + error = Error, + onError = OnError +) + +private val LightColorScheme = lightColorScheme( + primary = Primary, + onPrimary = OnPrimary, + primaryContainer = SurfaceVariant, + secondary = Secondary, + background = Background, + surface = Surface, + onBackground = OnBackground, + onSurface = OnSurface, + surfaceVariant = SurfaceVariant, + error = Error, + onError = OnError +) + +@Composable +fun DataControlTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val context = LocalContext.current + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} diff --git a/app/src/main/java/com/jttools/datacontrol/ui/theme/Type.kt b/app/src/main/java/com/jttools/datacontrol/ui/theme/Type.kt new file mode 100644 index 0000000..4dc98c8 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/ui/theme/Type.kt @@ -0,0 +1,39 @@ +package com.jttools.datacontrol.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +val Typography = Typography( + headlineMedium = TextStyle( + fontWeight = FontWeight.Bold, + fontSize = 28.sp, + lineHeight = 34.sp + ), + titleLarge = TextStyle( + fontWeight = FontWeight.SemiBold, + fontSize = 22.sp, + lineHeight = 28.sp + ), + titleMedium = TextStyle( + fontWeight = FontWeight.Medium, + fontSize = 16.sp, + lineHeight = 24.sp + ), + bodyLarge = TextStyle( + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp + ), + bodyMedium = TextStyle( + fontWeight = FontWeight.Normal, + fontSize = 14.sp, + lineHeight = 20.sp + ), + labelLarge = TextStyle( + fontWeight = FontWeight.Medium, + fontSize = 14.sp, + lineHeight = 20.sp + ) +) diff --git a/app/src/main/java/com/jttools/datacontrol/ui/whitelist/WhitelistScreen.kt b/app/src/main/java/com/jttools/datacontrol/ui/whitelist/WhitelistScreen.kt new file mode 100644 index 0000000..449d806 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/ui/whitelist/WhitelistScreen.kt @@ -0,0 +1,129 @@ +package com.jttools.datacontrol.ui.whitelist + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Search +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Checkbox +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.core.graphics.drawable.toBitmap +import androidx.hilt.navigation.compose.hiltViewModel +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.jttools.datacontrol.R +import com.jttools.datacontrol.data.AppInfo + +@Composable +fun WhitelistScreen() { + val viewModel: WhitelistViewModel = hiltViewModel() + val settings by viewModel.settings.collectAsStateWithLifecycle() + val apps by viewModel.apps.collectAsStateWithLifecycle() + val loading by viewModel.loading.collectAsStateWithLifecycle() + var query by remember { mutableStateOf("") } + + val filtered = apps + .filter { settings.showSystemApps || !it.isSystemApp } + .filter { it.label.contains(query, ignoreCase = true) || it.packageName.contains(query, ignoreCase = true) } + + Column(Modifier.fillMaxSize().padding(20.dp)) { + Text(stringResource(R.string.whitelist_title), style = MaterialTheme.typography.headlineMedium) + Text( + stringResource(R.string.whitelist_description), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(top = 6.dp, bottom = 14.dp) + ) + + OutlinedTextField( + value = query, + onValueChange = { query = it }, + leadingIcon = { Icon(Icons.Filled.Search, contentDescription = null) }, + label = { Text(stringResource(R.string.whitelist_search_hint)) }, + singleLine = true, + modifier = Modifier.fillMaxWidth() + ) + + Row( + Modifier.fillMaxWidth().padding(vertical = 10.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text(stringResource(R.string.whitelist_system_apps_toggle), style = MaterialTheme.typography.bodyMedium) + Switch(checked = settings.showSystemApps, onCheckedChange = { viewModel.setShowSystemApps(it) }) + } + HorizontalDivider() + + if (loading) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { CircularProgressIndicator() } + } else { + LazyColumn { + items(filtered, key = { it.packageName }) { app -> + AppRow( + app = app, + checked = settings.whitelistedPackages.contains(app.packageName), + onCheckedChange = { viewModel.setWhitelisted(app.packageName, it) } + ) + } + } + } + } +} + +@Composable +private fun AppRow(app: AppInfo, checked: Boolean, onCheckedChange: (Boolean) -> Unit) { + Row( + Modifier.fillMaxWidth().padding(vertical = 6.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(14.dp) + ) { + AppIcon(app) + Column(Modifier.weight(1f)) { + Text(app.label, style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Medium) + Text(app.packageName, style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant) + } + Checkbox(checked = checked, onCheckedChange = onCheckedChange) + } +} + +@Composable +private fun AppIcon(app: AppInfo) { + val bitmap = remember(app.packageName) { + app.icon?.let { runCatching { it.toBitmap(width = 96, height = 96).asImageBitmap() }.getOrNull() } + } + if (bitmap != null) { + Image(bitmap = bitmap, contentDescription = null, modifier = Modifier.size(40.dp)) + } else { + Box( + modifier = Modifier + .size(40.dp) + .background(MaterialTheme.colorScheme.surfaceVariant, CircleShape) + ) + } +} diff --git a/app/src/main/java/com/jttools/datacontrol/ui/whitelist/WhitelistViewModel.kt b/app/src/main/java/com/jttools/datacontrol/ui/whitelist/WhitelistViewModel.kt new file mode 100644 index 0000000..fbd97a6 --- /dev/null +++ b/app/src/main/java/com/jttools/datacontrol/ui/whitelist/WhitelistViewModel.kt @@ -0,0 +1,51 @@ +package com.jttools.datacontrol.ui.whitelist + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.jttools.datacontrol.data.AppInfo +import com.jttools.datacontrol.data.AppSettings +import com.jttools.datacontrol.data.InstalledAppsRepository +import com.jttools.datacontrol.data.SettingsRepository +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class WhitelistViewModel @Inject constructor( + private val settingsRepository: SettingsRepository, + private val installedAppsRepository: InstalledAppsRepository +) : ViewModel() { + + val settings = settingsRepository.settingsFlow.stateIn( + viewModelScope, SharingStarted.WhileSubscribed(5_000), AppSettings() + ) + + private val _apps = MutableStateFlow>(emptyList()) + val apps = _apps.asStateFlow() + + private val _loading = MutableStateFlow(true) + val loading = _loading.asStateFlow() + + init { + viewModelScope.launch { + _apps.value = installedAppsRepository.listInstalledApps() + _loading.value = false + } + } + + fun setWhitelisted(packageName: String, whitelisted: Boolean) { + viewModelScope.launch { + val current = settings.value.whitelistedPackages + val updated = if (whitelisted) current + packageName else current - packageName + settingsRepository.setWhitelistedPackages(updated) + } + } + + fun setShowSystemApps(show: Boolean) { + viewModelScope.launch { settingsRepository.setShowSystemApps(show) } + } +} diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..d4037e7 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,14 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..a6a5ae1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml new file mode 100644 index 0000000..3750320 --- /dev/null +++ b/app/src/main/res/drawable/ic_notification.xml @@ -0,0 +1,11 @@ + + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.xml b/app/src/main/res/mipmap-hdpi/ic_launcher.xml new file mode 100644 index 0000000..d378acd --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-hdpi/ic_launcher_round.xml new file mode 100644 index 0000000..d378acd --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.xml b/app/src/main/res/mipmap-mdpi/ic_launcher.xml new file mode 100644 index 0000000..d378acd --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-mdpi/ic_launcher_round.xml new file mode 100644 index 0000000..d378acd --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.xml b/app/src/main/res/mipmap-xhdpi/ic_launcher.xml new file mode 100644 index 0000000..d378acd --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.xml new file mode 100644 index 0000000..d378acd --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.xml b/app/src/main/res/mipmap-xxhdpi/ic_launcher.xml new file mode 100644 index 0000000..d378acd --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.xml new file mode 100644 index 0000000..d378acd --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.xml b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.xml new file mode 100644 index 0000000..d378acd --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.xml new file mode 100644 index 0000000..d378acd --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..05811dd --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #00695C + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..e259bbf --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,77 @@ + + + DataControl + + + Tableau de bord + Réglages + Liste blanche + + + Tableau de bord + Données consommées + Forfait + Restant + Dépassement + État des données + Sous le forfait + Proche du forfait + Hors-forfait — liste blanche seule + Hors-forfait — coupure en cours + Wi-Fi actif — aucun filtrage + Estimation du coût + Prix du forfait + Coût hors-forfait + Total estimé + Prochaine réinitialisation + Activer le contrôle + Désactiver le contrôle + Réinitialiser le forfait maintenant + Réinitialiser le forfait ? + Le compteur de données consommées sera remis à zéro immédiatement. + Autorisations requises pour fonctionner correctement + Contrôle désactivé + + + Réglages + Forfait + Forfait data (Mo) + Prix du forfait (€) + Prix par Mo hors-forfait (€) + Date de début du forfait + Réinitialisation automatique mensuelle + Coupure automatique + Intervalle de coupure (minutes) + Une fois le forfait dépassé, une coupure totale (même pour la liste blanche) se déclenche brièvement à cet intervalle. + Autorisations + Accès aux statistiques d\'utilisation + Nécessaire pour mesurer la consommation de données mobiles + Pare-feu local (VPN) + Nécessaire pour filtrer les applications sur les données mobiles + Notifications + Nécessaire pour afficher l\'état des données en continu + Optimisation de la batterie + Ignorer l\'optimisation pour que la surveillance ne soit pas interrompue + Accordée + Manquante + Enregistrer + Modifier + Réglages enregistrés + + + Liste blanche + Ces applications gardent toujours accès aux données mobiles, y compris en dépassement de forfait (sauf pendant les coupures cycliques totales). + Rechercher une application + Afficher les applications système + + + Surveillance des données + Affiche la consommation de données et l\'état de la coupure + DataControl + + + Mo + € + Annuler + Confirmer + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..a18a178 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..5eab9ca --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..fa29768 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..ae12654 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,7 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.hilt.android) apply false + alias(libs.plugins.kotlin.kapt) apply false +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..79a59de --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.configuration-cache=false +android.useAndroidX=true +kotlin.code.style=official +android.nonTransitiveRClass=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..cc998bd --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,50 @@ +[versions] +agp = "8.5.0" +kotlin = "1.9.24" +coreKtx = "1.13.1" +junit = "4.13.2" +junitVersion = "1.2.1" +espressoCore = "3.6.1" +composeBom = "2024.09.00" +activityCompose = "1.9.2" +lifecycleViewmodelCompose = "2.8.5" +lifecycleRuntimeCompose = "2.8.5" +lifecycleService = "2.8.5" +navigationCompose = "2.8.2" +hilt = "2.51.1" +hiltNavigationCompose = "1.2.0" +datastore = "1.1.1" +coroutines = "1.8.1" +workManager = "2.9.1" + +[libraries] +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" } +androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntimeCompose" } +androidx-lifecycle-service = { group = "androidx.lifecycle", name = "lifecycle-service", version.ref = "lifecycleService" } +androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" } +hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" } +hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" } +androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltNavigationCompose" } +androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" } +kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" } +androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "workManager" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } +kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..8bdaf60c75ab801e22807dde59e12a8735a34077 GIT binary patch literal 45457 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 c82=K%QXLKFx%@O{wJjEi6Y56o#$)Bpeg literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..37f853b --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..ef07e01 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..5eed7ee --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..91eac22 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,23 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "DataControl" +include(":app") diff --git a/version.properties b/version.properties new file mode 100644 index 0000000..de6b9ea --- /dev/null +++ b/version.properties @@ -0,0 +1,2 @@ +versionName=0.1.0 +versionCode=1