diff --git a/app/src/main/java/com/team695/scoutifyapp/ui/screens/data/DataScreen.kt b/app/src/main/java/com/team695/scoutifyapp/ui/screens/data/DataScreen.kt index 2169282..2769bce 100644 --- a/app/src/main/java/com/team695/scoutifyapp/ui/screens/data/DataScreen.kt +++ b/app/src/main/java/com/team695/scoutifyapp/ui/screens/data/DataScreen.kt @@ -228,7 +228,10 @@ fun DataScreen( } ) } - TeleopLockScreen(isOverlayActive = formState.teleopRunning) + TeleopLockScreen( + visible = formState.teleopRunning || formState.teleopCachedMilliseconds > 0, + message = if(formState.teleopRunning) "Teleop is running" else "Assign your cached time" + ) } } diff --git a/app/src/main/java/com/team695/scoutifyapp/ui/screens/data/TeleopLockScreen.kt b/app/src/main/java/com/team695/scoutifyapp/ui/screens/data/TeleopLockScreen.kt index d78cb43..57e482b 100644 --- a/app/src/main/java/com/team695/scoutifyapp/ui/screens/data/TeleopLockScreen.kt +++ b/app/src/main/java/com/team695/scoutifyapp/ui/screens/data/TeleopLockScreen.kt @@ -24,10 +24,10 @@ import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.LayoutDirection @Composable -fun TeleopLockScreen(isOverlayActive: Boolean) { +fun TeleopLockScreen(visible: Boolean, message: String) { //disables back press - BackHandler(enabled = isOverlayActive) { + BackHandler(enabled = visible) { } @@ -50,8 +50,8 @@ fun TeleopLockScreen(isOverlayActive: Boolean) { } } - if (isOverlayActive) { - Popup ( + if(visible) { + Popup( popupPositionProvider = screenEdgePositionProvider, properties = PopupProperties( focusable = false, @@ -82,7 +82,7 @@ fun TeleopLockScreen(isOverlayActive: Boolean) { Spacer(modifier = Modifier.width(8.dp)) Text( - text = "Teleop is running", + text = message, color = Color.White, style = MaterialTheme.typography.titleLarge ) diff --git a/app/src/main/java/com/team695/scoutifyapp/ui/screens/home/MatchSchedule.kt b/app/src/main/java/com/team695/scoutifyapp/ui/screens/home/MatchSchedule.kt index bf2eccd..1fda04b 100644 --- a/app/src/main/java/com/team695/scoutifyapp/ui/screens/home/MatchSchedule.kt +++ b/app/src/main/java/com/team695/scoutifyapp/ui/screens/home/MatchSchedule.kt @@ -160,7 +160,7 @@ fun MatchSchedule( // 1. Header Title Text( - text = "Buckeye Regional", + text = "Miami Valley Regional", color = TextPrimary, fontSize = 22.sp, fontWeight = FontWeight.Bold,