diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PlacementGuideView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PlacementGuideView.kt index 68c953b..4b77fab 100644 --- a/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PlacementGuideView.kt +++ b/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PlacementGuideView.kt @@ -274,6 +274,26 @@ fun PlacementGuideView(appState: AppState) { Icon(Icons.Filled.CheckCircle, stringResource(R.string.placement_ready_desc), tint = Color(0xFF4CAF50), modifier = Modifier.size(24.dp)) Spacer(modifier = Modifier.width(4.dp)) } + // Skip — 항상 top bar 우측에 노출 (스크롤 안에 묻혀 안 보이던 문제 fix). + // clinical alignment: endMeasurement 저장 후 Clinical Home / 일반: placementComplete. + TextButton(onClick = { + isContinuousMode = false + val curSess = com.example.medilightv2android.services.ClinicalSessionStore.currentSession + if (curSess != null && curSess.mode == com.example.medilightv2android.models.SessionMode.ALIGNMENT) { + com.example.medilightv2android.services.ClinicalSessionStore.endMeasurement(context) + com.example.medilightv2android.services.ClinicalSessionStore.inClinicalFlow = true + appState.currentScreen = AppScreen.CLINICAL_HOME + } else { + appState.placementComplete() + } + }) { + Text( + text = stringResource(R.string.placement_skip), + fontSize = 16.sp, + fontWeight = FontWeight.SemiBold, + color = MlSecondaryText + ) + } if (appState.isDevMode) { IconButton(onClick = { showPlacementSettings = !showPlacementSettings }) { Icon(Icons.Default.Settings, stringResource(R.string.piezo_settings_desc), tint = if (showPlacementSettings) MlPrimary else MlSecondaryText) 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 index 2204543..a9a243d 100644 --- 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 @@ -55,7 +55,7 @@ fun PiezoPersonalizationView(appState: AppState) { verticalAlignment = Alignment.CenterVertically ) { IconButton(onClick = { appState.backToSensorSelect() }) { - Icon(Icons.AutoMirrored.Filled.ArrowBack, "Back", tint = MlPrimary) + Icon(Icons.AutoMirrored.Filled.ArrowBack, stringResource(R.string.personalization_back_desc), tint = MlPrimary) } } @@ -104,7 +104,7 @@ fun PiezoPersonalizationView(appState: AppState) { ), contentAlignment = Alignment.Center ) { - Text("Continue", fontSize = 18.sp, fontWeight = FontWeight.SemiBold, color = Color.White) + Text(stringResource(R.string.calibration_continue), fontSize = 18.sp, fontWeight = FontWeight.SemiBold, color = Color.White) } } } @@ -121,7 +121,7 @@ private fun MaxVolumeCard(appState: AppState) { modifier = Modifier.padding(horizontal = 20.dp, vertical = 18.dp), horizontalAlignment = Alignment.CenterHorizontally ) { - Text("Maximum Bladder Capacity", fontSize = 28.sp, fontWeight = FontWeight.ExtraBold) + Text(stringResource(R.string.personalization_max_capacity), fontSize = 28.sp, fontWeight = FontWeight.ExtraBold) Spacer(modifier = Modifier.height(8.dp)) Row(verticalAlignment = Alignment.Bottom) { Text("${appState.piezoSettings.maxVolume}", fontSize = 48.sp, @@ -173,7 +173,7 @@ private fun CatheterThresholdCard(appState: AppState) { modifier = Modifier.padding(horizontal = 20.dp, vertical = 18.dp), horizontalAlignment = Alignment.CenterHorizontally ) { - Text("Voiding Reminder", fontSize = 28.sp, fontWeight = FontWeight.ExtraBold) + Text(stringResource(R.string.personalization_voiding_reminder_title), fontSize = 28.sp, fontWeight = FontWeight.ExtraBold) Text(stringResource(R.string.voiding_reminder_threshold_desc), fontSize = 12.sp, color = MlSecondaryText, modifier = Modifier.padding(top = 2.dp)) @@ -236,7 +236,7 @@ private fun AutoScanIntervalCard(appState: AppState) { modifier = Modifier.padding(horizontal = 20.dp, vertical = 18.dp), horizontalAlignment = Alignment.CenterHorizontally ) { - Text("Auto Scan Interval", fontSize = 28.sp, fontWeight = FontWeight.ExtraBold) + Text(stringResource(R.string.piezo_settings_auto_scan_interval), fontSize = 28.sp, fontWeight = FontWeight.ExtraBold) Spacer(modifier = Modifier.height(12.dp)) diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 46c3960..df0fe91 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -362,4 +362,9 @@ 펌웨어 기록 및 그래프 개발자 도구 + + + 뒤로 + 최대 방광 용량 + 배뇨 알림 기준 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6c576ab..6ef8353 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -362,4 +362,9 @@ Firmware Logs & Charts Developer Tools + + + Back + Maximum Bladder Capacity + Voiding Reminder