UX: remove welcome screen (start at safety), bump version
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -3,3 +3,6 @@ build/
|
|||||||
**/build/
|
**/build/
|
||||||
local.properties
|
local.properties
|
||||||
.toolchain/
|
.toolchain/
|
||||||
|
|
||||||
|
# local Android SDK path
|
||||||
|
local.properties
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ android {
|
|||||||
applicationId = "com.mindmachine.mvp"
|
applicationId = "com.mindmachine.mvp"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 35
|
targetSdk = 35
|
||||||
versionCode = 3
|
versionCode = 4
|
||||||
versionName = "1.0"
|
versionName = "1.0"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
|||||||
@@ -186,13 +186,8 @@ fun App(vm: MainViewModel = viewModel()) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
val startRoute = if (ui.settings.safetyAcknowledged) "home" else "welcome"
|
val startRoute = if (ui.settings.safetyAcknowledged) "home" else "safety"
|
||||||
NavHost(navController = nav, startDestination = startRoute, modifier = Modifier.background(MaterialTheme.colorScheme.background)) {
|
NavHost(navController = nav, startDestination = startRoute, modifier = Modifier.background(MaterialTheme.colorScheme.background)) {
|
||||||
composable("welcome") {
|
|
||||||
SimpleScreen("MindMachine", "Blinking light + binaural audio. Stereo headphones required for binaural mode. Not a medical device.") {
|
|
||||||
Button(onClick = { nav.navigate("safety") }) { Text("Continue") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
composable("safety") {
|
composable("safety") {
|
||||||
SafetyScreen(
|
SafetyScreen(
|
||||||
onAck = {
|
onAck = {
|
||||||
|
|||||||
Reference in New Issue
Block a user