Skip to content

(MVR) Features master #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igor024 merged 2 commits into from
Mar 28, 2026
Merged

(MVR) Features master #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02b754a
users should not be able to exit teleop when they still have cachedtime
igor024 Mar 28, 2026
ddf8782
Fix teleop lock screen glitching
igor024 Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/src/main/java/com/team695/scoutifyapp/ui/screens/data/DataScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
}
}

Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/team695/scoutifyapp/ui/screens/data/TeleopLockScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
}


Expand All @@ -50,8 +50,8 @@ fun TeleopLockScreen(isOverlayActive: Boolean) {
}
}

if (isOverlayActive) {
Popup (
if(visible) {
Popup(
popupPositionProvider = screenEdgePositionProvider,
properties = PopupProperties(
focusable = false,
Expand Down Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/team695/scoutifyapp/ui/screens/home/MatchSchedule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading