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 437945f..3991036 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 @@ -276,26 +276,6 @@ 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) @@ -1270,12 +1250,14 @@ fun PlacementGuideView(appState: AppState) { ) } - // Skip button (태블릿: 15 → 20sp) - Spacer(modifier = Modifier.height(8.dp)) - TextButton(onClick = { + // 하단 작은 padding (Skip 이 화면 밖 — 아래 Box.BottomCenter 로 분리되어 항상 노출). + Spacer(modifier = Modifier.height(16.dp)) + } // end scrollable Column + + // Skip button — scrollable Column 밖, Box.BottomCenter 에 고정 → V2 등 콘텐츠가 길어도 항상 노출. + TextButton( + onClick = { isContinuousMode = false - // Clinical alignment session 진입 → 저장 후 Clinical Home 으로 - // Back / Complete / Skip 모두 endMeasurement → measurement.json + labdb 업로드. 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) @@ -1284,18 +1266,18 @@ fun PlacementGuideView(appState: AppState) { } else { appState.placementComplete() } - }) { - Text( - text = stringResource(R.string.placement_skip), - fontSize = 20.sp, - fontWeight = FontWeight.SemiBold, - color = MlSecondaryText - ) - } - - // 하단 작은 padding 만 (Skip 이 화면 아래 가까이 오도록). - Spacer(modifier = Modifier.height(16.dp)) - } // end scrollable Column + }, + modifier = Modifier + .align(Alignment.BottomCenter) + .padding(bottom = 4.dp) + ) { + Text( + text = stringResource(R.string.placement_skip), + fontSize = 16.sp, + fontWeight = FontWeight.SemiBold, + color = MlSecondaryText + ) + } // Floating settings overlay (개발자 모드) if (appState.isDevMode && showPlacementSettings) {