diff --git a/android/app/src/main/java/fr/iut/sciencequest/navigation/NavHost.kt b/android/app/src/main/java/fr/iut/sciencequest/navigation/NavHost.kt index 3e6f4f5..bde7df8 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/navigation/NavHost.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/navigation/NavHost.kt @@ -6,9 +6,11 @@ import androidx.compose.ui.Modifier import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController +import fr.iut.sciencequest.stub.StubQuestionWithReponses import fr.iut.sciencequest.view.AccountScreen import fr.iut.sciencequest.view.HomeScreen import fr.iut.sciencequest.view.LoginScreen +import fr.iut.sciencequest.view.games.KahootScreen import fr.iut.sciencequest.view.games.PenduScreen @@ -31,6 +33,9 @@ fun NavHost() { }, goToPendu = { navController.navigate("pendu") + }, + goToKahoot = { + navController.navigate("kahoot") } ) } @@ -67,5 +72,15 @@ fun NavHost() { } ) } + + composable(route= "kahoot"){ + KahootScreen( goToAccount = { + navController.navigate("account") + }, + goToHome = { + navController.navigate("home") + }, + StubQuestionWithReponses) + } } } \ No newline at end of file diff --git a/android/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt b/android/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt index d16ebb6..aa2dc2a 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt @@ -16,21 +16,21 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @Composable -fun HomeScreen(goToHome: () -> Unit, goToAccount: () -> Unit, goToPendu: () -> Unit) { +fun HomeScreen(goToHome: () -> Unit, goToAccount: () -> Unit, goToPendu: () -> Unit, goToKahoot: () -> Unit) { Column (modifier = Modifier.fillMaxWidth()){ TopBar(goToAccount, goToHome) - MainContent(goToPendu) + MainContent(goToPendu, goToKahoot) } } @Preview @Composable fun HomeScreenPreview() { - HomeScreen({},{},{}) + HomeScreen({},{},{}, {}) } @Composable -fun MainContent(goToPendu: () -> Unit) { +fun MainContent(goToPendu: () -> Unit, goToKahoot: () -> Unit) { val context = LocalContext.current; val comingSoon = Toast.makeText(context, "Coming soon", Toast.LENGTH_SHORT); @@ -39,7 +39,7 @@ fun MainContent(goToPendu: () -> Unit) { Button(onClick = goToPendu, Modifier.fillMaxWidth()) { Text(text = "Pendu", fontSize = 13.sp) } - Button(onClick = { comingSoon.show() }, Modifier.fillMaxWidth()) { + Button(onClick = goToKahoot, Modifier.fillMaxWidth()) { Text(text = "Kahoot", fontSize = 13.sp) } Button(onClick = { comingSoon.show() }, Modifier.fillMaxWidth()) {