From a8532917b40d303dfa5d044dc0b545fbb3ef0e08 Mon Sep 17 00:00:00 2001 From: jjangddu Date: Mon, 9 Mar 2026 17:27:00 +0900 Subject: [PATCH] Initial commit: VesiscanBasic Android app Port of MedilightV2 iOS app to Android with Kotlin + Jetpack Compose. Includes BLE connectivity, NIRS/Piezo sensor modes, Rive animations, interactive measurement history charts, and foldable device support. Co-Authored-By: Claude Opus 4.6 --- .gitignore | 11 + app/.gitignore | 1 + app/build.gradle.kts | 67 +++ app/proguard-rules.pro | 21 + .../ExampleInstrumentedTest.kt | 24 + app/src/main/AndroidManifest.xml | 43 ++ .../example/medilightv2android/AppState.kt | 176 +++++++ .../medilightv2android/MainActivity.kt | 79 +++ .../medilightv2android/ble/BleManager.kt | 462 ++++++++++++++++++ .../example/medilightv2android/ble/CRC16.kt | 60 +++ .../managers/NirsCalcEngine.kt | 206 ++++++++ .../managers/NirsManager.kt | 85 ++++ .../medilightv2android/models/BladderLevel.kt | 28 ++ .../models/MeasurementRecord.kt | 35 ++ .../models/NirsConstants.kt | 49 ++ .../medilightv2android/models/NirsData.kt | 90 ++++ .../models/PiezoSettings.kt | 18 + .../medilightv2android/models/SensorMode.kt | 6 + .../medilightv2android/models/UrgencyLevel.kt | 50 ++ .../example/medilightv2android/models/User.kt | 9 + .../services/KeychainService.kt | 35 ++ .../services/MeasurementHistoryStore.kt | 47 ++ .../services/MeasurementService.kt | 50 ++ .../services/NotificationService.kt | 77 +++ .../services/UserStorage.kt | 98 ++++ .../ui/components/BladdyRiveView.kt | 121 +++++ .../ui/components/BleDisconnectionBanner.kt | 82 ++++ .../ui/components/DonutChartView.kt | 52 ++ .../medilightv2android/ui/theme/Color.kt | 20 + .../medilightv2android/ui/theme/Theme.kt | 58 +++ .../medilightv2android/ui/theme/Type.kt | 34 ++ .../ui/views/calibration/CalibrationView.kt | 207 ++++++++ .../ui/views/connection/DeviceScanView.kt | 382 +++++++++++++++ .../views/history/MeasurementHistoryView.kt | 451 +++++++++++++++++ .../ui/views/home/HomeView.kt | 69 +++ .../views/monitoring/PiezoMonitoringView.kt | 322 ++++++++++++ .../views/monitoring/VivamyoMonitoringView.kt | 347 +++++++++++++ .../ui/views/onboarding/OnboardingView.kt | 140 ++++++ .../PiezoPersonalizationView.kt | 306 ++++++++++++ .../ui/views/pin/PinView.kt | 127 +++++ .../ui/views/pin/ShuffledKeypad.kt | 83 ++++ .../ui/views/registration/RegistrationView.kt | 181 +++++++ .../ui/views/sensorselect/SensorSelectView.kt | 124 +++++ .../res/drawable/ic_launcher_background.xml | 170 +++++++ .../res/drawable/ic_launcher_foreground.xml | 30 ++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 + app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes app/src/main/res/raw/bladdy_final12.riv | Bin 0 -> 25229 bytes app/src/main/res/raw/bladdy_loading3.riv | Bin 0 -> 18608 bytes app/src/main/res/values/colors.xml | 10 + app/src/main/res/values/strings.xml | 3 + app/src/main/res/values/themes.xml | 5 + app/src/main/res/xml/backup_rules.xml | 13 + .../main/res/xml/data_extraction_rules.xml | 19 + .../medilightv2android/ExampleUnitTest.kt | 17 + build.gradle.kts | 6 + gradle.properties | 23 + gradle/libs.versions.toml | 44 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes gradle/wrapper/gradle-wrapper.properties | 8 + gradlew | 251 ++++++++++ gradlew.bat | 94 ++++ settings.gradle.kts | 24 + 73 files changed, 5662 insertions(+) create mode 100644 .gitignore create mode 100644 app/.gitignore create mode 100644 app/build.gradle.kts create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/com/example/medilightv2android/ExampleInstrumentedTest.kt create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/example/medilightv2android/AppState.kt create mode 100644 app/src/main/java/com/example/medilightv2android/MainActivity.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ble/BleManager.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ble/CRC16.kt create mode 100644 app/src/main/java/com/example/medilightv2android/managers/NirsCalcEngine.kt create mode 100644 app/src/main/java/com/example/medilightv2android/managers/NirsManager.kt create mode 100644 app/src/main/java/com/example/medilightv2android/models/BladderLevel.kt create mode 100644 app/src/main/java/com/example/medilightv2android/models/MeasurementRecord.kt create mode 100644 app/src/main/java/com/example/medilightv2android/models/NirsConstants.kt create mode 100644 app/src/main/java/com/example/medilightv2android/models/NirsData.kt create mode 100644 app/src/main/java/com/example/medilightv2android/models/PiezoSettings.kt create mode 100644 app/src/main/java/com/example/medilightv2android/models/SensorMode.kt create mode 100644 app/src/main/java/com/example/medilightv2android/models/UrgencyLevel.kt create mode 100644 app/src/main/java/com/example/medilightv2android/models/User.kt create mode 100644 app/src/main/java/com/example/medilightv2android/services/KeychainService.kt create mode 100644 app/src/main/java/com/example/medilightv2android/services/MeasurementHistoryStore.kt create mode 100644 app/src/main/java/com/example/medilightv2android/services/MeasurementService.kt create mode 100644 app/src/main/java/com/example/medilightv2android/services/NotificationService.kt create mode 100644 app/src/main/java/com/example/medilightv2android/services/UserStorage.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/components/BladdyRiveView.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/components/BleDisconnectionBanner.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/components/DonutChartView.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/theme/Color.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/theme/Theme.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/theme/Type.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/views/calibration/CalibrationView.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/views/connection/DeviceScanView.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/views/history/MeasurementHistoryView.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/views/home/HomeView.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PiezoMonitoringView.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/views/monitoring/VivamyoMonitoringView.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/views/onboarding/OnboardingView.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/views/personalization/PiezoPersonalizationView.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/views/pin/PinView.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/views/pin/ShuffledKeypad.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/views/registration/RegistrationView.kt create mode 100644 app/src/main/java/com/example/medilightv2android/ui/views/sensorselect/SensorSelectView.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/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/raw/bladdy_final12.riv create mode 100644 app/src/main/res/raw/bladdy_loading3.riv 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 app/src/test/java/com/example/medilightv2android/ExampleUnitTest.kt 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 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c943ba --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +*.iml +.gradle +/local.properties +/.idea/ +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties +app/build/ diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..c422d56 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,67 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) +} + +android { + namespace = "com.example.medilightv2android" + compileSdk { + version = release(36) + } + + defaultConfig { + applicationId = "com.example.medilightv2android" + minSdk = 24 + targetSdk = 36 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + kotlinOptions { + jvmTarget = "11" + } + buildFeatures { + compose = true + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.graphics) + implementation(libs.androidx.compose.ui.tooling.preview) + implementation(libs.androidx.compose.material3) + implementation(libs.androidx.compose.material.icons) + implementation(libs.androidx.compose.foundation) + implementation(libs.gson) + implementation(libs.androidx.security.crypto) + implementation(libs.rive.android) + implementation(libs.androidx.startup.runtime) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) + debugImplementation(libs.androidx.compose.ui.tooling) + debugImplementation(libs.androidx.compose.ui.test.manifest) +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/com/example/medilightv2android/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/medilightv2android/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..547b891 --- /dev/null +++ b/app/src/androidTest/java/com/example/medilightv2android/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.medilightv2android + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.example.medilightv2android", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..5eedac3 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/medilightv2android/AppState.kt b/app/src/main/java/com/example/medilightv2android/AppState.kt new file mode 100644 index 0000000..454a70a --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/AppState.kt @@ -0,0 +1,176 @@ +package com.example.medilightv2android + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.example.medilightv2android.ble.BleManager +import com.example.medilightv2android.managers.NirsManager +import com.example.medilightv2android.models.* +import com.example.medilightv2android.services.* + +enum class AppScreen { + ONBOARDING, REGISTRATION, HOME, SENSOR_SELECT, DEVICE_SCAN, + NIRS_CALIBRATION, PIEZO_PERSONALIZATION, PIN_SETUP, PIN_ENTRY, + VIVAMYO_MONITORING, PIEZO_MONITORING, MEASUREMENT_HISTORY +} + +class AppState(private val context: Context) { + var currentScreen by mutableStateOf(AppScreen.ONBOARDING) + var user by mutableStateOf(User()) + var sensorMode by mutableStateOf(SensorMode.PIEZO) + var bladderLevel by mutableStateOf(BladderLevel()) + var isDeviceConnected by mutableStateOf(false) + var piezoSettings by mutableStateOf(PiezoSettings()) + + private val storage = UserStorage.getInstance(context) + private val historyStore = MeasurementHistoryStore.getInstance(context) + private val notificationService = NotificationService.getInstance(context) + private val bleManager = BleManager.getInstance(context) + + init { + loadState() + } + + fun loadState() { + user = storage.user + sensorMode = storage.sensorMode + bladderLevel = bladderLevel.copy( + currentLevel = storage.bladderLevel, + catheterizationThreshold = storage.catheterizationLevel + ) + piezoSettings = storage.piezoSettings + + currentScreen = when { + !storage.hasCompletedOnboarding -> AppScreen.ONBOARDING + !storage.isRegistered -> AppScreen.REGISTRATION + !storage.hasPin -> AppScreen.PIN_SETUP + else -> AppScreen.PIN_ENTRY + } + } + + fun completeOnboarding() { + storage.hasCompletedOnboarding = true + currentScreen = AppScreen.REGISTRATION + } + + fun completeRegistration() { + storage.user = user + storage.isRegistered = true + currentScreen = AppScreen.PIN_SETUP + } + + fun goHome() { + NirsManager.instance.stopStreaming() + NirsManager.instance.reset() + bleManager.disconnect() + isDeviceConnected = false + currentScreen = AppScreen.HOME + } + + fun startFromHome() { + currentScreen = AppScreen.SENSOR_SELECT + } + + fun selectSensor(mode: SensorMode) { + sensorMode = mode + storage.sensorMode = mode + currentScreen = AppScreen.DEVICE_SCAN + } + + fun backToSensorSelect() { + currentScreen = AppScreen.SENSOR_SELECT + } + + fun deviceConnected() { + isDeviceConnected = true + currentScreen = if (sensorMode == SensorMode.NIRS) { + AppScreen.NIRS_CALIBRATION + } else { + AppScreen.PIEZO_PERSONALIZATION + } + } + + fun calibrationComplete() { + currentScreen = AppScreen.VIVAMYO_MONITORING + } + + fun personalizationComplete() { + storage.piezoSettings = piezoSettings + currentScreen = AppScreen.PIEZO_MONITORING + } + + fun pinSet(pin: String) { + storage.pin = pin + storage.hasPin = true + currentScreen = AppScreen.HOME + } + + fun pinVerified() { + currentScreen = AppScreen.HOME + } + + fun incrementLevel() { + val previousUrgency = bladderLevel.urgency + val newLevel = bladderLevel.copy() + newLevel.increment() + bladderLevel = newLevel + storage.bladderLevel = bladderLevel.currentLevel + + val record = MeasurementRecord( + eventType = MeasurementEventType.MEASUREMENT, + level = bladderLevel.currentLevel, + estimatedVolume = estimatedVolume, + urgencyLevel = bladderLevel.urgency, + fillPercentage = fillPercentage + ) + historyStore.addRecord(record) + + val newUrgency = bladderLevel.urgency + if (newUrgency != previousUrgency) { + notificationService.sendUrgencyNotification(newUrgency, estimatedVolume) + } + } + + fun resetLevel() { + val record = MeasurementRecord( + eventType = MeasurementEventType.CATHETERIZATION, + level = bladderLevel.currentLevel, + estimatedVolume = estimatedVolume, + urgencyLevel = bladderLevel.urgency, + fillPercentage = fillPercentage + ) + historyStore.addRecord(record) + + val newLevel = bladderLevel.copy() + newLevel.reset() + bladderLevel = newLevel + storage.bladderLevel = 0 + notificationService.cancelAll() + } + + fun showHistory() { + currentScreen = AppScreen.MEASUREMENT_HISTORY + } + + fun backToMonitoring() { + currentScreen = if (sensorMode == SensorMode.NIRS) AppScreen.VIVAMYO_MONITORING else AppScreen.PIEZO_MONITORING + } + + fun updateCatheterizationThreshold(threshold: Int) { + bladderLevel = bladderLevel.copy(catheterizationThreshold = threshold) + storage.catheterizationLevel = threshold + } + + val estimatedVolume: Int + get() { + if (BladderLevel.MAX_LEVEL <= 0) return 0 + return (bladderLevel.currentLevel.toDouble() / BladderLevel.MAX_LEVEL * piezoSettings.maxVolume).toInt() + } + + val fillPercentage: Double + get() { + if (BladderLevel.MAX_LEVEL <= 0) return 0.0 + return bladderLevel.currentLevel.toDouble() / BladderLevel.MAX_LEVEL * 100.0 + } +} diff --git a/app/src/main/java/com/example/medilightv2android/MainActivity.kt b/app/src/main/java/com/example/medilightv2android/MainActivity.kt new file mode 100644 index 0000000..eb39bf6 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/MainActivity.kt @@ -0,0 +1,79 @@ +package com.example.medilightv2android + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.animation.Crossfade +import androidx.compose.animation.core.tween +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import app.rive.runtime.kotlin.core.Rive +import com.example.medilightv2android.services.KeychainService +import com.example.medilightv2android.services.NotificationService +import com.example.medilightv2android.ui.theme.Medilightv2androidTheme +import com.example.medilightv2android.ui.views.calibration.CalibrationView +import com.example.medilightv2android.ui.views.connection.DeviceScanView +import com.example.medilightv2android.ui.views.history.MeasurementHistoryView +import com.example.medilightv2android.ui.views.home.HomeView +import com.example.medilightv2android.ui.views.monitoring.PiezoMonitoringView +import com.example.medilightv2android.ui.views.monitoring.VivamyoMonitoringView +import com.example.medilightv2android.ui.views.onboarding.OnboardingView +import com.example.medilightv2android.ui.views.personalization.PiezoPersonalizationView +import com.example.medilightv2android.ui.views.pin.PinMode +import com.example.medilightv2android.ui.views.pin.PinView +import com.example.medilightv2android.ui.views.registration.RegistrationView +import com.example.medilightv2android.ui.views.sensorselect.SensorSelectView + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + // Initialize services + Rive.init(this) + KeychainService.init(this) + NotificationService.getInstance(this) + + enableEdgeToEdge() + setContent { + Medilightv2androidTheme { + Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> + MedilightApp(modifier = Modifier.padding(innerPadding)) + } + } + } + } +} + +@Composable +fun MedilightApp(modifier: Modifier = Modifier) { + val context = LocalContext.current + val appState = remember { AppState(context) } + + Crossfade( + targetState = appState.currentScreen, + animationSpec = tween(300), + modifier = modifier, + label = "screen" + ) { screen -> + when (screen) { + AppScreen.ONBOARDING -> OnboardingView(appState) + AppScreen.REGISTRATION -> RegistrationView(appState) + AppScreen.HOME -> HomeView(appState) + AppScreen.SENSOR_SELECT -> SensorSelectView(appState) + AppScreen.DEVICE_SCAN -> DeviceScanView(appState) + AppScreen.NIRS_CALIBRATION -> CalibrationView(appState) + AppScreen.PIEZO_PERSONALIZATION -> PiezoPersonalizationView(appState) + AppScreen.PIN_SETUP -> PinView(appState, PinMode.SETUP, context) + AppScreen.PIN_ENTRY -> PinView(appState, PinMode.ENTER, context) + AppScreen.VIVAMYO_MONITORING -> VivamyoMonitoringView(appState) + AppScreen.PIEZO_MONITORING -> PiezoMonitoringView(appState) + AppScreen.MEASUREMENT_HISTORY -> MeasurementHistoryView(appState) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/medilightv2android/ble/BleManager.kt b/app/src/main/java/com/example/medilightv2android/ble/BleManager.kt new file mode 100644 index 0000000..c7db27c --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ble/BleManager.kt @@ -0,0 +1,462 @@ +package com.example.medilightv2android.ble + +import android.annotation.SuppressLint +import android.bluetooth.* +import android.bluetooth.le.* +import android.content.Context +import android.os.Build +import android.os.Handler +import android.os.Looper +import android.util.Log +import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateOf +import java.util.UUID + +data class BleDevice( + val device: BluetoothDevice, + var rssi: Int, + var isConnecting: Boolean = false, + var isConnected: Boolean = false +) { + val name: String @SuppressLint("MissingPermission") get() = try { device.name ?: "Unknown" } catch (_: Exception) { "Unknown" } + val address: String get() = device.address +} + +@SuppressLint("MissingPermission") +class BleManager private constructor(private val context: Context) { + + companion object { + private const val TAG = "BleManager" + + @Volatile + private var instance: BleManager? = null + fun getInstance(context: Context): BleManager = + instance ?: synchronized(this) { + instance ?: BleManager(context.applicationContext).also { instance = it } + } + + val SERVICE_UUID: UUID = UUID.fromString("6E400001-B5A3-F393-E0A9-E50E24DCCA9E") + val TX_CHAR_UUID: UUID = UUID.fromString("6E400002-B5A3-F393-E0A9-E50E24DCCA9E") + val RX_CHAR_UUID: UUID = UUID.fromString("6E400003-B5A3-F393-E0A9-E50E24DCCA9E") + val CCCD_UUID: UUID = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb") + } + + private val bluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager + private val bluetoothAdapter: BluetoothAdapter? = bluetoothManager.adapter + private var bluetoothLeScanner: BluetoothLeScanner? = null + private var bluetoothGatt: BluetoothGatt? = null + private var txCharacteristic: BluetoothGattCharacteristic? = null + private var rxCharacteristic: BluetoothGattCharacteristic? = null + private val handler = Handler(Looper.getMainLooper()) + private var scanTimer: Runnable? = null + private var batteryTimer: Runnable? = null + private var connectionTimer: Runnable? = null + private var isUserDisconnect = false + + val discoveredDevices = mutableStateListOf() + val isScanning = mutableStateOf(false) + val isConnected = mutableStateOf(false) + val connectedDeviceName = mutableStateOf("") + val batteryLevel = mutableStateOf(0) + val bluetoothEnabled = mutableStateOf(bluetoothAdapter?.isEnabled == true) + val isServiceReady = mutableStateOf(false) + val isReconnecting = mutableStateOf(false) + val connectionError = mutableStateOf(null) + + // Callbacks + var onConnectionStateChanged: ((Boolean) -> Unit)? = null + var onNirsPowerOnReceived: (() -> Unit)? = null + var onNirsSensorActivated: (() -> Unit)? = null + var onNirsMagReceived: ((ByteArray) -> Unit)? = null + var onNirsMcjReceived: ((ByteArray) -> Unit)? = null + var onPiezoDataReceived: ((ByteArray) -> Unit)? = null + var onUnexpectedDisconnect: (() -> Unit)? = null + var onReconnectionFailed: (() -> Unit)? = null + + val isBluetoothReady: Boolean get() = bluetoothAdapter?.isEnabled == true + + // Scanning + fun startScan() { + if (bluetoothAdapter?.isEnabled != true) { + bluetoothEnabled.value = false + return + } + bluetoothEnabled.value = true + discoveredDevices.clear() + isScanning.value = true + bluetoothLeScanner = bluetoothAdapter.bluetoothLeScanner + + if (bluetoothLeScanner == null) { + Log.e(TAG, "BluetoothLeScanner is null") + isScanning.value = false + return + } + + val settings = ScanSettings.Builder() + .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY) + .build() + + try { + bluetoothLeScanner?.startScan(null, settings, scanCallback) + Log.d(TAG, "BLE scan started") + } catch (e: Exception) { + Log.e(TAG, "Failed to start scan: ${e.message}") + isScanning.value = false + return + } + + scanTimer?.let { handler.removeCallbacks(it) } + val timeout = Runnable { stopScan() } + scanTimer = timeout + handler.postDelayed(timeout, 15000) + } + + fun stopScan() { + try { + bluetoothLeScanner?.stopScan(scanCallback) + } catch (e: Exception) { + Log.w(TAG, "Failed to stop scan: ${e.message}") + } + isScanning.value = false + scanTimer?.let { handler.removeCallbacks(it) } + scanTimer = null + } + + private val scanCallback = object : ScanCallback() { + override fun onScanResult(callbackType: Int, result: ScanResult) { + val device = result.device + val name = try { device.name } catch (_: Exception) { null } ?: return + if (name.isEmpty()) return + + handler.post { + val existing = discoveredDevices.indexOfFirst { it.address == device.address } + if (existing >= 0) { + discoveredDevices[existing] = discoveredDevices[existing].copy(rssi = result.rssi) + } else { + discoveredDevices.add(BleDevice(device, result.rssi)) + Log.d(TAG, "Discovered: $name (${device.address}) rssi=${result.rssi}") + } + } + } + + override fun onScanFailed(errorCode: Int) { + Log.e(TAG, "Scan failed with error code: $errorCode") + handler.post { + isScanning.value = false + connectionError.value = "Scan failed (error $errorCode)" + } + } + } + + // Connection + fun connect(bleDevice: BleDevice) { + stopScan() + Log.d(TAG, "Connecting to ${bleDevice.name} (${bleDevice.address})") + + // Clean up any existing GATT connection + bluetoothGatt?.let { gatt -> + Log.d(TAG, "Closing existing GATT connection") + try { + gatt.disconnect() + gatt.close() + } catch (e: Exception) { + Log.w(TAG, "Error closing old GATT: ${e.message}") + } + bluetoothGatt = null + txCharacteristic = null + rxCharacteristic = null + } + + val idx = discoveredDevices.indexOfFirst { it.address == bleDevice.address } + if (idx >= 0) discoveredDevices[idx] = discoveredDevices[idx].copy(isConnecting = true) + + connectionError.value = null + + try { + bluetoothGatt = bleDevice.device.connectGatt(context, false, gattCallback, BluetoothDevice.TRANSPORT_LE) + Log.d(TAG, "connectGatt called, gatt=${bluetoothGatt != null}") + } catch (e: Exception) { + Log.e(TAG, "connectGatt failed: ${e.message}") + handler.post { + connectionError.value = "Connection failed: ${e.message}" + if (idx >= 0) discoveredDevices[idx] = discoveredDevices[idx].copy(isConnecting = false) + } + return + } + + // Connection timeout + connectionTimer?.let { handler.removeCallbacks(it) } + val timeout = Runnable { + if (!isConnected.value) { + Log.w(TAG, "Connection timeout") + bluetoothGatt?.let { gatt -> + try { + gatt.disconnect() + gatt.close() + } catch (_: Exception) {} + } + bluetoothGatt = null + connectionError.value = "Connection timed out. Try again." + if (idx >= 0 && idx < discoveredDevices.size) { + discoveredDevices[idx] = discoveredDevices[idx].copy(isConnecting = false) + } + } + } + connectionTimer = timeout + handler.postDelayed(timeout, 10000) + } + + fun disconnect() { + isUserDisconnect = true + connectionTimer?.let { handler.removeCallbacks(it) } + connectionTimer = null + bluetoothGatt?.disconnect() + } + + // Reconnection + fun reconnectToLastDevice(lastDeviceAddress: String?) { + if (lastDeviceAddress == null || bluetoothAdapter?.isEnabled != true) { + onReconnectionFailed?.invoke() + return + } + + // Clean up existing + bluetoothGatt?.let { gatt -> + try { gatt.disconnect(); gatt.close() } catch (_: Exception) {} + bluetoothGatt = null + } + + isReconnecting.value = true + val device = bluetoothAdapter.getRemoteDevice(lastDeviceAddress) + bluetoothGatt = device.connectGatt(context, false, gattCallback, BluetoothDevice.TRANSPORT_LE) + + handler.postDelayed({ + if (isReconnecting.value) { + isReconnecting.value = false + bluetoothGatt?.let { gatt -> + try { gatt.disconnect(); gatt.close() } catch (_: Exception) {} + } + bluetoothGatt = null + onReconnectionFailed?.invoke() + } + }, 10000) + } + + // Send + fun sendRaw(data: ByteArray) { + val characteristic = txCharacteristic ?: return + val gatt = bluetoothGatt ?: return + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + gatt.writeCharacteristic(characteristic, data, BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE) + } else { + @Suppress("DEPRECATION") + characteristic.value = data + characteristic.writeType = BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE + @Suppress("DEPRECATION") + gatt.writeCharacteristic(characteristic) + } + } + + // Piezo Commands + fun sendPiezoPowerOn(freqOption: Int, cycles: Int) { + sendRaw(CRC16.buildCommand("mpa", intArrayOf(freqOption, cycles))) + } + + fun sendPiezoStop() { + sendRaw(CRC16.buildCommand("mps")) + } + + fun sendBurst(freqOption: Int, cycles: Int, delayUs: Int, piezoCh: Int = 0) { + sendRaw(CRC16.buildCommand("mec", intArrayOf(freqOption, delayUs, 140, cycles, 1, piezoCh))) + } + + // NIRS Commands + fun sendNirsPowerOn() { + sendRaw(CRC16.buildCommand("mta", intArrayOf(1))) + } + + fun sendMqqQuery() { + sendRaw(CRC16.buildCommand("mqq")) + } + + fun sendMagQuery() { + sendRaw(CRC16.buildCommand("mag")) + } + + fun sendMcjQuery() { + sendRaw(CRC16.buildCommand("mcj")) + } + + fun sendBatteryQuery() { + sendRaw(CRC16.buildCommand("msn", intArrayOf(0))) + } + + fun startBatteryPolling() { + batteryTimer?.let { handler.removeCallbacks(it) } + handler.postDelayed({ sendBatteryQuery() }, 1000) + val poll = object : Runnable { + override fun run() { + sendBatteryQuery() + handler.postDelayed(this, 30000) + } + } + batteryTimer = poll + handler.postDelayed(poll, 31000) + } + + private fun stopBatteryPolling() { + batteryTimer?.let { handler.removeCallbacks(it) } + batteryTimer = null + } + + private val gattCallback = object : BluetoothGattCallback() { + override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) { + Log.d(TAG, "onConnectionStateChange: status=$status newState=$newState") + handler.post { + // Cancel connection timeout + connectionTimer?.let { handler.removeCallbacks(it) } + connectionTimer = null + + if (status != BluetoothGatt.GATT_SUCCESS && newState != BluetoothProfile.STATE_CONNECTED) { + // Connection failed with error + Log.e(TAG, "GATT connection failed with status: $status") + bluetoothGatt = null + txCharacteristic = null + rxCharacteristic = null + isConnected.value = false + isServiceReady.value = false + isReconnecting.value = false + connectionError.value = "Connection failed (status $status). Try again." + + val idx = discoveredDevices.indexOfFirst { it.address == gatt.device.address } + if (idx >= 0) discoveredDevices[idx] = discoveredDevices[idx].copy(isConnected = false, isConnecting = false) + + gatt.close() + return@post + } + + when (newState) { + BluetoothProfile.STATE_CONNECTED -> { + Log.d(TAG, "Connected to ${gatt.device.address}") + isReconnecting.value = false + isUserDisconnect = false + connectionError.value = null + val idx = discoveredDevices.indexOfFirst { it.address == gatt.device.address } + if (idx >= 0) discoveredDevices[idx] = discoveredDevices[idx].copy(isConnected = true, isConnecting = false) + isConnected.value = true + connectedDeviceName.value = try { gatt.device.name ?: "Unknown" } catch (_: Exception) { "Unknown" } + + // Save last connected device address + try { + val prefs = context.getSharedPreferences("medilight_prefs", Context.MODE_PRIVATE) + prefs.edit().putString("last_device_address", gatt.device.address).apply() + } catch (_: Exception) {} + + gatt.discoverServices() + startBatteryPolling() + onConnectionStateChanged?.invoke(true) + } + BluetoothProfile.STATE_DISCONNECTED -> { + Log.d(TAG, "Disconnected from ${gatt.device.address}") + stopBatteryPolling() + bluetoothGatt = null + txCharacteristic = null + rxCharacteristic = null + isConnected.value = false + isServiceReady.value = false + connectedDeviceName.value = "" + batteryLevel.value = 0 + + val idx = discoveredDevices.indexOfFirst { it.address == gatt.device.address } + if (idx >= 0) discoveredDevices[idx] = discoveredDevices[idx].copy(isConnected = false, isConnecting = false) + + onConnectionStateChanged?.invoke(false) + + if (!isUserDisconnect) { + onUnexpectedDisconnect?.invoke() + } + isUserDisconnect = false + gatt.close() + } + } + } + } + + override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) { + Log.d(TAG, "onServicesDiscovered: status=$status") + if (status != BluetoothGatt.GATT_SUCCESS) { + handler.post { connectionError.value = "Service discovery failed (status $status)" } + return + } + val service = gatt.getService(SERVICE_UUID) + if (service == null) { + Log.e(TAG, "NUS service not found!") + handler.post { connectionError.value = "Device service not found" } + return + } + txCharacteristic = service.getCharacteristic(TX_CHAR_UUID) + rxCharacteristic = service.getCharacteristic(RX_CHAR_UUID) + + Log.d(TAG, "TX=${txCharacteristic != null}, RX=${rxCharacteristic != null}") + + rxCharacteristic?.let { rx -> + gatt.setCharacteristicNotification(rx, true) + val descriptor = rx.getDescriptor(CCCD_UUID) + if (descriptor != null) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + gatt.writeDescriptor(descriptor, BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE) + } else { + @Suppress("DEPRECATION") + descriptor.value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE + @Suppress("DEPRECATION") + gatt.writeDescriptor(descriptor) + } + } else { + Log.w(TAG, "CCCD descriptor not found for RX characteristic") + } + } + + handler.post { + if (txCharacteristic != null && rxCharacteristic != null) { + isServiceReady.value = true + Log.d(TAG, "Service ready!") + } + } + } + + override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, value: ByteArray) { + if (characteristic.uuid == RX_CHAR_UUID) { + if (value.size < 4) return + handler.post { processReceivedData(value) } + } + } + + @Deprecated("Deprecated in API 33", ReplaceWith("onCharacteristicChanged(gatt, characteristic, value)")) + override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) { + if (characteristic.uuid == RX_CHAR_UUID) { + @Suppress("DEPRECATION") + val data = characteristic.value ?: return + if (data.size < 4) return + handler.post { processReceivedData(data) } + } + } + } + + private fun processReceivedData(data: ByteArray) { + val prefix = String(data, 0, minOf(4, data.size), Charsets.US_ASCII) + Log.d(TAG, "Received: $prefix (${data.size} bytes)") + when (prefix) { + "rta:", "rta!" -> onNirsPowerOnReceived?.invoke() + "rsh:", "rsh!", "rqq:", "rqq!" -> onNirsSensorActivated?.invoke() + "rag:", "rag!" -> onNirsMagReceived?.invoke(data) + "rcj:", "rcj!" -> onNirsMcjReceived?.invoke(data) + "rpa:" -> onPiezoDataReceived?.invoke(data) + "rsn:" -> { + if (data.size >= 6) { + val millivolts = ((data[4].toInt() and 0xFF) shl 8) or (data[5].toInt() and 0xFF) + batteryLevel.value = ((millivolts - 3700) * 100 / 500).coerceIn(0, 100) + } + } + } + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ble/CRC16.kt b/app/src/main/java/com/example/medilightv2android/ble/CRC16.kt new file mode 100644 index 0000000..28cdbe9 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ble/CRC16.kt @@ -0,0 +1,60 @@ +package com.example.medilightv2android.ble + +object CRC16 { + private const val POLYNOMIAL: Int = 0x1021 + private const val INITIAL_VALUE: Int = 0xFFFF + + fun calculate(data: ByteArray): Int { + var crc = INITIAL_VALUE + for (byte in data) { + crc = crc xor ((byte.toInt() and 0xFF) shl 8) + for (j in 0 until 8) { + crc = if ((crc and 0x8000) != 0) { + (crc shl 1) xor POLYNOMIAL + } else { + crc shl 1 + } + crc = crc and 0xFFFF + } + } + return crc + } + + fun calculate(string: String): Int = calculate(string.toByteArray(Charsets.UTF_8)) + + fun appendCRC(data: ByteArray): ByteArray { + val crc = calculate(data) + return data + byteArrayOf( + (crc and 0xFF).toByte(), // Low byte first (Little Endian) + ((crc shr 8) and 0xFF).toByte() // High byte + ) + } + + fun appendCRC(string: String): ByteArray = appendCRC(string.toByteArray(Charsets.UTF_8)) + + fun verify(data: ByteArray): Boolean { + if (data.size < 2) return false + val payload = data.copyOfRange(0, data.size - 2) + val receivedCRC = (data[data.size - 2].toInt() and 0xFF) or + ((data[data.size - 1].toInt() and 0xFF) shl 8) + return calculate(payload) == receivedCRC + } + + fun buildCommand(cmd: String, params: IntArray = intArrayOf()): ByteArray { + val cmdBytes = "$cmd?".toByteArray(Charsets.UTF_8) + val paramBytes = ByteArray(params.size * 2) + for (i in params.indices) { + paramBytes[i * 2] = (params[i] and 0xFF).toByte() // Low byte + paramBytes[i * 2 + 1] = ((params[i] shr 8) and 0xFF).toByte() // High byte + } + return appendCRC(cmdBytes + paramBytes) + } + + fun buildCommandASCII(cmd: String, asciiParams: String = ""): ByteArray { + return appendCRC("$cmd?$asciiParams".toByteArray(Charsets.UTF_8)) + } + + fun buildSimpleCommand(cmd: String): ByteArray { + return appendCRC(cmd.toByteArray(Charsets.UTF_8)) + } +} diff --git a/app/src/main/java/com/example/medilightv2android/managers/NirsCalcEngine.kt b/app/src/main/java/com/example/medilightv2android/managers/NirsCalcEngine.kt new file mode 100644 index 0000000..2054362 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/managers/NirsCalcEngine.kt @@ -0,0 +1,206 @@ +package com.example.medilightv2android.managers + +import com.example.medilightv2android.models.NirsConstants +import com.example.medilightv2android.models.NirsMagResponse +import com.example.medilightv2android.models.NirsOxyResult +import kotlin.math.abs +import kotlin.math.ln +import kotlin.math.max +import kotlin.math.pow + +class NirsCalcEngine { + + // Gain Calibration + private var gainValues: IntArray = intArrayOf() + val hasGain: Boolean get() = gainValues.size >= 24 + + fun setGainFromMag(response: NirsMagResponse) { + gainValues = response.gainValues + } + + fun clearGain() { + gainValues = intArrayOf() + } + + // AGC DAC -> Software Amplification + private fun agcGain(dacValue: Int): Double { + return 10.0.pow(((dacValue.toDouble() * 3.3 / 4096.0 * -80.0) + 88.0) / 20.0) + } + + // DeGain Calculation + fun degain(rawLed: IntArray): DoubleArray { + if (rawLed.size < 24 || !hasGain) return DoubleArray(24) { 0.0 } + + val result = DoubleArray(24) + for (i in 0 until 24) { + val raw = rawLed[i].toDouble() + val sag = gainValues[i] + val pkg = i / 6 + val wl = i % 6 + + val softAmp = agcGain(sag) + val hAmp = NirsConstants.hardwareAmp[pkg] + val spResponse = NirsConstants.spectralResponse[wl] + val dpf = NirsConstants.dpf[wl] + + val denominator = softAmp * hAmp + if (denominator > 0) { + var dg = raw / denominator + dg /= spResponse + dg *= dpf + result[i] = dg + } + } + return result + } + + // Butterworth IIR Filter + private var filterState: Array = emptyArray() + private var filterInitialized = false + var isFilterEnabled = true + + fun resetFilter() { + filterState = Array(24) { doubleArrayOf(0.0, 0.0, 0.0, 0.0) } + filterInitialized = false + } + + private fun applyFilter(x: Double, state: DoubleArray): Double { + val b = NirsConstants.filterB + val a = NirsConstants.filterA + + val y = b[0] * x + b[1] * state[0] + b[2] * state[1] - a[1] * state[2] - a[2] * state[3] + + state[1] = state[0] + state[0] = x + state[3] = state[2] + state[2] = y + + return y + } + + fun filterDeGain(degainValues: DoubleArray): DoubleArray { + if (degainValues.size < 24) return degainValues + + if (filterState.isEmpty()) resetFilter() + + if (!filterInitialized) { + for (i in 0 until 24) { + val v = degainValues[i] + filterState[i] = doubleArrayOf(v, v, v, v) + } + filterInitialized = true + } + + val filtered = DoubleArray(24) + for (i in 0 until 24) { + filtered[i] = applyFilter(degainValues[i], filterState[i]) + } + return filtered + } + + // Oxygenation Calculation + fun calcOxygenation(degainValues: DoubleArray): NirsOxyResult { + if (degainValues.size < 24) return NirsOxyResult.zero + + val c = NirsConstants + val muA = DoubleArray(c.numWavelengths) + + for (i in 0 until c.numWavelengths) { + val i2cm = degainValues[i] + val i5cm = degainValues[18 + i] + + val i2norm = i2cm / (c.ledPower[0] / c.referencePower) + val i5norm = i5cm / (c.ledPower[3] / c.referencePower) + + val mix = c.srsMixNear * i2norm + c.srsMixFar * i5norm + + if (mix > 0) { + val slope = -ln(mix) / c.srsPathLength + muA[i] = -slope + } + } + + val solution = solveNormalEq6x3(muA) + + var hbO2 = max(0.0, solution.first) * c.oxyScale + var hb = max(0.0, solution.second) * c.oxyScale + + val tHb = hbO2 + hb + val stO2 = if (tHb > 0) (hbO2 / tHb) * 100.0 else 0.0 + + return NirsOxyResult(hbO2 = hbO2, hb = hb, tHb = tHb, stO2 = stO2) + } + + // Least Squares Solver (6x3) + private fun solveNormalEq6x3(muA: DoubleArray): Triple { + val eps = arrayOf( + NirsConstants.extinctionHbO2, + NirsConstants.extinctionHb, + NirsConstants.extinctionH2O + ) + + val n = Array(3) { DoubleArray(3) } + for (i in 0 until 3) { + for (j in 0 until 3) { + var sum = 0.0 + for (k in 0 until 6) sum += eps[i][k] * eps[j][k] + n[i][j] = sum + } + } + + val b = DoubleArray(3) + for (i in 0 until 3) { + var sum = 0.0 + for (k in 0 until 6) sum += eps[i][k] * muA[k] + b[i] = sum + } + + val det = n[0][0] * (n[1][1] * n[2][2] - n[1][2] * n[2][1]) - + n[0][1] * (n[1][0] * n[2][2] - n[1][2] * n[2][0]) + + n[0][2] * (n[1][0] * n[2][1] - n[1][1] * n[2][0]) + + if (abs(det) < 1e-12) return Triple(0.0, 0.0, 0.0) + + val inv = Array(3) { DoubleArray(3) } + inv[0][0] = (n[1][1] * n[2][2] - n[1][2] * n[2][1]) / det + inv[0][1] = -(n[0][1] * n[2][2] - n[0][2] * n[2][1]) / det + inv[0][2] = (n[0][1] * n[1][2] - n[0][2] * n[1][1]) / det + inv[1][0] = -(n[1][0] * n[2][2] - n[1][2] * n[2][0]) / det + inv[1][1] = (n[0][0] * n[2][2] - n[0][2] * n[2][0]) / det + inv[1][2] = -(n[0][0] * n[1][2] - n[0][2] * n[1][0]) / det + inv[2][0] = (n[1][0] * n[2][1] - n[1][1] * n[2][0]) / det + inv[2][1] = -(n[0][0] * n[2][1] - n[0][1] * n[2][0]) / det + inv[2][2] = (n[0][0] * n[1][1] - n[0][1] * n[1][0]) / det + + val c = DoubleArray(3) { i -> + inv[i][0] * b[0] + inv[i][1] * b[1] + inv[i][2] * b[2] + } + + return Triple(c[0], c[1], c[2]) + } + + // Full Processing Pipeline + data class ProcessResult( + val degain: DoubleArray, + val degainFiltered: DoubleArray, + val oxy: NirsOxyResult, + val oxyFiltered: NirsOxyResult + ) + + fun process(rawLed: IntArray): ProcessResult { + val dg = degain(rawLed) + val oxyRaw = calcOxygenation(dg) + + val dgf: DoubleArray + val oxyF: NirsOxyResult + if (isFilterEnabled) { + dgf = filterDeGain(dg) + oxyF = calcOxygenation(dgf) + } else { + dgf = dg + oxyF = oxyRaw + } + + return ProcessResult(dg, dgf, oxyRaw, oxyF) + } +} diff --git a/app/src/main/java/com/example/medilightv2android/managers/NirsManager.kt b/app/src/main/java/com/example/medilightv2android/managers/NirsManager.kt new file mode 100644 index 0000000..604c519 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/managers/NirsManager.kt @@ -0,0 +1,85 @@ +package com.example.medilightv2android.managers + +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateOf +import com.example.medilightv2android.models.NirsMagResponse +import com.example.medilightv2android.models.NirsMcjPacket +import com.example.medilightv2android.models.NirsConstants +import com.example.medilightv2android.models.NirsOxyResult + +class NirsManager private constructor() { + companion object { + val instance: NirsManager by lazy { NirsManager() } + } + + // State + val isStreaming = mutableStateOf(false) + val isCalibrated = mutableStateOf(false) + val isFilterEnabled = mutableStateOf(true) + + // Current Values + val currentOxy = mutableStateOf(NirsOxyResult.zero) + val sampleCount = mutableIntStateOf(0) + + // Chart History + val oxyHbO2History = mutableStateListOf() + val oxyHbHistory = mutableStateListOf() + + // Internal + val calcEngine = NirsCalcEngine() + private val maxPoints = NirsConstants.maxHistoryPoints + + // Calibration + fun setCalibrationGain(response: NirsMagResponse) { + calcEngine.setGainFromMag(response) + isCalibrated.value = true + } + + // Process mcj Packet + fun processMcjPacket(packet: NirsMcjPacket) { + val result = calcEngine.process(packet.ledValues) + currentOxy.value = result.oxyFiltered + sampleCount.intValue++ + + appendTrimming(oxyHbO2History, result.oxyFiltered.hbO2) + appendTrimming(oxyHbHistory, result.oxyFiltered.hb) + } + + // Controls + fun toggleFilter() { + isFilterEnabled.value = !isFilterEnabled.value + calcEngine.isFilterEnabled = isFilterEnabled.value + if (isFilterEnabled.value) calcEngine.resetFilter() + } + + fun clearData() { + oxyHbO2History.clear() + oxyHbHistory.clear() + currentOxy.value = NirsOxyResult.zero + sampleCount.intValue = 0 + calcEngine.resetFilter() + } + + fun startStreaming() { + isStreaming.value = true + calcEngine.resetFilter() + } + + fun stopStreaming() { + isStreaming.value = false + } + + fun reset() { + stopStreaming() + clearData() + isCalibrated.value = false + calcEngine.clearGain() + } + + // Helpers + private fun appendTrimming(list: MutableList, value: Double) { + list.add(value) + while (list.size > maxPoints) list.removeAt(0) + } +} diff --git a/app/src/main/java/com/example/medilightv2android/models/BladderLevel.kt b/app/src/main/java/com/example/medilightv2android/models/BladderLevel.kt new file mode 100644 index 0000000..c34f110 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/models/BladderLevel.kt @@ -0,0 +1,28 @@ +package com.example.medilightv2android.models + +data class BladderLevel( + var currentLevel: Int = 0, + var catheterizationThreshold: Int = 8 +) { + val urgency: UrgencyLevel + get() = when { + currentLevel >= catheterizationThreshold -> UrgencyLevel.URGENT + currentLevel == catheterizationThreshold - 1 -> UrgencyLevel.WARNING + else -> UrgencyLevel.SAFE + } + + val progress: Double + get() = currentLevel.toDouble() / MAX_LEVEL.toDouble() + + fun increment() { + if (currentLevel < MAX_LEVEL) currentLevel++ + } + + fun reset() { + currentLevel = 0 + } + + companion object { + const val MAX_LEVEL = 10 + } +} diff --git a/app/src/main/java/com/example/medilightv2android/models/MeasurementRecord.kt b/app/src/main/java/com/example/medilightv2android/models/MeasurementRecord.kt new file mode 100644 index 0000000..bec5337 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/models/MeasurementRecord.kt @@ -0,0 +1,35 @@ +package com.example.medilightv2android.models + +import java.util.Date +import java.util.UUID + +enum class MeasurementEventType { + MEASUREMENT, CATHETERIZATION +} + +data class MeasurementRecord( + val id: String = UUID.randomUUID().toString(), + val timestamp: Long = System.currentTimeMillis(), + val eventType: MeasurementEventType, + val level: Int, + val estimatedVolume: Int, + val urgency: String, + val fillPercentage: Double +) { + constructor( + eventType: MeasurementEventType, + level: Int, + estimatedVolume: Int, + urgencyLevel: UrgencyLevel, + fillPercentage: Double + ) : this( + eventType = eventType, + level = level, + estimatedVolume = estimatedVolume, + urgency = urgencyLevel.rawStringValue, + fillPercentage = fillPercentage + ) + + val urgencyLevel: UrgencyLevel + get() = UrgencyLevel.fromString(urgency) +} diff --git a/app/src/main/java/com/example/medilightv2android/models/NirsConstants.kt b/app/src/main/java/com/example/medilightv2android/models/NirsConstants.kt new file mode 100644 index 0000000..b0a23f0 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/models/NirsConstants.kt @@ -0,0 +1,49 @@ +package com.example.medilightv2android.models + +import androidx.compose.ui.graphics.Color + +object NirsConstants { + // Hardware Parameters + val hardwareAmp = doubleArrayOf(1.2, 5.008, 11.22, 37.072) + val ledPower = doubleArrayOf(5.0, 10.0, 15.0, 20.0) + val spectralResponse = doubleArrayOf(0.457, 0.561, 0.602, 0.653, 0.71, 0.725) + val dpf = doubleArrayOf(7.0, 5.8, 5.5, 5.2, 4.9, 4.7) + + // Extinction Coefficients + val extinctionHbO2 = doubleArrayOf(0.303, 0.586, 0.816, 1.058, 1.224, 1.162) + val extinctionHb = doubleArrayOf(2.968, 1.549, 0.762, 0.691, 0.777, 0.429) + val extinctionH2O = doubleArrayOf(0.003, 0.026, 0.020, 0.044, 0.267, 0.448) + + // Butterworth IIR Filter (2nd order, Fc=1.5Hz, Fs=4Hz) + val filterB = doubleArrayOf(0.4208, 0.8416, 0.4208) + val filterA = doubleArrayOf(1.0, 0.3533, 0.3300) + + // SRS Parameters + const val srsMixNear = 0.8 + const val srsMixFar = 0.2 + const val srsPathLength = 2.6 + const val referencePower = 20.0 + const val oxyScale = 22.0 + + // Dimensions + const val numPackages = 4 + const val numWavelengths = 6 + const val numChannels = numPackages * numWavelengths + + // Wavelength Definitions + val wavelengths = intArrayOf(665, 760, 800, 850, 920, 970) + val wavelengthNames = arrayOf("665nm", "760nm", "800nm", "850nm", "920nm", "970nm") + + val wavelengthColors = listOf( + Color.Red, + Color.Blue, + Color(0xFF33CC33), + Color(0xFFFF9500), + Color(0xFF9966FF), + Color(0xFF666666) + ) + + // Chart History + const val maxHistoryPoints = 240 + const val streamingIntervalMs = 250L +} diff --git a/app/src/main/java/com/example/medilightv2android/models/NirsData.kt b/app/src/main/java/com/example/medilightv2android/models/NirsData.kt new file mode 100644 index 0000000..db8af32 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/models/NirsData.kt @@ -0,0 +1,90 @@ +package com.example.medilightv2android.models + +data class NirsMcjPacket( + val battery: Int, + val temperature: Int, + val accX: Short, + val accY: Short, + val accZ: Short, + val gyrX: Short, + val gyrY: Short, + val gyrZ: Short, + val ledValues: IntArray +) { + companion object { + fun parse(data: ByteArray): NirsMcjPacket? { + if (data.size < 72) return null + + fun u16(offset: Int): Int = + ((data[offset].toInt() and 0xFF) shl 8) or (data[offset + 1].toInt() and 0xFF) + + fun s16(offset: Int): Short = + u16(offset).toShort() + + val base = 4 + val battery = u16(base) + val temperature = u16(base + 2) + val accX = s16(base + 4) + val accY = s16(base + 6) + val accZ = s16(base + 8) + val gyrX = s16(base + 10) + val gyrY = s16(base + 12) + val gyrZ = s16(base + 14) + + val ledValues = IntArray(24) + for (i in 0 until 24) { + val offset = base + 20 + (i * 2) + if (offset + 1 >= data.size) return null + ledValues[i] = u16(offset) + } + + return NirsMcjPacket( + battery, temperature, + accX, accY, accZ, + gyrX, gyrY, gyrZ, + ledValues + ) + } + } + + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (other !is NirsMcjPacket) return false + return battery == other.battery && ledValues.contentEquals(other.ledValues) + } + + override fun hashCode(): Int = battery * 31 + ledValues.contentHashCode() +} + +data class NirsMagResponse(val gainValues: IntArray) { + companion object { + fun parse(data: ByteArray): NirsMagResponse? { + if (data.size < 52) return null + val base = 4 + val values = IntArray(24) { i -> + val offset = base + (i * 2) + ((data[offset].toInt() and 0xFF) shl 8) or (data[offset + 1].toInt() and 0xFF) + } + return NirsMagResponse(values) + } + } + + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (other !is NirsMagResponse) return false + return gainValues.contentEquals(other.gainValues) + } + + override fun hashCode(): Int = gainValues.contentHashCode() +} + +data class NirsOxyResult( + val hbO2: Double = 0.0, + val hb: Double = 0.0, + val tHb: Double = 0.0, + val stO2: Double = 0.0 +) { + companion object { + val zero = NirsOxyResult() + } +} diff --git a/app/src/main/java/com/example/medilightv2android/models/PiezoSettings.kt b/app/src/main/java/com/example/medilightv2android/models/PiezoSettings.kt new file mode 100644 index 0000000..5308d54 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/models/PiezoSettings.kt @@ -0,0 +1,18 @@ +package com.example.medilightv2android.models + +enum class Posture(val displayName: String) { + STANDING("Standing"), + SITTING("Sitting"), + LYING("Lying Down") +} + +enum class SensorPosition(val displayName: String, val description: String) { + LOWER_ABDOMEN("Lower Abdomen", "Below the navel"), + SUPRAPUBIC("Suprapubic", "Above the pubic bone") +} + +data class PiezoSettings( + var posture: Posture = Posture.SITTING, + var sensorPosition: SensorPosition = SensorPosition.LOWER_ABDOMEN, + var maxVolume: Int = 500 +) diff --git a/app/src/main/java/com/example/medilightv2android/models/SensorMode.kt b/app/src/main/java/com/example/medilightv2android/models/SensorMode.kt new file mode 100644 index 0000000..47a1415 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/models/SensorMode.kt @@ -0,0 +1,6 @@ +package com.example.medilightv2android.models + +enum class SensorMode(val displayName: String) { + NIRS("NIRS"), + PIEZO("Piezo") +} diff --git a/app/src/main/java/com/example/medilightv2android/models/UrgencyLevel.kt b/app/src/main/java/com/example/medilightv2android/models/UrgencyLevel.kt new file mode 100644 index 0000000..172849f --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/models/UrgencyLevel.kt @@ -0,0 +1,50 @@ +package com.example.medilightv2android.models + +import androidx.compose.ui.graphics.Color + +enum class UrgencyLevel { + SAFE, WARNING, URGENT; + + val backgroundColor: Color + get() = when (this) { + SAFE -> Color(0xFFEDF8FF) + WARNING -> Color(0xFFFFFAE6) + URGENT -> Color(0xFFFFEBEB) + } + + val accentColor: Color + get() = when (this) { + SAFE -> Color(0xFF008FFF) + WARNING -> Color(0xFFF5A623) + URGENT -> Color(0xFFF04523) + } + + val gradientColors: List + get() = when (this) { + SAFE -> listOf(Color(0xFF00DBA1), Color(0xFF008FFF)) + WARNING -> listOf(Color(0xFFFECC2E), Color(0xFFF04A23)) + URGENT -> listOf(Color(0xFFF04A23), Color(0xFFCC1A1A)) + } + + val message: String + get() = when (this) { + SAFE -> "Enjoy your day!" + WARNING -> "Prepare for catheterization" + URGENT -> "Please perform catheterization" + } + + val rawStringValue: String + get() = when (this) { + SAFE -> "safe" + WARNING -> "warning" + URGENT -> "urgent" + } + + companion object { + fun fromString(value: String): UrgencyLevel = when (value) { + "warning" -> WARNING + "urgent" -> URGENT + else -> SAFE + } + } +} diff --git a/app/src/main/java/com/example/medilightv2android/models/User.kt b/app/src/main/java/com/example/medilightv2android/models/User.kt new file mode 100644 index 0000000..c664167 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/models/User.kt @@ -0,0 +1,9 @@ +package com.example.medilightv2android.models + +data class User( + var firstName: String = "", + var lastName: String = "", + var age: Int = 0, + var heightCm: Double = 0.0, + var weightKg: Double = 0.0 +) diff --git a/app/src/main/java/com/example/medilightv2android/services/KeychainService.kt b/app/src/main/java/com/example/medilightv2android/services/KeychainService.kt new file mode 100644 index 0000000..f2d1c46 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/services/KeychainService.kt @@ -0,0 +1,35 @@ +package com.example.medilightv2android.services + +import android.content.Context +import android.content.SharedPreferences +import androidx.security.crypto.EncryptedSharedPreferences +import androidx.security.crypto.MasterKey + +object KeychainService { + private const val FILE_NAME = "medilightv2_secure_prefs" + + private var prefs: SharedPreferences? = null + + fun init(context: Context) { + val masterKey = MasterKey.Builder(context) + .setKeyScheme(MasterKey.KeyScheme.AES256_GCM) + .build() + prefs = EncryptedSharedPreferences.create( + context, + FILE_NAME, + masterKey, + EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV, + EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM + ) + } + + fun save(key: String, value: String) { + prefs?.edit()?.putString(key, value)?.apply() + } + + fun load(key: String): String? = prefs?.getString(key, null) + + fun delete(key: String) { + prefs?.edit()?.remove(key)?.apply() + } +} diff --git a/app/src/main/java/com/example/medilightv2android/services/MeasurementHistoryStore.kt b/app/src/main/java/com/example/medilightv2android/services/MeasurementHistoryStore.kt new file mode 100644 index 0000000..00920ea --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/services/MeasurementHistoryStore.kt @@ -0,0 +1,47 @@ +package com.example.medilightv2android.services + +import android.content.Context +import android.content.SharedPreferences +import com.example.medilightv2android.models.MeasurementRecord +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken + +class MeasurementHistoryStore private constructor(context: Context) { + companion object { + @Volatile + private var instance: MeasurementHistoryStore? = null + fun getInstance(context: Context): MeasurementHistoryStore = + instance ?: synchronized(this) { + instance ?: MeasurementHistoryStore(context.applicationContext).also { instance = it } + } + + private const val MAX_RECORDS = 100 + } + + private val prefs: SharedPreferences = context.getSharedPreferences("measurement_history", Context.MODE_PRIVATE) + private val gson = Gson() + private val key = "measurement_history" + + var records: List + get() { + val json = prefs.getString(key, null) ?: return emptyList() + return try { + val type = object : TypeToken>() {}.type + gson.fromJson(json, type) + } catch (_: Exception) { emptyList() } + } + private set(value) { + val trimmed = if (value.size > MAX_RECORDS) value.take(MAX_RECORDS) else value + prefs.edit().putString(key, gson.toJson(trimmed)).apply() + } + + fun addRecord(record: MeasurementRecord) { + val current = records.toMutableList() + current.add(0, record) + records = current + } + + fun clearAll() { + prefs.edit().remove(key).apply() + } +} diff --git a/app/src/main/java/com/example/medilightv2android/services/MeasurementService.kt b/app/src/main/java/com/example/medilightv2android/services/MeasurementService.kt new file mode 100644 index 0000000..e8a7288 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/services/MeasurementService.kt @@ -0,0 +1,50 @@ +package com.example.medilightv2android.services + +import android.content.Context +import androidx.compose.runtime.mutableStateOf +import com.example.medilightv2android.ble.BleManager +import com.example.medilightv2android.models.SensorMode + +class MeasurementService private constructor(context: Context) { + companion object { + @Volatile + private var instance: MeasurementService? = null + fun getInstance(context: Context): MeasurementService = + instance ?: synchronized(this) { + instance ?: MeasurementService(context.applicationContext).also { instance = it } + } + } + + private val bleManager = BleManager.getInstance(context) + + val isMeasuring = mutableStateOf(false) + + fun performMeasurement(mode: SensorMode, completion: (Boolean) -> Unit) { + isMeasuring.value = true + when (mode) { + SensorMode.NIRS -> performNirsMeasurement(completion) + SensorMode.PIEZO -> performPiezoMeasurement(completion) + } + } + + private fun performNirsMeasurement(completion: (Boolean) -> Unit) { + bleManager.onNirsMcjReceived = { _ -> + isMeasuring.value = false + completion(true) + } + bleManager.sendMcjQuery() + } + + private fun performPiezoMeasurement(completion: (Boolean) -> Unit) { + bleManager.onPiezoDataReceived = { _ -> + isMeasuring.value = false + completion(true) + } + bleManager.sendBurst(freqOption = 2, cycles = 5, delayUs = 100) + } + + fun stop() { + isMeasuring.value = false + bleManager.sendPiezoStop() + } +} diff --git a/app/src/main/java/com/example/medilightv2android/services/NotificationService.kt b/app/src/main/java/com/example/medilightv2android/services/NotificationService.kt new file mode 100644 index 0000000..371416c --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/services/NotificationService.kt @@ -0,0 +1,77 @@ +package com.example.medilightv2android.services + +import android.app.NotificationChannel +import android.app.NotificationManager +import android.content.Context +import android.os.Build +import androidx.core.app.NotificationCompat +import androidx.core.app.NotificationManagerCompat +import com.example.medilightv2android.R +import com.example.medilightv2android.models.UrgencyLevel + +class NotificationService private constructor(private val context: Context) { + companion object { + @Volatile + private var instance: NotificationService? = null + fun getInstance(context: Context): NotificationService = + instance ?: synchronized(this) { + instance ?: NotificationService(context.applicationContext).also { instance = it } + } + + private const val CHANNEL_ID = "bladder_urgency" + private const val CHANNEL_NAME = "Bladder Monitoring" + } + + private var lastNotifiedUrgency: String? = null + + init { + createNotificationChannel() + } + + private fun createNotificationChannel() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val channel = NotificationChannel( + CHANNEL_ID, + CHANNEL_NAME, + NotificationManager.IMPORTANCE_HIGH + ).apply { + description = "Bladder level urgency notifications" + enableVibration(true) + } + val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + notificationManager.createNotificationChannel(channel) + } + } + + fun sendUrgencyNotification(urgency: UrgencyLevel, volume: Int) { + val urgencyKey = urgency.rawStringValue + if (urgencyKey == "safe" || urgencyKey == lastNotifiedUrgency) return + lastNotifiedUrgency = urgencyKey + + val (title, body) = when (urgency) { + UrgencyLevel.WARNING -> "Bladder Level Rising" to "Estimated $volume ml. Prepare for catheterization." + UrgencyLevel.URGENT -> "Catheterization Needed" to "Estimated $volume ml. Please catheterize now." + UrgencyLevel.SAFE -> return + } + + val priority = if (urgency == UrgencyLevel.URGENT) + NotificationCompat.PRIORITY_MAX else NotificationCompat.PRIORITY_HIGH + + val notification = NotificationCompat.Builder(context, CHANNEL_ID) + .setSmallIcon(R.drawable.ic_launcher_foreground) + .setContentTitle(title) + .setContentText(body) + .setPriority(priority) + .setAutoCancel(true) + .build() + + try { + NotificationManagerCompat.from(context).notify(urgencyKey.hashCode(), notification) + } catch (_: SecurityException) { } + } + + fun cancelAll() { + lastNotifiedUrgency = null + NotificationManagerCompat.from(context).cancelAll() + } +} diff --git a/app/src/main/java/com/example/medilightv2android/services/UserStorage.kt b/app/src/main/java/com/example/medilightv2android/services/UserStorage.kt new file mode 100644 index 0000000..33bd1f6 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/services/UserStorage.kt @@ -0,0 +1,98 @@ +package com.example.medilightv2android.services + +import android.content.Context +import android.content.SharedPreferences +import com.example.medilightv2android.models.* +import com.google.gson.Gson + +class UserStorage private constructor(context: Context) { + companion object { + @Volatile + private var instance: UserStorage? = null + fun getInstance(context: Context): UserStorage = + instance ?: synchronized(this) { + instance ?: UserStorage(context.applicationContext).also { instance = it } + } + } + + private val prefs: SharedPreferences = context.getSharedPreferences("medilight_prefs", Context.MODE_PRIVATE) + private val gson = Gson() + + init { + migratePinToKeychain() + } + + var user: User + get() { + val json = prefs.getString("user_data", null) ?: return User() + return try { gson.fromJson(json, User::class.java) } catch (_: Exception) { User() } + } + set(value) { prefs.edit().putString("user_data", gson.toJson(value)).apply() } + + var isRegistered: Boolean + get() = prefs.getBoolean("is_registered", false) + set(value) { prefs.edit().putBoolean("is_registered", value).apply() } + + var pin: String + get() { + KeychainService.load("user_pin")?.let { return it } + return prefs.getString("user_pin", "") ?: "" + } + set(value) { + KeychainService.save("user_pin", value) + prefs.edit().remove("user_pin").apply() + } + + var hasPin: Boolean + get() = prefs.getBoolean("has_pin", false) + set(value) { prefs.edit().putBoolean("has_pin", value).apply() } + + var sensorMode: SensorMode + get() { + val raw = prefs.getString("sensor_mode", null) ?: return SensorMode.PIEZO + return try { SensorMode.valueOf(raw) } catch (_: Exception) { SensorMode.PIEZO } + } + set(value) { prefs.edit().putString("sensor_mode", value.name).apply() } + + var lastDeviceAddress: String? + get() = prefs.getString("last_device_address", null) + set(value) { prefs.edit().putString("last_device_address", value).apply() } + + var lastDeviceName: String? + get() = prefs.getString("last_device_name", null) + set(value) { prefs.edit().putString("last_device_name", value).apply() } + + var catheterizationLevel: Int + get() { + val v = prefs.getInt("catheterization_level", 0) + return if (v > 0) v else 8 + } + set(value) { prefs.edit().putInt("catheterization_level", value).apply() } + + var bladderLevel: Int + get() = prefs.getInt("bladder_level", 0) + set(value) { prefs.edit().putInt("bladder_level", value).apply() } + + var hasCompletedOnboarding: Boolean + get() = prefs.getBoolean("has_completed_onboarding", false) + set(value) { prefs.edit().putBoolean("has_completed_onboarding", value).apply() } + + var piezoSettings: PiezoSettings + get() { + val json = prefs.getString("piezo_settings", null) ?: return PiezoSettings() + return try { gson.fromJson(json, PiezoSettings::class.java) } catch (_: Exception) { PiezoSettings() } + } + set(value) { prefs.edit().putString("piezo_settings", gson.toJson(value)).apply() } + + private fun migratePinToKeychain() { + val existingPin = prefs.getString("user_pin", null) + if (existingPin.isNullOrEmpty()) return + val keychainPin = KeychainService.load("user_pin") + if (!keychainPin.isNullOrEmpty()) { + prefs.edit().remove("user_pin").apply() + return + } + KeychainService.save("user_pin", existingPin) + prefs.edit().remove("user_pin").apply() + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/components/BladdyRiveView.kt b/app/src/main/java/com/example/medilightv2android/ui/components/BladdyRiveView.kt new file mode 100644 index 0000000..79d3787 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/components/BladdyRiveView.kt @@ -0,0 +1,121 @@ +package com.example.medilightv2android.ui.components + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.size +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.ui.viewinterop.AndroidView +import app.rive.runtime.kotlin.RiveAnimationView +import app.rive.runtime.kotlin.core.Fit +import com.example.medilightv2android.R +import com.example.medilightv2android.models.UrgencyLevel +import kotlinx.coroutines.delay +import kotlin.random.Random + +/** + * Bladdy Rive animation that responds to urgency level changes. + * Used in monitoring views where bladder level is tracked. + * + * State machine inputs: + * 0 = idle, 1 = wave, 3 = urgent, 4 = warning, 5 = eyes + */ +@Composable +fun BladdyRiveView( + urgency: UrgencyLevel, + size: Dp = 100.dp, + modifier: Modifier = Modifier +) { + val riveView = remember { mutableListOf() } + + Box( + modifier = modifier.size(size), + contentAlignment = Alignment.Center + ) { + AndroidView( + factory = { context -> + RiveAnimationView(context).apply { + setRiveResource( + R.raw.bladdy_final12, + stateMachineName = "State Machine 1", + fit = Fit.CONTAIN + ) + riveView.clear() + riveView.add(this) + } + }, + modifier = Modifier.size(size) + ) + } + + // Respond to urgency changes + LaunchedEffect(urgency) { + val view = riveView.firstOrNull() ?: return@LaunchedEffect + when (urgency) { + UrgencyLevel.SAFE -> { + view.setNumberState("State Machine 1", "state", 0f) + // Random idle animations every 4 seconds + while (true) { + delay(4000) + val randomState = listOf(0f, 1f, 5f).random() + view.setNumberState("State Machine 1", "state", randomState) + } + } + UrgencyLevel.WARNING -> { + view.setNumberState("State Machine 1", "state", 4f) + } + UrgencyLevel.URGENT -> { + view.setNumberState("State Machine 1", "state", 3f) + } + } + } +} + +/** + * Bladdy Rive animation for idle/decorative use. + * Plays random animations (idle, wave, eyes) every 5 seconds. + * Used on home, onboarding, registration, sensor select, pin, scan screens. + */ +@Composable +fun BladdyIdleRiveView( + size: Dp = 220.dp, + modifier: Modifier = Modifier +) { + val riveView = remember { mutableListOf() } + + Box( + modifier = modifier.size(size), + contentAlignment = Alignment.Center + ) { + AndroidView( + factory = { context -> + RiveAnimationView(context).apply { + setRiveResource( + R.raw.bladdy_final12, + stateMachineName = "State Machine 1", + fit = Fit.CONTAIN + ) + setNumberState("State Machine 1", "state", 0f) + riveView.clear() + riveView.add(this) + } + }, + modifier = Modifier.size(size) + ) + } + + // Random idle animations every 5 seconds + LaunchedEffect(Unit) { + while (true) { + delay(5000) + val view = riveView.firstOrNull() ?: continue + val randomState = listOf(0f, 1f, 5f).random() + view.setNumberState("State Machine 1", "state", randomState) + } + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/components/BleDisconnectionBanner.kt b/app/src/main/java/com/example/medilightv2android/ui/components/BleDisconnectionBanner.kt new file mode 100644 index 0000000..3a04ab4 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/components/BleDisconnectionBanner.kt @@ -0,0 +1,82 @@ +package com.example.medilightv2android.ui.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.* +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.example.medilightv2android.ui.theme.MlPrimary + +enum class BleReconnectionState { + DISCONNECTED, RECONNECTING, FAILED +} + +@Composable +fun BleDisconnectionBanner( + state: BleReconnectionState, + onReconnect: () -> Unit +) { + val bannerColor = when (state) { + BleReconnectionState.DISCONNECTED -> Color(0xFFFF9500) + BleReconnectionState.RECONNECTING -> MlPrimary + BleReconnectionState.FAILED -> Color.Red + } + + Row( + modifier = Modifier + .fillMaxWidth() + .shadow(8.dp, RoundedCornerShape(14.dp), spotColor = Color.Black.copy(alpha = 0.1f)) + .clip(RoundedCornerShape(14.dp)) + .background(bannerColor) + .padding(16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + when (state) { + BleReconnectionState.RECONNECTING -> { + CircularProgressIndicator( + modifier = Modifier.size(24.dp), + color = Color.White, + strokeWidth = 2.dp + ) + } + else -> { + Text("!", color = Color.White, fontWeight = FontWeight.Bold, fontSize = 20.sp) + } + } + + Spacer(modifier = Modifier.width(12.dp)) + + Column(modifier = Modifier.weight(1f)) { + Text( + text = if (state == BleReconnectionState.RECONNECTING) "Reconnecting..." else "Device Disconnected", + fontWeight = FontWeight.Bold, + color = Color.White, + fontSize = 14.sp + ) + Text( + text = if (state == BleReconnectionState.FAILED) "Could not reconnect" else "Connection lost", + color = Color.White.copy(alpha = 0.8f), + fontSize = 12.sp + ) + } + + if (state != BleReconnectionState.RECONNECTING) { + Button( + onClick = onReconnect, + colors = ButtonDefaults.buttonColors(containerColor = Color.White), + contentPadding = PaddingValues(horizontal = 12.dp, vertical = 6.dp), + shape = RoundedCornerShape(8.dp) + ) { + Text("Reconnect", fontSize = 13.sp, fontWeight = FontWeight.Bold, color = bannerColor) + } + } + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/components/DonutChartView.kt b/app/src/main/java/com/example/medilightv2android/ui/components/DonutChartView.kt new file mode 100644 index 0000000..6b948ed --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/components/DonutChartView.kt @@ -0,0 +1,52 @@ +package com.example.medilightv2android.ui.components + +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.tween +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.layout.size +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import com.example.medilightv2android.models.UrgencyLevel + +@Composable +fun DonutChartView( + progress: Double, + urgency: UrgencyLevel, + lineWidth: Dp = 24.dp, + size: Dp = 240.dp +) { + val animatedProgress by animateFloatAsState( + targetValue = progress.toFloat().coerceIn(0f, 1f), + animationSpec = tween(600), + label = "progress" + ) + + val gradientColors = urgency.gradientColors + + Canvas(modifier = Modifier.size(size)) { + val strokeWidth = lineWidth.toPx() + + // Background track + drawCircle( + color = Color.Gray.copy(alpha = 0.12f), + style = Stroke(width = strokeWidth) + ) + + // Progress arc + if (animatedProgress > 0f) { + drawArc( + color = gradientColors.first(), + startAngle = -90f, + sweepAngle = 360f * animatedProgress, + useCenter = false, + style = Stroke(width = strokeWidth, cap = StrokeCap.Round) + ) + } + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/theme/Color.kt b/app/src/main/java/com/example/medilightv2android/ui/theme/Color.kt new file mode 100644 index 0000000..1499dc0 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/theme/Color.kt @@ -0,0 +1,20 @@ +package com.example.medilightv2android.ui.theme + +import androidx.compose.ui.graphics.Color + +// Material theme colors +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) + +// MediLight theme colors +val MlPrimary = Color(0xFF008FFF) +val MlTeal = Color(0xFF00DB9F) +val MlBackground = Color(0xFFF5F8FF) +val MlCardBackground = Color.White +val MlSecondaryText = Color(0xFF80808C) +val MlInputBackground = Color(0xFFF5F8FF) +val MlInputBorder = Color(0xFF00DB9F) diff --git a/app/src/main/java/com/example/medilightv2android/ui/theme/Theme.kt b/app/src/main/java/com/example/medilightv2android/ui/theme/Theme.kt new file mode 100644 index 0000000..3753eda --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/theme/Theme.kt @@ -0,0 +1,58 @@ +package com.example.medilightv2android.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.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun Medilightv2androidTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/example/medilightv2android/ui/theme/Type.kt b/app/src/main/java/com/example/medilightv2android/ui/theme/Type.kt new file mode 100644 index 0000000..408e4f3 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.example.medilightv2android.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/calibration/CalibrationView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/calibration/CalibrationView.kt new file mode 100644 index 0000000..916fddc --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/views/calibration/CalibrationView.kt @@ -0,0 +1,207 @@ +package com.example.medilightv2android.ui.views.calibration + +import android.os.Handler +import android.os.Looper +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.CheckCircle +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.example.medilightv2android.AppState +import com.example.medilightv2android.ble.BleManager +import com.example.medilightv2android.managers.NirsManager +import com.example.medilightv2android.models.NirsMagResponse +import com.example.medilightv2android.ui.components.BladdyIdleRiveView +import com.example.medilightv2android.ui.theme.* + +@Composable +fun CalibrationView(appState: AppState) { + val context = LocalContext.current + val bleManager = remember { BleManager.getInstance(context) } + val nirsManager = remember { NirsManager.instance } + val handler = remember { Handler(Looper.getMainLooper()) } + + var statusMessage by remember { mutableStateOf("Initializing...") } + var isComplete by remember { mutableStateOf(false) } + var isFailed by remember { mutableStateOf(false) } + var didReceiveResponse by remember { mutableStateOf(false) } + + val isServiceReady by bleManager.isServiceReady + + fun completeCalibration() { + if (isComplete) return + statusMessage = "NIRS Calibrated" + isComplete = true + } + + fun failCalibration() { + if (isComplete || isFailed) return + statusMessage = "No response from device. Check the device is powered on and nearby." + isFailed = true + } + + fun startCalibration() { + statusMessage = "Powering on NIRS transducer..." + + bleManager.onNirsPowerOnReceived = { + didReceiveResponse = true + statusMessage = "Activating sensor..." + handler.postDelayed({ bleManager.sendMqqQuery() }, 2000) + } + + bleManager.onNirsSensorActivated = { + statusMessage = "Reading gain calibration..." + handler.postDelayed({ bleManager.sendMagQuery() }, 300) + } + + bleManager.onNirsMagReceived = { data -> + NirsMagResponse.parse(data)?.let { response -> + nirsManager.setCalibrationGain(response) + } + completeCalibration() + } + + bleManager.sendNirsPowerOn() + + // Timeout + handler.postDelayed({ + if (didReceiveResponse) completeCalibration() else failCalibration() + }, 6000) + } + + fun retryCalibration() { + isFailed = false + isComplete = false + didReceiveResponse = false + statusMessage = "Initializing..." + startCalibration() + } + + LaunchedEffect(isServiceReady) { + if (isServiceReady) startCalibration() + } + + Column( + modifier = Modifier + .fillMaxSize() + .background(Color.White), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Spacer(modifier = Modifier.weight(1f)) + + // Bladdy with checkmark + Box { + BladdyIdleRiveView(size = 160.dp) + + if (isComplete) { + Icon( + Icons.Default.CheckCircle, + contentDescription = null, + tint = MlTeal, + modifier = Modifier + .size(40.dp) + .align(Alignment.BottomEnd) + .offset(x = (-10).dp, y = (-10).dp) + ) + } + } + + Spacer(modifier = Modifier.height(32.dp)) + + Text( + text = when { + isFailed -> "Calibration Failed" + isComplete -> "Calibration Complete" + else -> "Calibrating NIRS..." + }, + fontSize = 24.sp, + fontWeight = FontWeight.Bold, + color = if (isFailed) Color.Red else Color.Unspecified + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = statusMessage, + fontSize = 16.sp, + color = MlSecondaryText, + textAlign = TextAlign.Center, + modifier = Modifier.padding(horizontal = 32.dp) + ) + + Spacer(modifier = Modifier.weight(1f)) + + if (isFailed) { + Column( + modifier = Modifier.padding(horizontal = 32.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + Button( + onClick = { retryCalibration() }, + modifier = Modifier.fillMaxWidth().height(56.dp), + shape = RoundedCornerShape(16.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent), + contentPadding = PaddingValues() + ) { + Box( + modifier = Modifier.fillMaxSize().background( + Brush.horizontalGradient(listOf(MlTeal, MlPrimary)), + RoundedCornerShape(16.dp) + ), + contentAlignment = Alignment.Center + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Icon(Icons.Default.Refresh, null, tint = Color.White) + Spacer(Modifier.width(8.dp)) + Text("Retry", fontSize = 18.sp, fontWeight = FontWeight.SemiBold, color = Color.White) + } + } + } + + TextButton( + onClick = { appState.calibrationComplete() }, + modifier = Modifier.align(Alignment.CenterHorizontally) + ) { + Text("Skip", fontSize = 16.sp, fontWeight = FontWeight.SemiBold, color = MlSecondaryText) + } + } + } else if (isComplete) { + Button( + onClick = { appState.calibrationComplete() }, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 32.dp) + .height(56.dp), + shape = RoundedCornerShape(16.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent), + contentPadding = PaddingValues() + ) { + Box( + modifier = Modifier.fillMaxSize().background( + Brush.horizontalGradient(listOf(MlTeal, MlPrimary)), + RoundedCornerShape(16.dp) + ), + contentAlignment = Alignment.Center + ) { + Text("Continue", fontSize = 18.sp, fontWeight = FontWeight.SemiBold, color = Color.White) + } + } + } + + Spacer(modifier = Modifier.weight(1f)) + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/connection/DeviceScanView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/connection/DeviceScanView.kt new file mode 100644 index 0000000..663fcdd --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/views/connection/DeviceScanView.kt @@ -0,0 +1,382 @@ +package com.example.medilightv2android.ui.views.connection + +import android.Manifest +import android.content.pm.PackageManager +import android.os.Build +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight +import androidx.compose.material.icons.filled.Warning +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.core.content.ContextCompat +import com.example.medilightv2android.AppState +import com.example.medilightv2android.ble.BleDevice +import com.example.medilightv2android.ble.BleManager +import com.example.medilightv2android.models.SensorMode +import com.example.medilightv2android.ui.components.BladdyIdleRiveView +import com.example.medilightv2android.ui.theme.* + +@Composable +fun DeviceScanView(appState: AppState) { + val context = LocalContext.current + val bleManager = remember { BleManager.getInstance(context) } + var connectingDeviceAddress by remember { mutableStateOf(null) } + var permissionsGranted by remember { mutableStateOf(false) } + + val devicePrefix = if (appState.sensorMode == SensorMode.NIRS) "2025A04DEV" else "2025MEDIP" + + val filteredDevices = bleManager.discoveredDevices + .filter { it.name.startsWith(devicePrefix) } + .sortedByDescending { it.rssi } + + val isConnected by bleManager.isConnected + val isScanning by bleManager.isScanning + val bluetoothEnabled by bleManager.bluetoothEnabled + val connectionError by bleManager.connectionError + + // BLE permissions + val requiredPermissions = remember { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + arrayOf( + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.ACCESS_FINE_LOCATION + ) + } else { + arrayOf( + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.ACCESS_COARSE_LOCATION + ) + } + } + + fun checkPermissions(): Boolean { + return requiredPermissions.all { + ContextCompat.checkSelfPermission(context, it) == PackageManager.PERMISSION_GRANTED + } + } + + val permissionLauncher = rememberLauncherForActivityResult( + ActivityResultContracts.RequestMultiplePermissions() + ) { results -> + permissionsGranted = results.values.all { it } + if (permissionsGranted) { + bleManager.startScan() + } + } + + LaunchedEffect(Unit) { + if (checkPermissions()) { + permissionsGranted = true + bleManager.startScan() + } else { + permissionLauncher.launch(requiredPermissions) + } + } + + LaunchedEffect(isConnected) { + if (isConnected) { + connectingDeviceAddress = null + appState.deviceConnected() + } + } + + LaunchedEffect(connectionError) { + if (connectionError != null) connectingDeviceAddress = null + } + + DisposableEffect(Unit) { onDispose { bleManager.stopScan() } } + + Column( + modifier = Modifier + .fillMaxSize() + .background(MlBackground) + ) { + // Header + Row( + modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + IconButton(onClick = { appState.backToSensorSelect() }) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, "Back", tint = MlPrimary) + } + Spacer(modifier = Modifier.weight(1f)) + } + + Column( + modifier = Modifier.fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text("Connect Device", fontSize = 24.sp, fontWeight = FontWeight.Bold) + Spacer(modifier = Modifier.height(8.dp)) + Text("Searching for $devicePrefix devices...", fontSize = 14.sp, color = MlSecondaryText) + } + + Spacer(modifier = Modifier.height(24.dp)) + + // Bluetooth off warning + if (!bluetoothEnabled) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 24.dp) + .clip(RoundedCornerShape(14.dp)) + .background(Color(0xFFFF9500)) + .padding(16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Icon(Icons.Default.Warning, "Warning", tint = Color.White) + Spacer(modifier = Modifier.width(12.dp)) + Column { + Text("Bluetooth is off", fontWeight = FontWeight.Bold, color = Color.White, fontSize = 14.sp) + Text("Enable Bluetooth in Settings", color = Color.White.copy(alpha = 0.8f), fontSize = 12.sp) + } + } + Spacer(modifier = Modifier.height(8.dp)) + } + + // Permission denied warning + if (!permissionsGranted) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 24.dp) + .clip(RoundedCornerShape(14.dp)) + .background(Color(0xFFFF9500)) + .padding(16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Icon(Icons.Default.Warning, "Warning", tint = Color.White) + Spacer(modifier = Modifier.width(12.dp)) + Column { + Text("Permissions required", fontWeight = FontWeight.Bold, color = Color.White, fontSize = 14.sp) + Text("Bluetooth and Location permissions are needed to scan for devices", color = Color.White.copy(alpha = 0.8f), fontSize = 12.sp) + } + } + Spacer(modifier = Modifier.height(8.dp)) + } + + // Connection error + connectionError?.let { error -> + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 24.dp) + .clip(RoundedCornerShape(12.dp)) + .background(Color.Red) + .padding(12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Icon(Icons.Default.Close, "Error", tint = Color.White) + Spacer(modifier = Modifier.width(12.dp)) + Text(error, color = Color.White, fontSize = 13.sp, modifier = Modifier.weight(1f)) + IconButton(onClick = { bleManager.connectionError.value = null }) { + Icon(Icons.Default.Close, "Dismiss", tint = Color.White.copy(alpha = 0.8f)) + } + } + Spacer(modifier = Modifier.height(8.dp)) + } + + // Device list + if (filteredDevices.isEmpty() && isScanning) { + Column( + modifier = Modifier.weight(1f), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + BladdyIdleRiveView(size = 140.dp) + Spacer(modifier = Modifier.height(16.dp)) + Text("Scanning...", color = MlSecondaryText) + } + } else if (filteredDevices.isEmpty()) { + Column( + modifier = Modifier + .weight(1f) + .padding(horizontal = 24.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Text("No devices found", fontSize = 16.sp, fontWeight = FontWeight.SemiBold, color = MlSecondaryText) + Spacer(modifier = Modifier.height(16.dp)) + Card( + shape = RoundedCornerShape(14.dp), + colors = CardDefaults.cardColors(containerColor = MlCardBackground) + ) { + Column(modifier = Modifier.padding(16.dp)) { + TroubleshootItem("1.", "Make sure the device is powered on") + TroubleshootItem("2.", "Keep the device within 1 meter") + TroubleshootItem("3.", "Check Bluetooth is enabled in Settings") + TroubleshootItem("4.", "Try restarting the device") + } + } + } + } else { + LazyColumn( + modifier = Modifier.weight(1f), + contentPadding = PaddingValues(horizontal = 24.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + items(filteredDevices, key = { it.address }) { device -> + DeviceRow( + device = device, + isConnecting = connectingDeviceAddress == device.address, + enabled = connectingDeviceAddress == null, + onClick = { + connectingDeviceAddress = device.address + bleManager.connect(device) + } + ) + } + } + } + + // Scan button + Button( + onClick = { + if (!permissionsGranted) { + permissionLauncher.launch(requiredPermissions) + } else if (isScanning) { + bleManager.stopScan() + } else { + bleManager.startScan() + } + }, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 24.dp) + .padding(bottom = 32.dp) + .height(50.dp), + shape = RoundedCornerShape(14.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent), + contentPadding = PaddingValues() + ) { + Box( + modifier = Modifier + .fillMaxSize() + .background( + brush = Brush.horizontalGradient(listOf(MlTeal, MlPrimary)), + shape = RoundedCornerShape(14.dp) + ), + contentAlignment = Alignment.Center + ) { + Text( + when { + !permissionsGranted -> "Grant Permissions" + isScanning -> "Stop Scan" + else -> "Start Scan" + }, + fontSize = 16.sp, + fontWeight = FontWeight.SemiBold, + color = Color.White + ) + } + } + } +} + +@Composable +private fun DeviceRow(device: BleDevice, isConnecting: Boolean, enabled: Boolean, onClick: () -> Unit) { + Card( + modifier = Modifier + .fillMaxWidth() + .shadow(4.dp, RoundedCornerShape(14.dp), spotColor = Color.Black.copy(alpha = 0.04f)) + .clickable(enabled = enabled, onClick = onClick), + shape = RoundedCornerShape(14.dp), + colors = CardDefaults.cardColors(containerColor = MlCardBackground) + ) { + Row( + modifier = Modifier.padding(16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier + .size(48.dp) + .clip(RoundedCornerShape(12.dp)) + .background(MlPrimary.copy(alpha = 0.1f)), + contentAlignment = Alignment.Center + ) { + Text("BLE", color = MlPrimary, fontWeight = FontWeight.Bold, fontSize = 12.sp) + } + + Spacer(modifier = Modifier.width(16.dp)) + + Column(modifier = Modifier.weight(1f)) { + Text(device.name, fontSize = 16.sp, fontWeight = FontWeight.SemiBold) + Row(verticalAlignment = Alignment.CenterVertically) { + SignalBars(rssi = device.rssi) + Spacer(modifier = Modifier.width(4.dp)) + Text(signalLabel(device.rssi), fontSize = 12.sp, color = MlSecondaryText) + } + } + + if (isConnecting) { + CircularProgressIndicator(modifier = Modifier.size(24.dp), strokeWidth = 2.dp) + } else { + Icon(Icons.AutoMirrored.Filled.KeyboardArrowRight, null, tint = MlSecondaryText) + } + } + } +} + +@Composable +private fun SignalBars(rssi: Int) { + val strength = when { + rssi >= -50 -> 4 + rssi >= -65 -> 3 + rssi >= -80 -> 2 + else -> 1 + } + val color = when { + strength >= 3 -> Color.Green + strength == 2 -> Color(0xFFFF9500) + else -> Color.Red + } + Row(horizontalArrangement = Arrangement.spacedBy(2.dp), verticalAlignment = Alignment.Bottom) { + repeat(4) { i -> + Box( + modifier = Modifier + .width(4.dp) + .height((6 + i * 3).dp) + .clip(RoundedCornerShape(1.dp)) + .background(if (i < strength) color else Color.Gray.copy(alpha = 0.3f)) + ) + } + } +} + +private fun signalLabel(rssi: Int): String = when { + rssi >= -50 -> "Excellent" + rssi >= -65 -> "Good" + rssi >= -80 -> "Fair" + else -> "Weak" +} + +@Composable +private fun TroubleshootItem(number: String, text: String) { + Row(modifier = Modifier.padding(vertical = 4.dp)) { + Text(number, fontSize = 13.sp, color = MlPrimary, fontWeight = FontWeight.Bold) + Spacer(modifier = Modifier.width(8.dp)) + Text(text, fontSize = 13.sp, color = MlSecondaryText) + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/history/MeasurementHistoryView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/history/MeasurementHistoryView.kt new file mode 100644 index 0000000..ba32c8d --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/views/history/MeasurementHistoryView.kt @@ -0,0 +1,451 @@ +package com.example.medilightv2android.ui.views.history + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.background +import androidx.compose.foundation.gestures.detectTapGestures +import androidx.compose.foundation.gestures.detectTransformGestures +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.clipToBounds +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.PathEffect +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.graphics.nativeCanvas +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.example.medilightv2android.AppState +import com.example.medilightv2android.models.* +import com.example.medilightv2android.services.MeasurementHistoryStore +import com.example.medilightv2android.ui.theme.* +import java.text.SimpleDateFormat +import java.util.* + +@Composable +fun MeasurementHistoryView(appState: AppState) { + val context = LocalContext.current + val records = remember { MeasurementHistoryStore.getInstance(context).records } + var selectedTab by remember { mutableIntStateOf(0) } + + Column( + modifier = Modifier + .fillMaxSize() + .background(MlBackground) + ) { + // Top bar + Row( + modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + IconButton(onClick = { appState.backToMonitoring() }) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, "Back", tint = MlPrimary) + } + Text("History", fontSize = 20.sp, fontWeight = FontWeight.Bold, modifier = Modifier.padding(start = 8.dp)) + Spacer(modifier = Modifier.weight(1f)) + Text("${records.size} records", fontSize = 13.sp, color = MlSecondaryText) + } + + // Tab picker + TabRow(selectedTabIndex = selectedTab, modifier = Modifier.padding(horizontal = 24.dp)) { + Tab(selected = selectedTab == 0, onClick = { selectedTab = 0 }) { Text("History", modifier = Modifier.padding(12.dp)) } + Tab(selected = selectedTab == 1, onClick = { selectedTab = 1 }) { Text("Trends", modifier = Modifier.padding(12.dp)) } + } + + if (records.isEmpty()) { + Column( + modifier = Modifier.fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Text("No measurements yet", fontSize = 16.sp, fontWeight = FontWeight.SemiBold, color = MlSecondaryText) + Spacer(modifier = Modifier.height(8.dp)) + Text("Tap Spot to start measuring", fontSize = 14.sp, color = MlSecondaryText.copy(alpha = 0.7f)) + } + } else if (selectedTab == 0) { + LazyColumn( + contentPadding = PaddingValues(horizontal = 24.dp, vertical = 16.dp), + verticalArrangement = Arrangement.spacedBy(10.dp) + ) { + items(records) { record -> + RecordCard(record) + } + } + } else { + // Trends tab + val measurements = records.filter { it.eventType == MeasurementEventType.MEASUREMENT }.reversed() + val cathEvents = records.filter { it.eventType == MeasurementEventType.CATHETERIZATION } + + LazyColumn( + contentPadding = PaddingValues(horizontal = 24.dp, vertical = 16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + // Level chart + item { + InteractiveChartCard( + title = "Bladder Level", + measurements = measurements, + valueExtractor = { it.level.toFloat() }, + maxValue = BladderLevel.MAX_LEVEL.toFloat(), + lineColor = MlPrimary.copy(alpha = 0.8f), + pointColorExtractor = { it.urgencyLevel.accentColor }, + thresholdValue = appState.bladderLevel.catheterizationThreshold.toFloat(), + unit = "Lv" + ) + } + + // Volume chart + if (measurements.isNotEmpty()) { + item { + InteractiveChartCard( + title = "Estimated Volume", + measurements = measurements, + valueExtractor = { it.estimatedVolume.toFloat() }, + maxValue = measurements.maxOf { it.estimatedVolume }.toFloat().coerceAtLeast(1f), + lineColor = MlTeal, + pointColorExtractor = { MlTeal }, + unit = "ml" + ) + } + } + + // Catheterization log + if (cathEvents.isNotEmpty()) { + item { + Card( + shape = RoundedCornerShape(16.dp), + colors = CardDefaults.cardColors(containerColor = MlCardBackground), + modifier = Modifier.shadow(4.dp, RoundedCornerShape(16.dp)) + ) { + Column(modifier = Modifier.padding(20.dp)) { + Text("Catheterization Log", fontSize = 14.sp, fontWeight = FontWeight.SemiBold) + Spacer(modifier = Modifier.height(8.dp)) + cathEvents.forEach { event -> + Row(modifier = Modifier.padding(vertical = 4.dp)) { + Text(formatDate(event.timestamp), fontSize = 13.sp) + Spacer(modifier = Modifier.weight(1f)) + Text("at Lv.${event.level}", fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = MlSecondaryText) + } + } + } + } + } + } + } + } + } +} + +@Composable +private fun InteractiveChartCard( + title: String, + measurements: List, + valueExtractor: (MeasurementRecord) -> Float, + maxValue: Float, + lineColor: Color, + pointColorExtractor: (MeasurementRecord) -> Color, + thresholdValue: Float? = null, + unit: String +) { + var scale by remember { mutableFloatStateOf(1f) } + var offsetX by remember { mutableFloatStateOf(0f) } + var selectedIndex by remember { mutableIntStateOf(-1) } + + Card( + shape = RoundedCornerShape(16.dp), + colors = CardDefaults.cardColors(containerColor = MlCardBackground), + modifier = Modifier.shadow(4.dp, RoundedCornerShape(16.dp)) + ) { + Column(modifier = Modifier.padding(20.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(title, fontSize = 14.sp, fontWeight = FontWeight.SemiBold) + Spacer(modifier = Modifier.weight(1f)) + if (scale > 1.05f) { + Text( + String.format("%.0f%%", scale * 100), + fontSize = 10.sp, + color = MlPrimary, + fontWeight = FontWeight.SemiBold + ) + } + } + + Spacer(modifier = Modifier.height(4.dp)) + + // Tooltip + if (selectedIndex in measurements.indices) { + val record = measurements[selectedIndex] + val value = valueExtractor(record) + Row( + modifier = Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(8.dp)) + .background(MlPrimary.copy(alpha = 0.08f)) + .padding(horizontal = 12.dp, vertical = 6.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + formatDateTime(record.timestamp), + fontSize = 11.sp, + fontWeight = FontWeight.Medium, + color = MlPrimary + ) + Spacer(modifier = Modifier.weight(1f)) + Text( + "${if (unit == "Lv") value.toInt().toString() else String.format("%.0f", value)} $unit", + fontSize = 13.sp, + fontWeight = FontWeight.Bold, + color = MlPrimary + ) + Spacer(modifier = Modifier.width(8.dp)) + Text( + record.urgencyLevel.rawStringValue, + fontSize = 11.sp, + fontWeight = FontWeight.SemiBold, + color = record.urgencyLevel.accentColor + ) + } + Spacer(modifier = Modifier.height(4.dp)) + } + + if (measurements.isEmpty()) { + Text("No measurement data", fontSize = 12.sp, color = MlSecondaryText) + } else { + val density = LocalDensity.current + val textPaint = remember { + android.graphics.Paint().apply { + color = android.graphics.Color.parseColor("#80808C") + textSize = with(density) { 9.sp.toPx() } + isAntiAlias = true + textAlign = android.graphics.Paint.Align.CENTER + } + } + + Box( + modifier = Modifier + .fillMaxWidth() + .height(200.dp) + .clipToBounds() + .pointerInput(measurements.size) { + detectTransformGestures { _, pan, zoom, _ -> + val newScale = (scale * zoom).coerceIn(1f, 5f) + scale = newScale + val totalWidth = size.width * scale + val maxOff = (totalWidth - size.width).coerceAtLeast(0f) + offsetX = (offsetX + pan.x).coerceIn(-maxOff, 0f) + } + } + .pointerInput(measurements.size, scale, offsetX) { + detectTapGestures { tapOffset -> + if (measurements.size < 2) { + selectedIndex = if (selectedIndex == 0) -1 else 0 + return@detectTapGestures + } + val totalWidth = size.width * scale + val stepX = totalWidth / (measurements.size - 1).toFloat() + val dataX = tapOffset.x - offsetX + val idx = (dataX / stepX + 0.5f).toInt().coerceIn(0, measurements.size - 1) + selectedIndex = if (selectedIndex == idx) -1 else idx + } + } + ) { + Canvas(modifier = Modifier.fillMaxSize()) { + if (measurements.size < 2) { + val value = valueExtractor(measurements[0]) + val y = size.height * 0.5f + drawCircle(pointColorExtractor(measurements[0]), radius = 8f, center = Offset(size.width / 2, y)) + return@Canvas + } + + val totalWidth = size.width * scale + val stepX = totalWidth / (measurements.size - 1).toFloat() + val chartHeight = size.height - 24f + val topPadding = 10f + + // Threshold line (dashed) + thresholdValue?.let { threshold -> + val thresholdY = topPadding + chartHeight - (threshold / maxValue * chartHeight) + drawLine( + Color.Red.copy(alpha = 0.4f), + Offset(0f, thresholdY), + Offset(size.width, thresholdY), + strokeWidth = 2f, + pathEffect = PathEffect.dashPathEffect(floatArrayOf(8f, 6f)) + ) + } + + // Draw line path + val path = Path() + measurements.forEachIndexed { i, r -> + val x = i * stepX + offsetX + val value = valueExtractor(r) + val y = topPadding + chartHeight - (value / maxValue * chartHeight) + if (i == 0) path.moveTo(x, y) else path.lineTo(x, y) + } + drawPath(path, color = lineColor, style = Stroke(width = 3f)) + + // Draw points and labels + val labelInterval = when { + measurements.size <= 6 -> 1 + measurements.size <= 15 -> 2 + measurements.size <= 30 -> 5 + else -> 10 + } + + measurements.forEachIndexed { i, r -> + val x = i * stepX + offsetX + if (x < -20f || x > size.width + 20f) return@forEachIndexed + val value = valueExtractor(r) + val y = topPadding + chartHeight - (value / maxValue * chartHeight) + val isSelected = i == selectedIndex + val pointColor = pointColorExtractor(r) + + if (isSelected) { + // Vertical guide + drawLine( + pointColor.copy(alpha = 0.3f), + Offset(x, topPadding), + Offset(x, topPadding + chartHeight), + strokeWidth = 1f, + pathEffect = PathEffect.dashPathEffect(floatArrayOf(4f, 4f)) + ) + // Selection ring + drawCircle(pointColor.copy(alpha = 0.2f), radius = 16f, center = Offset(x, y)) + drawCircle(pointColor, radius = 8f, center = Offset(x, y)) + drawCircle(Color.White, radius = 4f, center = Offset(x, y)) + } else { + drawCircle(pointColor, radius = 5f, center = Offset(x, y)) + } + + // Time labels + if (i % labelInterval == 0 || i == measurements.size - 1) { + val label = formatShortTime(r.timestamp) + drawContext.canvas.nativeCanvas.drawText( + label, x, size.height, textPaint + ) + } + } + } + } + + // Hint text + if (measurements.size > 3 && scale < 1.05f && selectedIndex < 0) { + Text( + "Pinch to zoom \u2022 Tap point for details", + fontSize = 10.sp, + color = MlSecondaryText.copy(alpha = 0.5f), + modifier = Modifier.padding(top = 4.dp) + ) + } + } + } + } +} + +@Composable +private fun RecordCard(record: MeasurementRecord) { + val isCath = record.eventType == MeasurementEventType.CATHETERIZATION + Card( + shape = RoundedCornerShape(14.dp), + colors = CardDefaults.cardColors(containerColor = MlCardBackground), + modifier = Modifier.fillMaxWidth().shadow(4.dp, RoundedCornerShape(14.dp), spotColor = Color.Black.copy(alpha = 0.04f)) + ) { + Row( + modifier = Modifier.padding(14.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier + .size(40.dp) + .clip(CircleShape) + .background( + if (isCath) MlPrimary.copy(alpha = 0.12f) + else record.urgencyLevel.accentColor.copy(alpha = 0.12f) + ), + contentAlignment = Alignment.Center + ) { + Text( + if (isCath) "C" else "M", + fontWeight = FontWeight.SemiBold, + color = if (isCath) MlPrimary else record.urgencyLevel.accentColor + ) + } + + Spacer(modifier = Modifier.width(14.dp)) + + Column(modifier = Modifier.weight(1f)) { + Text( + if (isCath) "Catheterization" else "Measurement", + fontSize = 14.sp, fontWeight = FontWeight.SemiBold + ) + Text(formatDate(record.timestamp), fontSize = 12.sp, color = MlSecondaryText) + } + + Column(horizontalAlignment = Alignment.End) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text("Lv.${record.level}", fontSize = 14.sp, fontWeight = FontWeight.Bold) + Spacer(modifier = Modifier.width(4.dp)) + Box(modifier = Modifier.size(8.dp).clip(CircleShape).background(record.urgencyLevel.accentColor)) + } + Text("${record.estimatedVolume} ml", fontSize = 12.sp, color = MlSecondaryText) + } + } + } +} + +private fun formatDate(timestamp: Long): String { + val cal = Calendar.getInstance() + val now = Calendar.getInstance() + cal.timeInMillis = timestamp + + return when { + cal.get(Calendar.DAY_OF_YEAR) == now.get(Calendar.DAY_OF_YEAR) && + cal.get(Calendar.YEAR) == now.get(Calendar.YEAR) -> { + SimpleDateFormat("h:mm a", Locale.US).format(Date(timestamp)) + } + now.timeInMillis - timestamp < 2 * 24 * 60 * 60 * 1000 -> { + "Yesterday " + SimpleDateFormat("h:mm a", Locale.US).format(Date(timestamp)) + } + else -> { + SimpleDateFormat("MMM d, h:mm a", Locale.US).format(Date(timestamp)) + } + } +} + +private fun formatDateTime(timestamp: Long): String { + val cal = Calendar.getInstance() + val now = Calendar.getInstance() + cal.timeInMillis = timestamp + + return when { + cal.get(Calendar.DAY_OF_YEAR) == now.get(Calendar.DAY_OF_YEAR) && + cal.get(Calendar.YEAR) == now.get(Calendar.YEAR) -> { + "Today " + SimpleDateFormat("h:mm:ss a", Locale.US).format(Date(timestamp)) + } + now.timeInMillis - timestamp < 2 * 24 * 60 * 60 * 1000 -> { + "Yesterday " + SimpleDateFormat("h:mm:ss a", Locale.US).format(Date(timestamp)) + } + else -> { + SimpleDateFormat("MMM d, h:mm:ss a", Locale.US).format(Date(timestamp)) + } + } +} + +private fun formatShortTime(timestamp: Long): String { + return SimpleDateFormat("HH:mm", Locale.US).format(Date(timestamp)) +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/home/HomeView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/home/HomeView.kt new file mode 100644 index 0000000..902b7dc --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/views/home/HomeView.kt @@ -0,0 +1,69 @@ +package com.example.medilightv2android.ui.views.home + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.example.medilightv2android.AppState +import com.example.medilightv2android.ui.components.BladdyIdleRiveView +import com.example.medilightv2android.ui.theme.* + +@Composable +fun HomeView(appState: AppState) { + Column( + modifier = Modifier + .fillMaxSize() + .background(MlBackground), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Spacer(modifier = Modifier.weight(1f)) + + BladdyIdleRiveView(size = 220.dp) + + Spacer(modifier = Modifier.height(24.dp)) + + Text("MediLight", fontSize = 32.sp, fontWeight = FontWeight.Bold) + + Spacer(modifier = Modifier.height(4.dp)) + + Text("Smart Bladder Monitoring", fontSize = 16.sp, color = MlSecondaryText) + + Spacer(modifier = Modifier.weight(1f)) + + Button( + onClick = { appState.startFromHome() }, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 32.dp) + .padding(bottom = 48.dp) + .height(60.dp), + shape = RoundedCornerShape(18.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent), + contentPadding = PaddingValues() + ) { + Box( + modifier = Modifier + .fillMaxSize() + .background( + brush = Brush.horizontalGradient(listOf(MlTeal, MlPrimary)), + shape = RoundedCornerShape(18.dp) + ), + contentAlignment = Alignment.Center + ) { + Text("Start", fontSize = 20.sp, fontWeight = FontWeight.Bold, color = Color.White) + } + } + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PiezoMonitoringView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PiezoMonitoringView.kt new file mode 100644 index 0000000..6f2d142 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PiezoMonitoringView.kt @@ -0,0 +1,322 @@ +package com.example.medilightv2android.ui.views.monitoring + +import android.os.Handler +import android.os.Looper +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.* +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.example.medilightv2android.AppState +import com.example.medilightv2android.ble.BleManager +import com.example.medilightv2android.models.BladderLevel +import com.example.medilightv2android.models.UrgencyLevel +import com.example.medilightv2android.ui.components.BladdyRiveView +import com.example.medilightv2android.ui.components.BleDisconnectionBanner +import com.example.medilightv2android.ui.components.BleReconnectionState +import com.example.medilightv2android.ui.components.DonutChartView +import com.example.medilightv2android.ui.theme.* + +@Composable +fun PiezoMonitoringView(appState: AppState) { + val context = LocalContext.current + val bleManager = remember { BleManager.getInstance(context) } + val handler = remember { Handler(Looper.getMainLooper()) } + + var showSettings by remember { mutableStateOf(false) } + var isMeasuring by remember { mutableStateOf(false) } + var showCatheterizeConfirm by remember { mutableStateOf(false) } + var showDisconnectionBanner by remember { mutableStateOf(false) } + var reconnectionState by remember { mutableStateOf(BleReconnectionState.DISCONNECTED) } + var isAutoMeasuring by remember { mutableStateOf(false) } + + val urgency = appState.bladderLevel.urgency + val batteryLvl by bleManager.batteryLevel + val isConnected by bleManager.isConnected + + fun measure() { + isMeasuring = true + handler.postDelayed({ + appState.incrementLevel() + isMeasuring = false + }, 1500) + } + + fun stopAutoMeasure() { + isAutoMeasuring = false + } + + // Setup disconnect handling + LaunchedEffect(Unit) { + bleManager.onUnexpectedDisconnect = { + reconnectionState = BleReconnectionState.DISCONNECTED + showDisconnectionBanner = true + } + bleManager.onReconnectionFailed = { + reconnectionState = BleReconnectionState.FAILED + } + } + + // Catheterize confirmation dialog + if (showCatheterizeConfirm) { + AlertDialog( + onDismissRequest = { showCatheterizeConfirm = false }, + title = { Text("Reset bladder level?") }, + text = { Text("This will reset the bladder level to 0. This action cannot be undone.") }, + confirmButton = { + TextButton(onClick = { + appState.resetLevel() + showCatheterizeConfirm = false + }) { Text("Catheterize", color = Color.Red) } + }, + dismissButton = { + TextButton(onClick = { showCatheterizeConfirm = false }) { Text("Cancel") } + } + ) + } + + Column( + modifier = Modifier + .fillMaxSize() + .background(urgency.backgroundColor) + ) { + // Top bar + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 24.dp, vertical = 16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + IconButton(onClick = { appState.goHome() }) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, "Back", tint = MlPrimary) + } + Text("Bladder Monitor", fontSize = 20.sp, fontWeight = FontWeight.Bold, modifier = Modifier.padding(start = 8.dp)) + Spacer(modifier = Modifier.weight(1f)) + + if (isAutoMeasuring) { + Row( + modifier = Modifier + .clip(RoundedCornerShape(8.dp)) + .background(Color.Red.copy(alpha = 0.12f)) + .padding(horizontal = 8.dp, vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Box(modifier = Modifier.size(8.dp).clip(CircleShape).background(Color.Red)) + Spacer(modifier = Modifier.width(4.dp)) + Text("Auto", fontSize = 12.sp, fontWeight = FontWeight.Bold, color = Color.Red) + } + } + + IconButton(onClick = { appState.showHistory() }) { + Icon(Icons.Default.History, "History", tint = MlSecondaryText) + } + IconButton(onClick = { showSettings = !showSettings }) { + Icon(Icons.Default.Settings, "Settings", tint = if (showSettings) MlPrimary else MlSecondaryText) + } + + // Battery + Text("$batteryLvl%", fontSize = 13.sp, color = MlSecondaryText) + Spacer(modifier = Modifier.width(4.dp)) + Box( + modifier = Modifier + .size(10.dp) + .clip(CircleShape) + .background(if (isConnected) Color.Green else Color.Red) + ) + } + + if (showDisconnectionBanner) { + BleDisconnectionBanner( + state = reconnectionState, + onReconnect = { + reconnectionState = BleReconnectionState.RECONNECTING + bleManager.reconnectToLastDevice( + com.example.medilightv2android.services.UserStorage.getInstance(context).lastDeviceAddress + ) + } + ) + Spacer(modifier = Modifier.height(8.dp)) + } + + Column( + modifier = Modifier + .weight(1f) + .verticalScroll(rememberScrollState()) + .padding(horizontal = 24.dp) + .padding(top = 16.dp, bottom = 32.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(20.dp) + ) { + // Settings panel + if (showSettings) { + Card( + shape = RoundedCornerShape(16.dp), + colors = CardDefaults.cardColors(containerColor = MlCardBackground), + modifier = Modifier.shadow(8.dp, RoundedCornerShape(16.dp), spotColor = Color.Black.copy(alpha = 0.06f)) + ) { + Column(modifier = Modifier.padding(20.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text("Catheterization Threshold", fontSize = 14.sp, fontWeight = FontWeight.SemiBold) + Spacer(modifier = Modifier.weight(1f)) + Text("Level ${appState.bladderLevel.catheterizationThreshold}", fontSize = 14.sp, fontWeight = FontWeight.Bold, color = MlPrimary) + } + Slider( + value = appState.bladderLevel.catheterizationThreshold.toFloat(), + onValueChange = { appState.updateCatheterizationThreshold(it.toInt()) }, + valueRange = 1f..10f, + steps = 8, + colors = SliderDefaults.colors(thumbColor = MlPrimary, activeTrackColor = MlPrimary) + ) + HorizontalDivider() + Spacer(modifier = Modifier.height(8.dp)) + Row { + Text("Max Volume", fontSize = 14.sp, fontWeight = FontWeight.SemiBold) + Spacer(modifier = Modifier.weight(1f)) + Text("${appState.piezoSettings.maxVolume} ml", fontSize = 14.sp, color = MlSecondaryText) + } + } + } + } + + // Status badge + Text( + text = urgency.message, + fontSize = 14.sp, + fontWeight = FontWeight.Bold, + color = urgency.accentColor, + modifier = Modifier + .clip(RoundedCornerShape(20.dp)) + .background(urgency.accentColor.copy(alpha = 0.15f)) + .padding(horizontal = 20.dp, vertical = 8.dp) + ) + + // Donut chart with Bladdy + Box(contentAlignment = Alignment.Center) { + DonutChartView( + progress = appState.bladderLevel.progress, + urgency = urgency, + lineWidth = 28.dp, + size = 240.dp + ) + Column(horizontalAlignment = Alignment.CenterHorizontally) { + BladdyRiveView(urgency = urgency, size = 100.dp) + Spacer(modifier = Modifier.height(4.dp)) + Text( + "${appState.estimatedVolume} ml", + fontSize = 16.sp, + fontWeight = FontWeight.Bold, + color = urgency.accentColor, + modifier = Modifier + .clip(RoundedCornerShape(12.dp)) + .background(MlCardBackground) + .shadow(4.dp, RoundedCornerShape(12.dp), spotColor = Color.Black.copy(alpha = 0.08f)) + .padding(horizontal = 14.dp, vertical = 6.dp) + ) + } + } + + // Info cards + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + InfoCard("Volume", "${appState.estimatedVolume}", "ml", urgency.accentColor, Modifier.weight(1f)) + InfoCard("Fill", String.format("%.0f", appState.fillPercentage), "%", urgency.accentColor, Modifier.weight(1f)) + InfoCard("Level", "${appState.bladderLevel.currentLevel}/${BladderLevel.MAX_LEVEL}", "", urgency.accentColor, Modifier.weight(1f)) + } + + // Control buttons + Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + // Catheterize button + Button( + onClick = { showCatheterizeConfirm = true }, + modifier = Modifier.weight(1f).height(56.dp), + shape = RoundedCornerShape(16.dp), + colors = ButtonDefaults.buttonColors(containerColor = MlPrimary.copy(alpha = 0.1f)) + ) { + Text("Catheterize", fontSize = 16.sp, fontWeight = FontWeight.SemiBold, color = MlPrimary) + } + + // Spot button + Button( + onClick = { + if (isAutoMeasuring) stopAutoMeasure() + else if (!isMeasuring) measure() + }, + modifier = Modifier.weight(1f).height(56.dp), + shape = RoundedCornerShape(16.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent), + contentPadding = PaddingValues(), + enabled = !isMeasuring || isAutoMeasuring + ) { + Box( + modifier = Modifier.fillMaxSize().background( + Brush.horizontalGradient( + if (isAutoMeasuring) listOf(Color.Red, Color(0xFFFF9500)) + else urgency.gradientColors + ), + RoundedCornerShape(16.dp) + ), + contentAlignment = Alignment.Center + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + if (isMeasuring && !isAutoMeasuring) { + CircularProgressIndicator(color = Color.White, modifier = Modifier.size(20.dp), strokeWidth = 2.dp) + } + Spacer(modifier = Modifier.width(8.dp)) + Text( + when { + isAutoMeasuring -> "Stop" + isMeasuring -> "Measuring..." + else -> "Spot" + }, + fontSize = 16.sp, + fontWeight = FontWeight.SemiBold, + color = Color.White + ) + } + } + } + } + + Text( + if (isAutoMeasuring) "Measuring every 30s" else "Long press Spot for auto-measurement", + fontSize = 11.sp, + color = if (isAutoMeasuring) Color.Red.copy(alpha = 0.7f) else MlSecondaryText + ) + } + } +} + +@Composable +private fun InfoCard(title: String, value: String, unit: String, color: Color, modifier: Modifier = Modifier) { + Card( + modifier = modifier.shadow(4.dp, RoundedCornerShape(14.dp), spotColor = Color.Black.copy(alpha = 0.04f)), + shape = RoundedCornerShape(14.dp), + colors = CardDefaults.cardColors(containerColor = MlCardBackground) + ) { + Column( + modifier = Modifier.padding(vertical = 14.dp).fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(6.dp) + ) { + Text(value, fontSize = 20.sp, fontWeight = FontWeight.Bold) + if (unit.isNotEmpty()) Text(unit, fontSize = 11.sp, color = MlSecondaryText) + Text(title, fontSize = 11.sp, fontWeight = FontWeight.SemiBold, color = MlSecondaryText) + } + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/VivamyoMonitoringView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/VivamyoMonitoringView.kt new file mode 100644 index 0000000..53c0fe9 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/VivamyoMonitoringView.kt @@ -0,0 +1,347 @@ +package com.example.medilightv2android.ui.views.monitoring + +import android.os.Handler +import android.os.Looper +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.* +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.example.medilightv2android.AppState +import com.example.medilightv2android.ble.BleManager +import com.example.medilightv2android.managers.NirsManager +import com.example.medilightv2android.models.NirsMcjPacket +import com.example.medilightv2android.ui.components.BladdyIdleRiveView +import com.example.medilightv2android.ui.components.BleDisconnectionBanner +import com.example.medilightv2android.ui.components.BleReconnectionState +import com.example.medilightv2android.ui.theme.* + +@Composable +fun VivamyoMonitoringView(appState: AppState) { + val context = LocalContext.current + val bleManager = remember { BleManager.getInstance(context) } + val nirsManager = remember { NirsManager.instance } + val handler = remember { Handler(Looper.getMainLooper()) } + + var selectedTab by remember { mutableIntStateOf(0) } + var showClearConfirm by remember { mutableStateOf(false) } + var isToggling by remember { mutableStateOf(false) } + var showDisconnectionBanner by remember { mutableStateOf(false) } + var reconnectionState by remember { mutableStateOf(BleReconnectionState.DISCONNECTED) } + + val batteryLvl by bleManager.batteryLevel + val isConnected by bleManager.isConnected + val isStreaming by nirsManager.isStreaming + val currentOxy by nirsManager.currentOxy + val sampleCount by nirsManager.sampleCount + val isFilterEnabled by nirsManager.isFilterEnabled + + fun startNirsStream() { + bleManager.onNirsMcjReceived = { data -> + if (nirsManager.isStreaming.value) { + NirsMcjPacket.parse(data)?.let { packet -> + nirsManager.processMcjPacket(packet) + } + handler.postDelayed({ + if (nirsManager.isStreaming.value) bleManager.sendMcjQuery() + }, 100) + } + } + bleManager.sendMcjQuery() + } + + fun toggleStreaming() { + if (isToggling) return + isToggling = true + if (isStreaming) { + nirsManager.stopStreaming() + } else { + nirsManager.startStreaming() + startNirsStream() + } + handler.postDelayed({ isToggling = false }, 500) + } + + LaunchedEffect(Unit) { + bleManager.onUnexpectedDisconnect = { + reconnectionState = BleReconnectionState.DISCONNECTED + showDisconnectionBanner = true + } + } + + DisposableEffect(Unit) { onDispose { nirsManager.stopStreaming() } } + + // Clear confirm dialog + if (showClearConfirm) { + AlertDialog( + onDismissRequest = { showClearConfirm = false }, + title = { Text("Clear all data?") }, + text = { Text("All collected NIRS data will be permanently deleted.") }, + confirmButton = { + TextButton(onClick = { + nirsManager.clearData() + showClearConfirm = false + }) { Text("Clear Data", color = Color.Red) } + }, + dismissButton = { + TextButton(onClick = { showClearConfirm = false }) { Text("Cancel") } + } + ) + } + + val stO2Color = when { + currentOxy.stO2 < 50 -> Color.Red + currentOxy.stO2 < 60 -> Color(0xFFFF9500) + else -> Color.Green + } + val stO2StatusText = when { + currentOxy.stO2 < 50 -> "Low" + currentOxy.stO2 < 60 -> "Caution" + currentOxy.stO2 <= 85 -> "Normal" + else -> "Check" + } + + Column( + modifier = Modifier + .fillMaxSize() + .background(Color.White) + ) { + // Top bar + Row( + modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp, vertical = 16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + IconButton(onClick = { + nirsManager.reset() + appState.goHome() + }) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, "Back", tint = MlPrimary) + } + Column(modifier = Modifier.padding(start = 8.dp)) { + Text("Vivamyo", fontSize = 20.sp, fontWeight = FontWeight.Bold) + Text("NIRS Monitoring", fontSize = 13.sp, color = MlSecondaryText) + } + Spacer(modifier = Modifier.weight(1f)) + Text("$batteryLvl%", fontSize = 13.sp, color = MlSecondaryText) + Spacer(modifier = Modifier.width(8.dp)) + Box(modifier = Modifier.size(10.dp).clip(CircleShape).background(if (isConnected) Color.Green else Color.Red)) + } + + if (showDisconnectionBanner) { + BleDisconnectionBanner( + state = reconnectionState, + onReconnect = { + reconnectionState = BleReconnectionState.RECONNECTING + bleManager.reconnectToLastDevice( + com.example.medilightv2android.services.UserStorage.getInstance(context).lastDeviceAddress + ) + } + ) + } + + // Tab picker + TabRow(selectedTabIndex = selectedTab, modifier = Modifier.padding(horizontal = 24.dp)) { + Tab(selected = selectedTab == 0, onClick = { selectedTab = 0 }) { Text("SpO2", modifier = Modifier.padding(12.dp)) } + Tab(selected = selectedTab == 1, onClick = { selectedTab = 1 }) { Text("Oxy/Deoxy", modifier = Modifier.padding(12.dp)) } + } + + Column( + modifier = Modifier + .weight(1f) + .verticalScroll(rememberScrollState()) + .padding(horizontal = 24.dp, vertical = 16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + if (selectedTab == 0) { + // SpO2 tab + BladdyIdleRiveView( + size = 120.dp, + modifier = Modifier.align(Alignment.CenterHorizontally) + ) + + Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.fillMaxWidth()) { + Text(String.format("%.1f", currentOxy.stO2), fontSize = 56.sp, fontWeight = FontWeight.Bold, color = stO2Color) + Text("% StO2", fontSize = 18.sp, color = MlSecondaryText) + Text(stO2StatusText, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = stO2Color, + modifier = Modifier.clip(RoundedCornerShape(8.dp)).background(stO2Color.copy(alpha = 0.15f)).padding(horizontal = 12.dp, vertical = 4.dp)) + } + + NirsMetricsCard(nirsManager) + + Row(modifier = Modifier.fillMaxWidth()) { + Text("Samples: $sampleCount", fontSize = 11.sp, color = MlSecondaryText) + Spacer(modifier = Modifier.weight(1f)) + Text("4Hz | 60s window", fontSize = 11.sp, color = MlSecondaryText) + } + } else { + // Oxy/Deoxy tab + LineChartCard("HbO2 (Oxy)", nirsManager.oxyHbO2History, Color.Red, "uM") + LineChartCard("HHb (DeOxy)", nirsManager.oxyHbHistory, Color.Blue, "uM") + + Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text("Samples: $sampleCount", fontSize = 11.sp, color = MlSecondaryText) + Spacer(modifier = Modifier.weight(1f)) + if (isFilterEnabled) { + Text("Filtered", fontSize = 10.sp, fontWeight = FontWeight.Bold, color = Color.White, + modifier = Modifier.clip(RoundedCornerShape(4.dp)).background(Color(0xFF9966FF)).padding(horizontal = 6.dp, vertical = 2.dp)) + Spacer(modifier = Modifier.width(4.dp)) + } + Text("4Hz | 60s window", fontSize = 11.sp, color = MlSecondaryText) + } + + NirsMetricsCard(nirsManager) + } + } + + // Control bar + Row( + modifier = Modifier.padding(horizontal = 24.dp).padding(bottom = 32.dp), + horizontalArrangement = Arrangement.spacedBy(16.dp) + ) { + Button( + onClick = { showClearConfirm = true }, + modifier = Modifier.weight(1f).height(50.dp), + shape = RoundedCornerShape(14.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color.Red.copy(alpha = 0.1f)) + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Icon(Icons.Default.Delete, null, tint = Color.Red) + Spacer(modifier = Modifier.width(4.dp)) + Text("Clear", fontWeight = FontWeight.SemiBold, color = Color.Red) + } + } + + Button( + onClick = { toggleStreaming() }, + modifier = Modifier.weight(1f).height(50.dp), + shape = RoundedCornerShape(14.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent), + contentPadding = PaddingValues(), + enabled = !isToggling + ) { + Box( + modifier = Modifier.fillMaxSize().background( + Brush.horizontalGradient(listOf(MlTeal, MlPrimary)), + RoundedCornerShape(14.dp) + ), + contentAlignment = Alignment.Center + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Icon( + if (isStreaming) Icons.Default.Stop else Icons.Default.PlayArrow, + null, tint = Color.White + ) + Spacer(modifier = Modifier.width(4.dp)) + Text(if (isStreaming) "Stop" else "Start", fontWeight = FontWeight.SemiBold, color = Color.White) + } + } + } + } + } +} + +@Composable +private fun NirsMetricsCard(nirsManager: NirsManager) { + val oxy by nirsManager.currentOxy + Card( + shape = RoundedCornerShape(16.dp), + colors = CardDefaults.cardColors(containerColor = MlCardBackground), + modifier = Modifier.shadow(4.dp, RoundedCornerShape(16.dp), spotColor = Color.Black.copy(alpha = 0.04f)) + ) { + Column(modifier = Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + MetricBox("HbO2", oxy.hbO2, "uM", Color.Red, Modifier.weight(1f)) + MetricBox("HHb", oxy.hb, "uM", Color.Blue, Modifier.weight(1f)) + } + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + MetricBox("tHb", oxy.tHb, "uM", Color(0xFF9966FF), Modifier.weight(1f)) + MetricBox("StO2", oxy.stO2, "%", Color.Green, Modifier.weight(1f)) + } + } + } +} + +@Composable +private fun MetricBox(title: String, value: Double, unit: String, color: Color, modifier: Modifier = Modifier) { + Column( + modifier = modifier + .clip(RoundedCornerShape(8.dp)) + .background(MlBackground) + .padding(10.dp) + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Box(modifier = Modifier.size(8.dp).clip(CircleShape).background(color)) + Spacer(modifier = Modifier.width(4.dp)) + Text(title, fontSize = 11.sp, fontWeight = FontWeight.SemiBold, color = MlSecondaryText) + } + Text(String.format("%.1f", value), fontSize = 22.sp, fontWeight = FontWeight.Bold, modifier = Modifier.fillMaxWidth(), textAlign = androidx.compose.ui.text.style.TextAlign.End) + Text(unit, fontSize = 10.sp, color = MlSecondaryText, modifier = Modifier.fillMaxWidth(), textAlign = androidx.compose.ui.text.style.TextAlign.End) + } +} + +@Composable +private fun LineChartCard(label: String, data: List, color: Color, unit: String) { + Card( + shape = RoundedCornerShape(16.dp), + colors = CardDefaults.cardColors(containerColor = MlCardBackground), + modifier = Modifier.shadow(4.dp, RoundedCornerShape(16.dp), spotColor = Color.Black.copy(alpha = 0.04f)) + ) { + Column(modifier = Modifier.padding(16.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Box(modifier = Modifier.size(6.dp).clip(CircleShape).background(color)) + Spacer(modifier = Modifier.width(4.dp)) + Text(label, fontSize = 10.sp, fontWeight = FontWeight.SemiBold, color = MlSecondaryText) + Spacer(modifier = Modifier.weight(1f)) + Text( + String.format("%.1f %s", data.lastOrNull() ?: 0.0, unit), + fontSize = 10.sp, fontWeight = FontWeight.SemiBold, color = color + ) + } + + Spacer(modifier = Modifier.height(8.dp)) + + if (data.isEmpty()) { + Box( + modifier = Modifier.fillMaxWidth().height(140.dp), + contentAlignment = Alignment.Center + ) { Text("No data", fontSize = 11.sp, color = MlSecondaryText) } + } else { + Canvas(modifier = Modifier.fillMaxWidth().height(140.dp)) { + if (data.size < 2) return@Canvas + val minVal = data.min() + val maxVal = data.max() + val range = if (maxVal - minVal > 0.001) maxVal - minVal else 1.0 + val stepX = size.width / (data.size - 1).toFloat() + + val path = Path() + data.forEachIndexed { index, value -> + val x = index * stepX + val y = size.height - ((value - minVal) / range * size.height).toFloat() + if (index == 0) path.moveTo(x, y) else path.lineTo(x, y) + } + drawPath(path, color = color, style = Stroke(width = 3f)) + } + } + } + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/onboarding/OnboardingView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/onboarding/OnboardingView.kt new file mode 100644 index 0000000..697e992 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/views/onboarding/OnboardingView.kt @@ -0,0 +1,140 @@ +package com.example.medilightv2android.ui.views.onboarding + +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.pager.HorizontalPager +import androidx.compose.foundation.pager.rememberPagerState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.example.medilightv2android.AppState +import com.example.medilightv2android.ui.components.BladdyIdleRiveView +import com.example.medilightv2android.ui.theme.* +import kotlinx.coroutines.launch + +private val pages = listOf( + "Welcome to MedilightV2" to "Smart bladder monitoring\nfor better quality of life", + "NIRS & Piezo Sensors" to "Advanced dual-sensor technology\nfor accurate measurements", + "Real-time Monitoring" to "Track your bladder level\nwith instant visual feedback" +) + +@OptIn(ExperimentalFoundationApi::class) +@Composable +fun OnboardingView(appState: AppState) { + val pagerState = rememberPagerState(pageCount = { pages.size }) + val scope = rememberCoroutineScope() + + Column( + modifier = Modifier + .fillMaxSize() + .background(MlBackground) + ) { + HorizontalPager( + state = pagerState, + modifier = Modifier.weight(1f) + ) { page -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = 32.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Spacer(modifier = Modifier.weight(1f)) + + BladdyIdleRiveView(size = 180.dp) + + Spacer(modifier = Modifier.height(24.dp)) + + Text( + text = pages[page].first, + fontSize = 24.sp, + fontWeight = FontWeight.Bold, + textAlign = TextAlign.Center + ) + + Spacer(modifier = Modifier.height(12.dp)) + + Text( + text = pages[page].second, + fontSize = 16.sp, + color = MlSecondaryText, + textAlign = TextAlign.Center + ) + + Spacer(modifier = Modifier.weight(2f)) + } + } + + // Page indicators + Row( + modifier = Modifier + .fillMaxWidth() + .padding(bottom = 16.dp), + horizontalArrangement = Arrangement.Center + ) { + repeat(pages.size) { index -> + Box( + modifier = Modifier + .padding(horizontal = 4.dp) + .size(if (index == pagerState.currentPage) 10.dp else 8.dp) + .clip(CircleShape) + .background( + if (index == pagerState.currentPage) MlPrimary + else MlPrimary.copy(alpha = 0.3f) + ) + ) + } + } + + // Button + Button( + onClick = { + if (pagerState.currentPage < pages.size - 1) { + scope.launch { pagerState.animateScrollToPage(pagerState.currentPage + 1) } + } else { + appState.completeOnboarding() + } + }, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 32.dp) + .padding(bottom = 48.dp) + .height(56.dp), + shape = RoundedCornerShape(16.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent), + contentPadding = PaddingValues() + ) { + Box( + modifier = Modifier + .fillMaxSize() + .background( + brush = Brush.horizontalGradient(listOf(MlTeal, MlPrimary)), + shape = RoundedCornerShape(16.dp) + ), + contentAlignment = Alignment.Center + ) { + Text( + text = if (pagerState.currentPage < pages.size - 1) "Next" else "Get Started", + fontSize = 18.sp, + fontWeight = FontWeight.SemiBold, + color = Color.White + ) + } + } + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/personalization/PiezoPersonalizationView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/personalization/PiezoPersonalizationView.kt new file mode 100644 index 0000000..9f727de --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/views/personalization/PiezoPersonalizationView.kt @@ -0,0 +1,306 @@ +package com.example.medilightv2android.ui.views.personalization + +import android.os.Handler +import android.os.Looper +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.CheckCircle +import androidx.compose.material.icons.filled.Remove +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.example.medilightv2android.AppState +import com.example.medilightv2android.ble.BleManager +import com.example.medilightv2android.models.* +import com.example.medilightv2android.ui.components.BladdyIdleRiveView +import com.example.medilightv2android.ui.theme.* + +@Composable +fun PiezoPersonalizationView(appState: AppState) { + val context = LocalContext.current + val bleManager = remember { BleManager.getInstance(context) } + val handler = remember { Handler(Looper.getMainLooper()) } + var currentStep by remember { mutableIntStateOf(1) } + var optimizationComplete by remember { mutableStateOf(false) } + val totalSteps = 4 + + fun startOptimization() { + bleManager.onPiezoDataReceived = { + optimizationComplete = true + } + bleManager.sendPiezoPowerOn(freqOption = 2, cycles = 5) + handler.postDelayed({ optimizationComplete = true }, 6000) + } + + Column( + modifier = Modifier + .fillMaxSize() + .background(Color.White) + ) { + // Header + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 24.dp, vertical = 16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + IconButton(onClick = { appState.backToSensorSelect() }) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, "Back", tint = MlPrimary) + } + Spacer(modifier = Modifier.weight(1f)) + Text("Step $currentStep of $totalSteps", fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = MlSecondaryText) + Spacer(modifier = Modifier.weight(1f)) + Spacer(modifier = Modifier.width(20.dp)) + } + + // Progress bar + Box( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 24.dp) + .height(6.dp) + .clip(RoundedCornerShape(4.dp)) + .background(MlPrimary.copy(alpha = 0.15f)) + ) { + Box( + modifier = Modifier + .fillMaxWidth(currentStep.toFloat() / totalSteps) + .fillMaxHeight() + .clip(RoundedCornerShape(4.dp)) + .background(Brush.horizontalGradient(listOf(MlTeal, MlPrimary))) + ) + } + + Spacer(modifier = Modifier.height(24.dp)) + + // Step content + when (currentStep) { + 1 -> PostureStep(appState) + 2 -> SensorPositionStep(appState) + 3 -> MaxVolumeStep(appState) + 4 -> { + LaunchedEffect(Unit) { startOptimization() } + OptimizationStep(optimizationComplete) + } + } + + Spacer(modifier = Modifier.weight(1f)) + + // Navigation button + if (currentStep < 4) { + Button( + onClick = { currentStep++ }, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 32.dp) + .padding(bottom = 32.dp) + .height(56.dp), + shape = RoundedCornerShape(16.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent), + contentPadding = PaddingValues() + ) { + Box( + modifier = Modifier.fillMaxSize().background( + Brush.horizontalGradient(listOf(MlTeal, MlPrimary)), + RoundedCornerShape(16.dp) + ), + contentAlignment = Alignment.Center + ) { + Text("Next", fontSize = 18.sp, fontWeight = FontWeight.SemiBold, color = Color.White) + } + } + } else if (optimizationComplete) { + Button( + onClick = { appState.personalizationComplete() }, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 32.dp) + .padding(bottom = 32.dp) + .height(56.dp), + shape = RoundedCornerShape(16.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent), + contentPadding = PaddingValues() + ) { + Box( + modifier = Modifier.fillMaxSize().background( + Brush.horizontalGradient(listOf(MlTeal, MlPrimary)), + RoundedCornerShape(16.dp) + ), + contentAlignment = Alignment.Center + ) { + Text("Continue", fontSize = 18.sp, fontWeight = FontWeight.SemiBold, color = Color.White) + } + } + } + } +} + +@Composable +private fun PostureStep(appState: AppState) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text("Select Posture", fontSize = 24.sp, fontWeight = FontWeight.Bold) + Spacer(modifier = Modifier.height(8.dp)) + Text("Choose your measurement position", fontSize = 14.sp, color = MlSecondaryText) + Spacer(modifier = Modifier.height(24.dp)) + + Column(modifier = Modifier.padding(horizontal = 32.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) { + Posture.entries.forEach { posture -> + val isSelected = appState.piezoSettings.posture == posture + SelectionCard( + title = posture.displayName, + isSelected = isSelected, + onClick = { appState.piezoSettings = appState.piezoSettings.copy(posture = posture) } + ) + } + } + } +} + +@Composable +private fun SensorPositionStep(appState: AppState) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text("Sensor Position", fontSize = 24.sp, fontWeight = FontWeight.Bold) + Spacer(modifier = Modifier.height(8.dp)) + Text("Place the sensor on your body", fontSize = 14.sp, color = MlSecondaryText) + Spacer(modifier = Modifier.height(24.dp)) + + Column(modifier = Modifier.padding(horizontal = 32.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) { + SensorPosition.entries.forEach { position -> + val isSelected = appState.piezoSettings.sensorPosition == position + SelectionCard( + title = position.displayName, + subtitle = position.description, + isSelected = isSelected, + onClick = { appState.piezoSettings = appState.piezoSettings.copy(sensorPosition = position) } + ) + } + } + } +} + +@Composable +private fun MaxVolumeStep(appState: AppState) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text("Maximum Volume", fontSize = 24.sp, fontWeight = FontWeight.Bold) + Spacer(modifier = Modifier.height(8.dp)) + Text("Set your maximum bladder capacity", fontSize = 14.sp, color = MlSecondaryText) + Spacer(modifier = Modifier.height(24.dp)) + + Text("${appState.piezoSettings.maxVolume}", fontSize = 56.sp, fontWeight = FontWeight.Bold, color = MlPrimary) + Text("ml", fontSize = 20.sp, color = MlSecondaryText) + + Spacer(modifier = Modifier.height(16.dp)) + + Row(horizontalArrangement = Arrangement.spacedBy(32.dp)) { + IconButton(onClick = { + appState.piezoSettings = appState.piezoSettings.copy( + maxVolume = (appState.piezoSettings.maxVolume - 50).coerceIn(200, 800) + ) + }) { + Icon(Icons.Default.Remove, null, tint = MlPrimary, modifier = Modifier.size(44.dp)) + } + IconButton(onClick = { + appState.piezoSettings = appState.piezoSettings.copy( + maxVolume = (appState.piezoSettings.maxVolume + 50).coerceIn(200, 800) + ) + }) { + Icon(Icons.Default.Add, null, tint = MlPrimary, modifier = Modifier.size(44.dp)) + } + } + + Slider( + value = appState.piezoSettings.maxVolume.toFloat(), + onValueChange = { appState.piezoSettings = appState.piezoSettings.copy(maxVolume = it.toInt()) }, + valueRange = 200f..800f, + steps = 11, + modifier = Modifier.padding(horizontal = 48.dp), + colors = SliderDefaults.colors(thumbColor = MlPrimary, activeTrackColor = MlPrimary) + ) + + Row(modifier = Modifier.fillMaxWidth().padding(horizontal = 48.dp)) { + Text("200ml", fontSize = 12.sp, color = MlSecondaryText) + Spacer(modifier = Modifier.weight(1f)) + Text("800ml", fontSize = 12.sp, color = MlSecondaryText) + } + } +} + +@Composable +private fun OptimizationStep(isComplete: Boolean) { + Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.fillMaxWidth()) { + Text( + if (isComplete) "Optimization Complete" else "Optimizing...", + fontSize = 24.sp, fontWeight = FontWeight.Bold + ) + + Spacer(modifier = Modifier.height(24.dp)) + + BladdyIdleRiveView(size = 160.dp) + + Spacer(modifier = Modifier.height(24.dp)) + + if (isComplete) { + Icon(Icons.Default.CheckCircle, null, tint = MlTeal, modifier = Modifier.size(48.dp)) + } else { + CircularProgressIndicator(color = MlPrimary) + Spacer(modifier = Modifier.height(16.dp)) + Text("Calibrating sensor parameters", fontSize = 14.sp, color = MlSecondaryText) + } + } +} + +@Composable +private fun SelectionCard(title: String, subtitle: String? = null, isSelected: Boolean, onClick: () -> Unit) { + Card( + modifier = Modifier + .fillMaxWidth() + .clickable(onClick = onClick) + .then(if (isSelected) Modifier.border(2.dp, MlPrimary, RoundedCornerShape(16.dp)) else Modifier), + shape = RoundedCornerShape(16.dp), + colors = CardDefaults.cardColors(containerColor = MlCardBackground) + ) { + Row( + modifier = Modifier.padding(16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier + .size(if (subtitle != null) 48.dp else 56.dp) + .clip(RoundedCornerShape(if (subtitle != null) 12.dp else 14.dp)) + .background(if (isSelected) MlPrimary else MlPrimary.copy(alpha = 0.1f)), + contentAlignment = Alignment.Center + ) { + Text(title.take(3), color = if (isSelected) Color.White else MlPrimary, fontWeight = FontWeight.Bold, fontSize = 12.sp) + } + + Spacer(modifier = Modifier.width(16.dp)) + + Column(modifier = Modifier.weight(1f)) { + Text(title, fontSize = if (subtitle != null) 16.sp else 18.sp, fontWeight = FontWeight.SemiBold) + subtitle?.let { + Spacer(modifier = Modifier.height(2.dp)) + Text(it, fontSize = 13.sp, color = MlSecondaryText) + } + } + + if (isSelected) { + Icon(Icons.Default.CheckCircle, null, tint = MlPrimary, modifier = Modifier.size(24.dp)) + } + } + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/pin/PinView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/pin/PinView.kt new file mode 100644 index 0000000..c25f31d --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/views/pin/PinView.kt @@ -0,0 +1,127 @@ +package com.example.medilightv2android.ui.views.pin + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.Text +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.example.medilightv2android.AppState +import com.example.medilightv2android.services.UserStorage +import com.example.medilightv2android.ui.components.BladdyIdleRiveView +import com.example.medilightv2android.ui.theme.* + +enum class PinMode { SETUP, ENTER } + +@Composable +fun PinView(appState: AppState, mode: PinMode, context: android.content.Context) { + var enteredPin by remember { mutableStateOf("") } + var confirmPin by remember { mutableStateOf("") } + var isConfirming by remember { mutableStateOf(false) } + var errorMessage by remember { mutableStateOf("") } + val pinLength = 4 + + val currentPin = if (isConfirming) confirmPin else enteredPin + + val title = when (mode) { + PinMode.SETUP -> if (isConfirming) "Re-enter PIN" else "Set PIN" + PinMode.ENTER -> "Enter PIN" + } + + fun addDigit(digit: Int) { + errorMessage = "" + if (isConfirming) { + if (confirmPin.length >= pinLength) return + confirmPin += digit.toString() + if (confirmPin.length == pinLength) { + // Verify setup + if (confirmPin == enteredPin) { + appState.pinSet(enteredPin) + } else { + errorMessage = "PINs don't match. Try again." + enteredPin = "" + confirmPin = "" + isConfirming = false + } + } + } else { + if (enteredPin.length >= pinLength) return + enteredPin += digit.toString() + if (enteredPin.length == pinLength) { + when (mode) { + PinMode.SETUP -> isConfirming = true + PinMode.ENTER -> { + val stored = UserStorage.getInstance(context).pin + if (enteredPin == stored) { + appState.pinVerified() + } else { + errorMessage = "Incorrect PIN" + enteredPin = "" + } + } + } + } + } + } + + fun deleteDigit() { + if (isConfirming) { + if (confirmPin.isNotEmpty()) confirmPin = confirmPin.dropLast(1) + } else { + if (enteredPin.isNotEmpty()) enteredPin = enteredPin.dropLast(1) + } + } + + Column( + modifier = Modifier + .fillMaxSize() + .background(MlBackground), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Spacer(modifier = Modifier.weight(1f)) + + BladdyIdleRiveView(size = 100.dp) + + Spacer(modifier = Modifier.height(32.dp)) + + Text(title, fontSize = 24.sp, fontWeight = FontWeight.Bold) + + if (errorMessage.isNotEmpty()) { + Spacer(modifier = Modifier.height(8.dp)) + Text(errorMessage, fontSize = 14.sp, color = Color.Red) + } + + Spacer(modifier = Modifier.height(24.dp)) + + // Dot indicators + Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + repeat(pinLength) { index -> + Box( + modifier = Modifier + .size(16.dp) + .clip(CircleShape) + .background( + if (index < currentPin.length) MlPrimary + else Color.Gray.copy(alpha = 0.3f) + ) + ) + } + } + + Spacer(modifier = Modifier.weight(1f)) + + // Shuffled keypad + ShuffledKeypad( + onDigitTap = { addDigit(it) }, + onDelete = { deleteDigit() } + ) + + Spacer(modifier = Modifier.weight(1f)) + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/pin/ShuffledKeypad.kt b/app/src/main/java/com/example/medilightv2android/ui/views/pin/ShuffledKeypad.kt new file mode 100644 index 0000000..f79a609 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/views/pin/ShuffledKeypad.kt @@ -0,0 +1,83 @@ +package com.example.medilightv2android.ui.views.pin + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.Backspace +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.example.medilightv2android.ui.theme.MlCardBackground + +@Composable +fun ShuffledKeypad( + onDigitTap: (Int) -> Unit, + onDelete: () -> Unit +) { + val digits = (1..9).toList() + listOf(0) + + LazyVerticalGrid( + columns = GridCells.Fixed(3), + modifier = Modifier.padding(horizontal = 40.dp), + horizontalArrangement = Arrangement.spacedBy(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + userScrollEnabled = false + ) { + // Digits 1-9 + items(9) { index -> + KeyButton(digit = digits[index], onClick = { onDigitTap(digits[index]) }) + } + // Empty space + item { Spacer(modifier = Modifier.height(60.dp)) } + // Digit 0 + item { KeyButton(digit = 0, onClick = { onDigitTap(0) }) } + // Delete + item { + Box( + modifier = Modifier + .height(60.dp) + .clip(RoundedCornerShape(14.dp)) + .background(Color.Gray.copy(alpha = 0.1f)) + .clickable(onClick = onDelete), + contentAlignment = Alignment.Center + ) { + Icon( + Icons.AutoMirrored.Filled.Backspace, + contentDescription = "Delete", + modifier = Modifier.size(24.dp) + ) + } + } + } +} + +@Composable +private fun KeyButton(digit: Int, onClick: () -> Unit) { + Box( + modifier = Modifier + .height(60.dp) + .shadow(4.dp, RoundedCornerShape(14.dp), spotColor = Color.Black.copy(alpha = 0.06f)) + .clip(RoundedCornerShape(14.dp)) + .background(MlCardBackground) + .clickable(onClick = onClick), + contentAlignment = Alignment.Center + ) { + Text( + text = "$digit", + fontSize = 28.sp, + fontWeight = FontWeight.Medium + ) + } +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/registration/RegistrationView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/registration/RegistrationView.kt new file mode 100644 index 0000000..859f6a9 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/views/registration/RegistrationView.kt @@ -0,0 +1,181 @@ +package com.example.medilightv2android.ui.views.registration + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.example.medilightv2android.AppState +import com.example.medilightv2android.ui.components.BladdyIdleRiveView +import com.example.medilightv2android.ui.theme.* + +@Composable +fun RegistrationView(appState: AppState) { + var step by remember { mutableIntStateOf(1) } + var firstName by remember { mutableStateOf("") } + var lastName by remember { mutableStateOf("") } + var ageText by remember { mutableStateOf("") } + var heightText by remember { mutableStateOf("") } + var weightText by remember { mutableStateOf("") } + val totalSteps = 3 + + val canProceed = when (step) { + 1 -> firstName.trim().isNotEmpty() && lastName.trim().isNotEmpty() + 2 -> { + val age = ageText.toIntOrNull() ?: 0 + age in 1..120 + } + 3 -> { + val h = heightText.toDoubleOrNull() ?: 0.0 + val w = weightText.toDoubleOrNull() ?: 0.0 + h in 50.0..250.0 && w in 10.0..300.0 + } + else -> false + } + + Column( + modifier = Modifier + .fillMaxSize() + .background(MlBackground) + ) { + // Header + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 24.dp, vertical = 16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + if (step > 1) { + IconButton(onClick = { step-- }) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back", tint = MlPrimary) + } + } + Spacer(modifier = Modifier.weight(1f)) + Text("$step/$totalSteps", fontSize = 16.sp, fontWeight = FontWeight.Medium, color = MlSecondaryText) + } + + BladdyIdleRiveView( + size = 120.dp, + modifier = Modifier.align(Alignment.CenterHorizontally) + ) + + Spacer(modifier = Modifier.weight(1f)) + + // Content + Column( + modifier = Modifier.padding(horizontal = 32.dp), + verticalArrangement = Arrangement.spacedBy(20.dp) + ) { + when (step) { + 1 -> { + Text("What's your name?", fontSize = 24.sp, fontWeight = FontWeight.Bold) + RegistrationTextField("First Name", firstName, { firstName = it }) + RegistrationTextField("Last Name", lastName, { lastName = it }) + } + 2 -> { + Text("How old are you?", fontSize = 24.sp, fontWeight = FontWeight.Bold) + RegistrationTextField("Age", ageText, { ageText = it }, KeyboardType.Number) + } + 3 -> { + Text("Body measurements", fontSize = 24.sp, fontWeight = FontWeight.Bold) + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + Box(modifier = Modifier.weight(1f)) { + RegistrationTextField("Height", heightText, { heightText = it }, KeyboardType.Decimal, "cm") + } + Box(modifier = Modifier.weight(1f)) { + RegistrationTextField("Weight", weightText, { weightText = it }, KeyboardType.Decimal, "kg") + } + } + } + } + } + + Spacer(modifier = Modifier.weight(1f)) + + // Next button + Button( + onClick = { + if (step < totalSteps) { + step++ + } else { + appState.user = appState.user.copy( + firstName = firstName, + lastName = lastName, + age = ageText.toIntOrNull() ?: 0, + heightCm = heightText.toDoubleOrNull() ?: 0.0, + weightKg = weightText.toDoubleOrNull() ?: 0.0 + ) + appState.completeRegistration() + } + }, + enabled = canProceed, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 32.dp) + .padding(bottom = 48.dp) + .height(56.dp), + shape = RoundedCornerShape(16.dp), + colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent), + contentPadding = PaddingValues() + ) { + Box( + modifier = Modifier + .fillMaxSize() + .background( + brush = if (canProceed) Brush.horizontalGradient(listOf(MlTeal, MlPrimary)) + else Brush.horizontalGradient(listOf(Color.Gray.copy(alpha = 0.4f), Color.Gray.copy(alpha = 0.4f))), + shape = RoundedCornerShape(16.dp) + ), + contentAlignment = Alignment.Center + ) { + Text( + text = if (step < totalSteps) "Next" else "Complete", + fontSize = 18.sp, + fontWeight = FontWeight.SemiBold, + color = Color.White + ) + } + } + } +} + +@Composable +private fun RegistrationTextField( + placeholder: String, + value: String, + onValueChange: (String) -> Unit, + keyboardType: KeyboardType = KeyboardType.Text, + suffix: String? = null +) { + OutlinedTextField( + value = value, + onValueChange = onValueChange, + placeholder = { Text(placeholder) }, + keyboardOptions = KeyboardOptions(keyboardType = keyboardType), + suffix = suffix?.let { { Text(it, color = MlSecondaryText) } }, + modifier = Modifier + .fillMaxWidth() + .background(MlInputBackground, RoundedCornerShape(12.dp)) + .border(1.dp, MlInputBorder.copy(alpha = 0.3f), RoundedCornerShape(12.dp)), + shape = RoundedCornerShape(12.dp), + colors = OutlinedTextFieldDefaults.colors( + unfocusedBorderColor = Color.Transparent, + focusedBorderColor = MlInputBorder + ), + singleLine = true + ) +} diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/sensorselect/SensorSelectView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/sensorselect/SensorSelectView.kt new file mode 100644 index 0000000..53b5191 --- /dev/null +++ b/app/src/main/java/com/example/medilightv2android/ui/views/sensorselect/SensorSelectView.kt @@ -0,0 +1,124 @@ +package com.example.medilightv2android.ui.views.sensorselect + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.example.medilightv2android.AppState +import com.example.medilightv2android.models.SensorMode +import com.example.medilightv2android.ui.components.BladdyIdleRiveView +import com.example.medilightv2android.ui.theme.* + +@Composable +fun SensorSelectView(appState: AppState) { + Column( + modifier = Modifier + .fillMaxSize() + .background(MlBackground), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Spacer(modifier = Modifier.weight(1f)) + + BladdyIdleRiveView(size = 140.dp) + + Spacer(modifier = Modifier.height(32.dp)) + + Text("Select Sensor", fontSize = 28.sp, fontWeight = FontWeight.Bold) + + Spacer(modifier = Modifier.height(8.dp)) + + Text("Choose your measurement mode", fontSize = 16.sp, color = MlSecondaryText) + + Spacer(modifier = Modifier.height(32.dp)) + + Column( + modifier = Modifier.padding(horizontal = 32.dp), + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + SensorCard( + mode = SensorMode.NIRS, + title = "NIRS", + description = "Near-Infrared Spectroscopy\nTissue oxygenation monitoring", + gradientColors = listOf(Color(0xFF00DBA1), Color(0xFF008FFF)), + iconText = "NIRS", + onClick = { appState.selectSensor(SensorMode.NIRS) } + ) + + SensorCard( + mode = SensorMode.PIEZO, + title = "Piezo", + description = "Ultrasound Echo\nBladder volume measurement", + gradientColors = listOf(Color(0xFF8F44FC), Color(0xFFF04A8F)), + iconText = "Piezo", + onClick = { appState.selectSensor(SensorMode.PIEZO) } + ) + } + + Spacer(modifier = Modifier.weight(1f)) + } +} + +@Composable +private fun SensorCard( + mode: SensorMode, + title: String, + description: String, + gradientColors: List, + iconText: String, + onClick: () -> Unit +) { + Card( + modifier = Modifier + .fillMaxWidth() + .shadow(8.dp, RoundedCornerShape(16.dp), spotColor = Color.Black.copy(alpha = 0.06f)) + .clickable(onClick = onClick), + shape = RoundedCornerShape(16.dp), + colors = CardDefaults.cardColors(containerColor = MlCardBackground) + ) { + Row( + modifier = Modifier.padding(20.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier + .size(72.dp) + .clip(RoundedCornerShape(16.dp)) + .background(Brush.linearGradient(gradientColors)), + contentAlignment = Alignment.Center + ) { + Text(iconText, color = Color.White, fontWeight = FontWeight.Bold, fontSize = 14.sp) + } + + Spacer(modifier = Modifier.width(20.dp)) + + Column(modifier = Modifier.weight(1f)) { + Text(title, fontSize = 20.sp, fontWeight = FontWeight.Bold) + Spacer(modifier = Modifier.height(4.dp)) + Text(description, fontSize = 14.sp, color = MlSecondaryText) + } + + Icon( + Icons.AutoMirrored.Filled.KeyboardArrowRight, + contentDescription = null, + tint = MlSecondaryText + ) + } + } +} 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..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/app/src/main/res/raw/bladdy_final12.riv b/app/src/main/res/raw/bladdy_final12.riv new file mode 100644 index 0000000000000000000000000000000000000000..31358ee994f38a9d70eea29c4a65401b1c567e62 GIT binary patch literal 25229 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

  • {WYEdnx@!{q1dE4@|yg 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/raw/bladdy_loading3.riv b/app/src/main/res/raw/bladdy_loading3.riv new file mode 100644 index 0000000000000000000000000000000000000000..6a8090153e720383f664566f58b89743cba0a6c8 GIT binary patch literal 18608 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 eVhKcKbvyyN2nq-jRuW((VYCwTVd)%_m;&CbpM literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..a727e5d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + medilightv2android + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..907f61e --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +