SpeziOnboarding

app/src/main/kotlin/edu/stanford/bdh/engagehf/MainActivity.kt

@@ -215,10 +215,6 @@ class MainActivity : FragmentActivity() {
                             Routes.SequentialOnboardingScreen
                         )
 
-                        is OnboardingNavigationEvent.ConsentScreen -> navHostController.navigate(
-                            Routes.ConsentScreen
-                        )
-
                         is AppNavigationEvent.AppScreen -> navHostController.navigateTo(
                             route = Routes.AppScreen,
                             clearBackStack = event.clearBackStack

app/src/main/kotlin/edu/stanford/bdh/engagehf/navigation/Routes.kt

@@ -28,9 +28,6 @@ sealed class Routes {
     @Serializable
     data object OnboardingScreen : Routes()
 
-    @Serializable
-    data object ConsentScreen : Routes()
-
     @Serializable
     data object ContactScreen : Routes()
 }

app/src/main/kotlin/edu/stanford/bdh/engagehf/onboarding/OnboardingModule.kt

@@ -4,7 +4,6 @@ import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import edu.stanford.spezi.module.onboarding.consent.ConsentManager
 import edu.stanford.spezi.module.onboarding.invitation.InvitationCodeRepository
 import edu.stanford.spezi.module.onboarding.onboarding.OnboardingRepository
 import edu.stanford.spezi.module.onboarding.sequential.SequentialOnboardingRepository
@@ -30,9 +29,4 @@ abstract class OnboardingModule {
     abstract fun bindSequentialOnboardingRepository(
         engageSequentialOnboardingRepository: EngageSequentialOnboardingRepository,
     ): SequentialOnboardingRepository
-
-    @Binds
-    abstract fun bindOnConsentRepository(
-        engageConsentManager: EngageConsentManager,
-    ): ConsentManager
 }

core/utils/src/main/kotlin/edu/stanford/spezi/core/utils/Standard.kt

@@ -0,0 +1,3 @@
+package edu.stanford.spezi.core.utils
+
+interface Standard

modules/onboarding/src/androidTest/kotlin/edu/stanford/spezi/module/onboarding/di/TestOnboardingModule.kt

@@ -7,7 +7,6 @@ import dagger.hilt.testing.TestInstallIn
 import edu.stanford.spezi.module.account.di.AccountModule
 import edu.stanford.spezi.module.account.manager.InvitationAuthManager
 import edu.stanford.spezi.module.account.manager.UserSessionManager
-import edu.stanford.spezi.module.onboarding.consent.ConsentManager
 import edu.stanford.spezi.module.onboarding.fakes.FakeOnboardingRepository
 import edu.stanford.spezi.module.onboarding.invitation.InvitationCodeRepository
 import edu.stanford.spezi.module.onboarding.onboarding.OnboardingRepository
@@ -43,8 +42,4 @@ class TestOnboardingModule {
     @Provides
     @Singleton
     fun provideSequentialOnboardingRepository(): SequentialOnboardingRepository = mockk()
-
-    @Provides
-    @Singleton
-    fun provideOnConsentRepository(): ConsentManager = mockk()
 }

modules/onboarding/src/androidTest/kotlin/edu/stanford/spezi/module/onboarding/spezi/DynamicOnboardingTest.kt

@@ -0,0 +1,82 @@
+package edu.stanford.spezi.module.onboarding.spezi
+
+import androidx.compose.ui.test.junit4.createComposeRule
+import edu.stanford.spezi.module.onboarding.spezi.composables.DynamicOnboardingTestComposable
+import edu.stanford.spezi.module.onboarding.spezi.simulators.DynamicOnboardingSimulator
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class DynamicOnboardingTest {
+
+    @get:Rule
+    val composeRule = createComposeRule()
+
+    @Before
+    fun init() {
+        composeRule.setContent {
+            DynamicOnboardingTestComposable()
+        }
+    }
+
+    @Test
+    fun testDynamicOnboardingFlowONE() {
+        dynamicOnboarding {
+            assertTextExists("START")
+            clickButton("ONE")
+            assertTextExists("TITLE: ONE")
+            clickButton("Next")
+            assertTextExists("TITLE: TWO")
+            clickButton("Next")
+            assertTextExists("Done")
+            assertTextExists("Dynamic Onboarding done!")
+        }
+    }
+
+    @Test
+    fun testDynamicOnboardingFlowTWO() {
+        dynamicOnboarding {
+            assertTextExists("START")
+            clickButton("TWO")
+            assertTextExists("TITLE: TWO")
+            clickButton("Next")
+            assertTextExists("Done")
+            assertTextExists("Dynamic Onboarding done!")
+        }
+    }
+
+    @Test
+    fun testDynamicOnboardingFlowTHREE() {
+        dynamicOnboarding {
+            assertTextExists("START")
+            clickButton("THREE")
+            assertTextExists("TITLE: THREE")
+            clickButton("Next")
+            assertTextExists("TITLE: ONE")
+            clickButton("Next")
+            assertTextExists("TITLE: TWO")
+            clickButton("Next")
+            assertTextExists("Done")
+            assertTextExists("Dynamic Onboarding done!")
+        }
+    }
+
+    @Test
+    fun testDynamicOnboardingFlowNext() {
+        dynamicOnboarding {
+            assertTextExists("START")
+            clickButton("Next")
+            composeRule.waitForIdle()
+            assertTextExists("TITLE: ONE")
+            clickButton("Next")
+            assertTextExists("TITLE: TWO")
+            clickButton("Next")
+            assertTextExists("Done")
+            assertTextExists("Dynamic Onboarding done!")
+        }
+    }
+
+    private fun dynamicOnboarding(block: DynamicOnboardingSimulator.() -> Unit) {
+        DynamicOnboardingSimulator(composeRule).apply { block() }
+    }
+}

modules/onboarding/src/androidTest/kotlin/edu/stanford/spezi/module/onboarding/spezi/SequentialOnboardingTest.kt

@@ -0,0 +1,80 @@
+package edu.stanford.spezi.module.onboarding.spezi
+
+import androidx.compose.ui.test.junit4.createComposeRule
+import edu.stanford.spezi.module.onboarding.spezi.composables.SequentialOnboardingTestComposable
+import edu.stanford.spezi.module.onboarding.spezi.simulators.SequentialOnboardingSimulator
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class SequentialOnboardingTest {
+
+    @get:Rule
+    val composeRule = createComposeRule()
+
+    @Before
+    fun init() {
+        composeRule.setContent {
+            SequentialOnboardingTestComposable()
+        }
+    }
+
+    @Test
+    fun testSequentialOnboarding() {
+        sequentialOnboarding {
+            assertTextExists("Things to know")
+            assertTextExists("And you should pay close attention ...")
+
+            assertTextExists("1")
+            assertTextExists("A thing to know")
+            assertTextDoesNotExist("2")
+            assertTextDoesNotExist("Second thing to know")
+            assertTextDoesNotExist("3")
+            assertTextDoesNotExist("Third thing to know")
+            assertTextDoesNotExist("4")
+            assertTextDoesNotExist("Now you should know all the things!")
+
+            clickButton("Next")
+
+            assertTextExists("1")
+            assertTextExists("A thing to know")
+            assertTextExists("2")
+            assertTextExists("Second thing to know")
+            assertTextDoesNotExist("3")
+            assertTextDoesNotExist("Third thing to know")
+            assertTextDoesNotExist("4")
+            assertTextDoesNotExist("Now you should know all the things!")
+
+            clickButton("Next")
+
+            assertTextExists("1")
+            assertTextExists("A thing to know")
+            assertTextExists("2")
+            assertTextExists("Second thing to know")
+            assertTextExists("3")
+            assertTextExists("Third thing to know")
+            assertTextDoesNotExist("4")
+            assertTextDoesNotExist("Now you should know all the things!")
+
+            clickButton("Next")
+
+            assertTextExists("1")
+            assertTextExists("A thing to know")
+            assertTextExists("2")
+            assertTextExists("Second thing to know")
+            assertTextExists("3")
+            assertTextExists("Third thing to know")
+            assertTextExists("4")
+            assertTextExists("Now you should know all the things!")
+
+            clickButton("Continue")
+
+            assertTextExists("Done")
+            assertTextExists("Sequential Onboarding done!")
+        }
+    }
+
+    private fun sequentialOnboarding(block: SequentialOnboardingSimulator.() -> Unit) {
+        SequentialOnboardingSimulator(composeRule).apply { block() }
+    }
+}

modules/onboarding/src/androidTest/kotlin/edu/stanford/spezi/module/onboarding/spezi/WelcomeOnboardingTest.kt

@@ -0,0 +1,50 @@
+package edu.stanford.spezi.module.onboarding.spezi
+
+import androidx.compose.ui.test.junit4.createComposeRule
+import edu.stanford.spezi.module.onboarding.spezi.composables.WelcomeOnboardingTestComposable
+import edu.stanford.spezi.module.onboarding.spezi.simulators.WelcomeOnboardingSimulator
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class WelcomeOnboardingTest {
+
+    @get:Rule
+    val composeRule = createComposeRule()
+
+    @Before
+    fun init() {
+        composeRule.setContent {
+            WelcomeOnboardingTestComposable()
+        }
+    }
+
+    @Test
+    fun testWelcomeOnboarding() {
+        welcomeOnboarding {
+            assertTextExists("Welcome")
+            assertTextExists("Spezi UI Tests")
+
+            assertTextExists("Tortoise")
+            assertTextExists("A Tortoise!")
+
+            assertTextExists("Tree")
+            assertTextExists("A Tree!")
+
+            assertTextExists("Letter")
+            assertTextExists("A letter!")
+
+            assertTextExists("Circle")
+            assertTextExists("A circle!")
+
+            clickButton("Learn More")
+
+            assertTextExists("Done")
+            assertTextExists("Welcome Onboarding done!")
+        }
+    }
+
+    private fun welcomeOnboarding(block: WelcomeOnboardingSimulator.() -> Unit) {
+        WelcomeOnboardingSimulator(composeRule).apply { block() }
+    }
+}