diff --git a/.gitignore b/.gitignore index 77f52e0..edf8cd5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ build/ **/build/ local.properties .toolchain/ + +# local Android SDK path +local.properties diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f99aee5..51c6a36 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,7 +11,7 @@ android { applicationId = "com.mindmachine.mvp" minSdk = 26 targetSdk = 35 - versionCode = 3 + versionCode = 4 versionName = "1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/mindmachine/mvp/MainActivity.kt b/app/src/main/java/com/mindmachine/mvp/MainActivity.kt index d2b20e6..5f87520 100644 --- a/app/src/main/java/com/mindmachine/mvp/MainActivity.kt +++ b/app/src/main/java/com/mindmachine/mvp/MainActivity.kt @@ -186,13 +186,8 @@ fun App(vm: MainViewModel = viewModel()) { 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)) { - 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") { SafetyScreen( onAck = {