From fa91413a985a6166c27f44584f6dbccb10df722e Mon Sep 17 00:00:00 2001 From: Yvan Date: Fri, 29 Mar 2024 14:53:46 +0100 Subject: [PATCH 1/2] feat : ServerDetail Navigation --- .../com/example/mathseduc/AppNavigation.kt | 21 +- .../mathseduc/ServerDetailsActivity.kt | 380 +++++++++--------- .../example/mathseduc/ui/activity_multi.kt | 15 +- 3 files changed, 212 insertions(+), 204 deletions(-) diff --git a/Android/app/src/main/java/com/example/mathseduc/AppNavigation.kt b/Android/app/src/main/java/com/example/mathseduc/AppNavigation.kt index 8765f97..48ba481 100644 --- a/Android/app/src/main/java/com/example/mathseduc/AppNavigation.kt +++ b/Android/app/src/main/java/com/example/mathseduc/AppNavigation.kt @@ -1,9 +1,11 @@ package com.example.mathseduc import androidx.compose.runtime.Composable +import androidx.navigation.NavType import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController +import androidx.navigation.navArgument import com.example.mathseduc.ui.CreateLobbyPage import com.example.mathseduc.ui.HomePage import com.example.mathseduc.ui.MultiPage @@ -17,6 +19,23 @@ fun AppNavigation() { composable("connexion") { ConnexionPlayerContent(navController) } composable("multiplayer") { MultiPage(navController) } composable("createLobby") { CreateLobbyPage(navController) } - //composable("serverDetails/{serverName}/{lobbyId}") { ServerDetailPage(navController) } + composable( + route = "serverDetails/{lobbyName}/{lobbyId}/{lobbyChapter}/{lobbyNbPlayers}/{lobbyDifficulty}", + arguments = listOf( + navArgument("lobbyName") { type = NavType.StringType }, + navArgument("lobbyId") { type = NavType.IntType }, + navArgument("lobbyChapter") { type = NavType.IntType }, + navArgument("lobbyNbPlayers") { type = NavType.IntType }, + navArgument("lobbyDifficulty") { type = NavType.IntType } + ) + ) { backStackEntry -> + val lobbyName = backStackEntry.arguments?.getString("lobbyName") + val lobbyId = backStackEntry.arguments?.getInt("lobbyId") + val lobbyChapter = backStackEntry.arguments?.getInt("lobbyChapter") + val lobbyNbPlayers = backStackEntry.arguments?.getInt("lobbyNbPlayers") + val lobbyDifficulty = backStackEntry.arguments?.getInt("lobbyDifficulty") + + ServerDetailPage(navController, lobbyName,lobbyId, lobbyChapter, lobbyNbPlayers, lobbyDifficulty) + } } } \ No newline at end of file diff --git a/Android/app/src/main/java/com/example/mathseduc/ServerDetailsActivity.kt b/Android/app/src/main/java/com/example/mathseduc/ServerDetailsActivity.kt index 2abc811..7be6123 100644 --- a/Android/app/src/main/java/com/example/mathseduc/ServerDetailsActivity.kt +++ b/Android/app/src/main/java/com/example/mathseduc/ServerDetailsActivity.kt @@ -84,7 +84,7 @@ class ServerDetailsActivity : ComponentActivity() { setContent { val navController = rememberNavController() - ServerDetailPage(navController = navController) + //ServerDetailPage(navController = navController) } } @@ -106,221 +106,215 @@ class ServerDetailsActivity : ComponentActivity() { } finish() } +} +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ServerDetailPage(navController: NavController, serverName: String?, lobbyId: Int?, chapterId: Int?, nbPlayers: Int?, lobbyDifficulty: Int?) { + + val context = LocalContext.current + + var isCreator by rememberSaveable { mutableStateOf(false) } + var playerListInfos: List by rememberSaveable { mutableStateOf(emptyList()) } + var playerList by rememberSaveable { mutableStateOf(ControllerPlayer.getPlayersIdFromLobbyId(lobbyId.toString()) ?: emptyList()) } + var refreshState by rememberSaveable { mutableStateOf(true) } + var showDialog by rememberSaveable { mutableStateOf(false) } + + val isPortrait = LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT + val activity = LocalView.current.context as Activity + val windowInsetsController = remember { + WindowCompat.getInsetsController(activity.window, activity.window.decorView) + } - @OptIn(ExperimentalMaterial3Api::class) - @Composable - fun ServerDetailPage(navController: NavController) { - val context = LocalContext.current - - val serverName = intent.getStringExtra("serverName") - val lobbyId = intent.getIntExtra("lobbyId",-1) - val chapterId = intent.getIntExtra("chapterId",-1) - val nbPlayers = intent.getIntExtra("nbPlayers",-1) - val lobbyDifficulty = intent.getIntExtra("lobbyDifficulty",-1) - - var isCreator by rememberSaveable { mutableStateOf(false) } - var playerListInfos: List by rememberSaveable { mutableStateOf(emptyList()) } - var playerList by rememberSaveable { mutableStateOf(ControllerPlayer.getPlayersIdFromLobbyId(lobbyId.toString()) ?: emptyList()) } - var refreshState by rememberSaveable { mutableStateOf(true) } - var showDialog by rememberSaveable { mutableStateOf(false) } - - val isPortrait = LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT - val activity = LocalView.current.context as Activity - val windowInsetsController = remember { - WindowCompat.getInsetsController(activity.window, activity.window.decorView) - } + windowInsetsController.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE + + windowInsetsController.hide(WindowInsetsCompat.Type.systemBars()) + + DisposableEffect(refreshState) { + val handler = Handler(Looper.getMainLooper()) + val refreshRunnable = object : Runnable { + override fun run() { + playerList = ControllerPlayer.getPlayersIdFromLobbyId(lobbyId.toString())!! - windowInsetsController.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE - - windowInsetsController.hide(WindowInsetsCompat.Type.systemBars()) - - DisposableEffect(refreshState) { - val handler = Handler(Looper.getMainLooper()) - val refreshRunnable = object : Runnable { - override fun run() { - playerList = ControllerPlayer.getPlayersIdFromLobbyId(lobbyId.toString())!! - - playerListInfos = playerList.mapNotNull { playerId -> - ControllerPlayer.getPlayerInfoById(playerId.toString()) - } - - isCreator = ControllerLobby.playerCreatorIdPresentInLobby(MainActivity.idPlayerConnected, lobbyId) - - if(ControllerLobby.lobbyIsLaunched(lobbyId)){ - val intent = Intent(context, QuizMultiActivity::class.java) - intent.putExtra("serverName", serverName) - intent.putExtra("lobbyId", lobbyId) - intent.putExtra("chapterId", chapterId) - intent.putExtra("nbPlayers", nbPlayers) - intent.putExtra("lobbyDifficulty", lobbyDifficulty) - context.startActivity(intent) - refreshState = false - } - - if (refreshState){ - handler.postDelayed(this,3000) - Log.e("MainActivity", "Refresh ServerDetails") - } + playerListInfos = playerList.mapNotNull { playerId -> + ControllerPlayer.getPlayerInfoById(playerId.toString()) } - } - handler.post(refreshRunnable) + isCreator = ControllerLobby.playerCreatorIdPresentInLobby(MainActivity.idPlayerConnected, lobbyId!!) + + if(ControllerLobby.lobbyIsLaunched(lobbyId)){ + val intent = Intent(context, QuizMultiActivity::class.java) + intent.putExtra("serverName", serverName) + intent.putExtra("lobbyId", lobbyId) + intent.putExtra("chapterId", chapterId) + intent.putExtra("nbPlayers", nbPlayers) + intent.putExtra("lobbyDifficulty", lobbyDifficulty) + context.startActivity(intent) + refreshState = false + } - onDispose { - refreshState = false - handler.removeCallbacks(refreshRunnable) + if (refreshState){ + handler.postDelayed(this,3000) + Log.e("MainActivity", "Refresh ServerDetails") + } } } - TopAppBar( - colors = TopAppBarDefaults.topAppBarColors( - containerColor = Color.Transparent, - ), - title = {}, - navigationIcon = { - IconButton( - onClick = { showDialog = true }, - modifier = Modifier.size(60.dp) - ) { - Icon( - imageVector = Icons.Filled.ArrowBack, - contentDescription = "Retour", - modifier = Modifier.size(36.dp), - tint = Color.White - ) - } - }, + handler.post(refreshRunnable) + + onDispose { + refreshState = false + handler.removeCallbacks(refreshRunnable) + } + } + + TopAppBar( + colors = TopAppBarDefaults.topAppBarColors( + containerColor = Color.Transparent, + ), + title = {}, + navigationIcon = { + IconButton( + onClick = { showDialog = true }, + modifier = Modifier.size(60.dp) + ) { + Icon( + imageVector = Icons.Filled.ArrowBack, + contentDescription = "Retour", + modifier = Modifier.size(36.dp), + tint = Color.White + ) + } + }, + ) + + val modifier = Modifier + .fillMaxSize() + .padding(start = 16.dp, end = 16.dp, bottom = 16.dp, top = 8.dp) + + Column( + modifier = modifier, + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = serverName!!, + color = Color.White, + fontSize = 30.sp, + fontWeight = FontWeight.Bold ) - val modifier = Modifier - .fillMaxSize() - .padding(start = 16.dp, end = 16.dp, bottom = 16.dp, top = 8.dp) + Spacer(modifier = Modifier.height(if(isPortrait)25.dp else 10.dp)) - Column( - modifier = modifier, - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { Text( - text = serverName!!, - color = Color.White, - fontSize = 30.sp, - fontWeight = FontWeight.Bold + text = "Lobby Settings", + fontSize = 23.sp, + color = Color.White, + fontWeight = FontWeight.Bold + ) + Text( + text = "Chapter : ${ControllerChapter.getChapterNameById(chapterId!!).toString()}", + fontSize = 19.sp, + color = Color.White + ) + Row { + Text( + text = "Players : ${ControllerLobby.getNbPlayerInLobby(lobbyId!!)}/${nbPlayers}", + fontSize = 19.sp, + color = (if(ControllerLobby.getNbPlayerInLobby(lobbyId)==nbPlayers) Color.Red else Color.White) + ) + Spacer(modifier = Modifier.width(40.dp)) + Text( + text = "Difficulty : $lobbyDifficulty", + fontSize = 19.sp, + color = Colors.White, ) + } - Spacer(modifier = Modifier.height(if(isPortrait)25.dp else 10.dp)) + Spacer(modifier = Modifier.height(if(isPortrait)30.dp else 10.dp)) + Text( + text = "Player Name", + fontSize = 19.sp, + modifier = Modifier.background(Color.Black), + color = Colors.White, + ) + Divider( + color = Color.Gray, + thickness = 2.dp, + modifier = Modifier.fillMaxWidth() + ) + LazyColumn( + modifier = Modifier + .fillMaxSize() + .weight(0.75f) + .padding(top = 1.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + items(playerListInfos) { player -> Text( - text = "Lobby Settings", - fontSize = 23.sp, - color = Color.White, - fontWeight = FontWeight.Bold - ) - Text( - text = "Chapter : ${ControllerChapter.getChapterNameById(chapterId).toString()}", - fontSize = 19.sp, - color = Color.White - ) - Row { - Text( - text = "Players : ${ControllerLobby.getNbPlayerInLobby(lobbyId)}/${nbPlayers}", - fontSize = 19.sp, - color = (if(ControllerLobby.getNbPlayerInLobby(lobbyId)==nbPlayers) Color.Red else Color.White) - ) - Spacer(modifier = Modifier.width(40.dp)) - Text( - text = "Difficulty : $lobbyDifficulty", - fontSize = 19.sp, - color = Colors.White, + text = player.nickname, + fontSize = 18.sp, + color = Colors.White, + modifier = Modifier + .weight(1f) + .padding(top = if (isPortrait) 5.dp else 1.dp) ) } - - Spacer(modifier = Modifier.height(if(isPortrait)30.dp else 10.dp)) - - Text( - text = "Player Name", - fontSize = 19.sp, - modifier = Modifier.background(Color.Black), - color = Colors.White, - ) - Divider( - color = Color.Gray, - thickness = 2.dp, - modifier = Modifier.fillMaxWidth() - ) - LazyColumn( + } + if (isCreator) { + val formDataBuilder = MultipartBody.Builder().setType(MultipartBody.FORM) + formDataBuilder.addFormDataPart("launched", "1") + Button( + onClick = { + ControllerLobby.updateLobbyLauched(lobbyId!!,formDataBuilder) + }, + shape = RoundedCornerShape(15), + enabled = isCreator, + colors = ButtonDefaults.buttonColors(Colors.Green), modifier = Modifier - .fillMaxSize() - .weight(0.75f) - .padding(top = 1.dp), - horizontalAlignment = Alignment.CenterHorizontally + .fillMaxWidth() + .height(48.dp) ) { - items(playerListInfos) { player -> - Text( - text = player.nickname, - fontSize = 18.sp, - color = Colors.White, - modifier = Modifier - .weight(1f) - .padding(top = if (isPortrait) 5.dp else 1.dp) - ) - } + Text( + text = "LAUNCH", + color = Color.White, + fontWeight = FontWeight.Bold + ) } - if (isCreator) { - val formDataBuilder = MultipartBody.Builder().setType(MultipartBody.FORM) - formDataBuilder.addFormDataPart("launched", "1") + } + if (showDialog) { + LeaveLobbyDialog(serverName, onConfirmLeave = {navController.navigate("multiplayer")},onCancelLeave = { showDialog = false }) + } + } +} +@Composable +fun LeaveLobbyDialog(namelobby: String, onConfirmLeave: () -> Unit, onCancelLeave: () -> Unit) { + val context = LocalContext.current + + AlertDialog( + onDismissRequest = onCancelLeave, + title = { Text("Confirm leaving lobby") }, + confirmButton = { Button( - onClick = { - ControllerLobby.updateLobbyLauched(lobbyId,formDataBuilder) - }, - shape = RoundedCornerShape(15), - enabled = isCreator, - colors = ButtonDefaults.buttonColors(Colors.Green), - modifier = Modifier - .fillMaxWidth() - .height(48.dp) + onClick = { + onConfirmLeave() + } ) { - Text( - text = "LAUNCH", - color = Color.White, - fontWeight = FontWeight.Bold - ) + Text("Leave") } - } - if (showDialog) { - LeaveLobbyDialog(serverName, onConfirmLeave = {navController.navigate("multiplayer")},onCancelLeave = { showDialog = false }) - } - } - } - @Composable - fun LeaveLobbyDialog(namelobby: String, onConfirmLeave: () -> Unit, onCancelLeave: () -> Unit) { - val context = LocalContext.current - - AlertDialog( - onDismissRequest = onCancelLeave, - title = { Text("Confirm leaving lobby") }, - confirmButton = { - Button( - onClick = { - onConfirmLeave() - } - ) { - Text("Leave") - } - }, - dismissButton = { - Button( - onClick = { - onCancelLeave() - } - ) { - Text("Cancel") - } - }, - text = { - Text("Are you sure you want to leave the lobby $namelobby?") + }, + dismissButton = { + Button( + onClick = { + onCancelLeave() + } + ) { + Text("Cancel") } - ) - } - + }, + text = { + Text("Are you sure you want to leave the lobby $namelobby?") + } + ) } + diff --git a/Android/app/src/main/java/com/example/mathseduc/ui/activity_multi.kt b/Android/app/src/main/java/com/example/mathseduc/ui/activity_multi.kt index 3db7d83..682599e 100644 --- a/Android/app/src/main/java/com/example/mathseduc/ui/activity_multi.kt +++ b/Android/app/src/main/java/com/example/mathseduc/ui/activity_multi.kt @@ -2,7 +2,6 @@ package com.example.mathseduc.ui import android.app.Activity import android.content.Context -import android.content.Intent import android.content.res.Configuration import android.util.Log import android.widget.Toast @@ -57,7 +56,6 @@ import androidx.core.view.WindowInsetsControllerCompat import androidx.lifecycle.ViewModelProvider import androidx.navigation.NavController import com.example.mathseduc.MainActivity -import com.example.mathseduc.ServerDetailsActivity import com.example.mathseduc.controllers.ControllerChapter import com.example.mathseduc.controllers.ControllerLobby import com.example.mathseduc.controllers.ControllerUtiliser @@ -65,6 +63,7 @@ import com.example.mathseduc.models.Lobby import com.example.mathseduc.ui.theme.Colors import com.example.mathseduc.viewModel.MultiPageViewModel import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.MainScope import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import okhttp3.MultipartBody @@ -224,14 +223,10 @@ private suspend fun createUtiliserForLobby(context: Context, lobby: Lobby, navCo ControllerUtiliser.createUtiliserByIdLobby(formDataBuilder) // Naviguer vers l'activité ServerDetails avec les détails du lobby - val intent = Intent(context, ServerDetailsActivity::class.java) - intent.putExtra("serverName", lobby.name) - intent.putExtra("lobbyId", lobby.id) - intent.putExtra("chapterId", lobby.idchapter) - intent.putExtra("nbPlayers", lobby.nbplayers) - intent.putExtra("lobbyDifficulty", lobby.difficulty) - context.startActivity(intent) - //navController.navigate("serverDetails/${lobby.name}/${lobby.id}") + val mainScope = MainScope() + mainScope.launch { + navController.navigate("serverDetails/${lobby.name}/${lobby.id}/${lobby.idchapter}/${lobby.nbplayers}/${lobby.difficulty}") + } } } From 69e477b3ca7daf3a0890803c31766c3e7256be87 Mon Sep 17 00:00:00 2001 From: Yvan Date: Fri, 29 Mar 2024 17:07:39 +0100 Subject: [PATCH 2/2] feat : Navigation createLobby to ServerDetail + launch --- .../com/example/mathseduc/AppNavigation.kt | 10 ++++++++ .../example/mathseduc/QuizMultiActivity.kt | 7 +++--- .../mathseduc/ServerDetailsActivity.kt | 14 ++++------- .../mathseduc/ui/activity_create_lobby.kt | 13 +--------- .../mathseduc/ui/activity_quiz_multi.kt | 24 +++++++++---------- 5 files changed, 29 insertions(+), 39 deletions(-) diff --git a/Android/app/src/main/java/com/example/mathseduc/AppNavigation.kt b/Android/app/src/main/java/com/example/mathseduc/AppNavigation.kt index 48ba481..9865efd 100644 --- a/Android/app/src/main/java/com/example/mathseduc/AppNavigation.kt +++ b/Android/app/src/main/java/com/example/mathseduc/AppNavigation.kt @@ -9,6 +9,7 @@ import androidx.navigation.navArgument import com.example.mathseduc.ui.CreateLobbyPage import com.example.mathseduc.ui.HomePage import com.example.mathseduc.ui.MultiPage +import com.example.mathseduc.ui.QuizMultiScreen @Composable fun AppNavigation() { @@ -37,5 +38,14 @@ fun AppNavigation() { ServerDetailPage(navController, lobbyName,lobbyId, lobbyChapter, lobbyNbPlayers, lobbyDifficulty) } + composable( + route = "quizMultiScreen/{lobbyId}", + arguments = listOf( + navArgument("lobbyId") { type = NavType.IntType } + ) + ) { backStackEntry -> + val lobbyId = backStackEntry.arguments?.getInt("lobbyId") + QuizMultiScreen(navController, lobbyId) + } } } \ No newline at end of file diff --git a/Android/app/src/main/java/com/example/mathseduc/QuizMultiActivity.kt b/Android/app/src/main/java/com/example/mathseduc/QuizMultiActivity.kt index 6e5190c..188152a 100644 --- a/Android/app/src/main/java/com/example/mathseduc/QuizMultiActivity.kt +++ b/Android/app/src/main/java/com/example/mathseduc/QuizMultiActivity.kt @@ -4,9 +4,6 @@ import android.os.Bundle import android.os.CountDownTimer import androidx.activity.ComponentActivity import androidx.activity.compose.setContent -import androidx.compose.runtime.Composable -import androidx.compose.ui.tooling.preview.Preview -import com.example.mathseduc.ui.QuizMultiScreen import com.example.mathseduc.ui.theme.MathsEducTheme @@ -20,10 +17,12 @@ class QuizMultiActivity : ComponentActivity() { setContent { MathsEducTheme { + /* val lobbyId = intent.getIntExtra("lobbyId",-1) val serverName = intent.getStringExtra("serverName") - QuizMultiScreen(lobbyId, serverName!!, activity = this@QuizMultiActivity) //TODO sus + QuizMultiScreen(lobbyId, serverName!!) //TODO sus + */ } } } diff --git a/Android/app/src/main/java/com/example/mathseduc/ServerDetailsActivity.kt b/Android/app/src/main/java/com/example/mathseduc/ServerDetailsActivity.kt index 7be6123..a500454 100644 --- a/Android/app/src/main/java/com/example/mathseduc/ServerDetailsActivity.kt +++ b/Android/app/src/main/java/com/example/mathseduc/ServerDetailsActivity.kt @@ -1,7 +1,6 @@ package com.example.mathseduc import android.app.Activity -import android.content.Intent import android.content.res.Configuration import android.os.Bundle import android.os.Handler @@ -56,7 +55,6 @@ import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat import androidx.navigation.NavController -import androidx.navigation.compose.rememberNavController import com.example.mathseduc.controllers.ControllerChapter import com.example.mathseduc.controllers.ControllerLobby import com.example.mathseduc.controllers.ControllerPlayer @@ -83,8 +81,10 @@ class ServerDetailsActivity : ComponentActivity() { onBackPressedDispatcher.addCallback(this, onBackPressedCallback) setContent { + /* val navController = rememberNavController() - //ServerDetailPage(navController = navController) + ServerDetailPage(navController = navController) + */ } } @@ -142,13 +142,7 @@ fun ServerDetailPage(navController: NavController, serverName: String?, lobbyId: isCreator = ControllerLobby.playerCreatorIdPresentInLobby(MainActivity.idPlayerConnected, lobbyId!!) if(ControllerLobby.lobbyIsLaunched(lobbyId)){ - val intent = Intent(context, QuizMultiActivity::class.java) - intent.putExtra("serverName", serverName) - intent.putExtra("lobbyId", lobbyId) - intent.putExtra("chapterId", chapterId) - intent.putExtra("nbPlayers", nbPlayers) - intent.putExtra("lobbyDifficulty", lobbyDifficulty) - context.startActivity(intent) + navController.navigate("quizMultiScreen/${lobbyId}") refreshState = false } diff --git a/Android/app/src/main/java/com/example/mathseduc/ui/activity_create_lobby.kt b/Android/app/src/main/java/com/example/mathseduc/ui/activity_create_lobby.kt index 1d85b70..1c88851 100644 --- a/Android/app/src/main/java/com/example/mathseduc/ui/activity_create_lobby.kt +++ b/Android/app/src/main/java/com/example/mathseduc/ui/activity_create_lobby.kt @@ -2,7 +2,6 @@ package com.example.mathseduc.ui import android.app.Activity -import android.content.Intent import android.content.res.Configuration import android.util.Log import android.widget.Toast @@ -35,7 +34,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.platform.LocalConfiguration @@ -45,7 +43,6 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.platform.LocalView import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.PasswordVisualTransformation -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -53,9 +50,7 @@ import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat import androidx.navigation.NavController -import androidx.navigation.compose.rememberNavController import com.example.mathseduc.MainActivity -import com.example.mathseduc.ServerDetailsActivity import com.example.mathseduc.controllers.ControllerChapter import com.example.mathseduc.controllers.ControllerLobby import com.example.mathseduc.controllers.ControllerUtiliser @@ -286,13 +281,7 @@ fun CreateLobbyPage(navController: NavController) { ControllerUtiliser.createUtiliserByIdLobby(formDataBuilderConnexion) Toast.makeText(context, "Lobby created successfully!", Toast.LENGTH_SHORT).show() - val intent = Intent(context, ServerDetailsActivity::class.java) - intent.putExtra("lobbyId", lobbyId) - intent.putExtra("serverName", lobbyName) - intent.putExtra("chapterId", selectedChapter.id.toInt()) - intent.putExtra("nbPlayers", nbPlayers.toInt()) - intent.putExtra("lobbyDifficulty", difficultyNum) - context.startActivity(intent) + navController.navigate("serverDetails/${lobbyName}/${lobbyId}/${selectedChapter.id.toInt()}/${nbPlayers}/${difficultyNum}") } else { Toast.makeText(context, "Failed to create lobby. Please try again.", Toast.LENGTH_SHORT).show() } diff --git a/Android/app/src/main/java/com/example/mathseduc/ui/activity_quiz_multi.kt b/Android/app/src/main/java/com/example/mathseduc/ui/activity_quiz_multi.kt index 682a9b9..8bdd02c 100644 --- a/Android/app/src/main/java/com/example/mathseduc/ui/activity_quiz_multi.kt +++ b/Android/app/src/main/java/com/example/mathseduc/ui/activity_quiz_multi.kt @@ -1,6 +1,6 @@ package com.example.mathseduc.ui -import android.content.Intent +import android.app.Activity import android.widget.Toast import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -26,15 +26,15 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat +import androidx.navigation.NavController import com.example.mathseduc.MainActivity -import com.example.mathseduc.QuizMultiActivity -import com.example.mathseduc.ServerDetailsActivity import com.example.mathseduc.controllers.ControllerLobby import com.example.mathseduc.controllers.ControllerQuestion import com.example.mathseduc.ui.theme.Colors @@ -43,16 +43,17 @@ import okhttp3.MultipartBody @Composable -fun QuizMultiScreen(lobbyId: Int,serverName: String,activity: QuizMultiActivity) { +fun QuizMultiScreen(navController: NavController, lobbyId: Int?) { val context = LocalContext.current + val activity = LocalView.current.context as Activity var chronoValue by remember { mutableStateOf(0.0f) } - var listQuestion by remember { mutableStateOf(ControllerQuestion.getQuestionsForLobby(ControllerLobby.getIdQuestionsLobby(lobbyId))) } - var listPlayer by remember { mutableStateOf(ControllerLobby.getPlayerInLobby(lobbyId)) } + var listQuestion by remember { mutableStateOf(ControllerQuestion.getQuestionsForLobby(ControllerLobby.getIdQuestionsLobby(lobbyId!!))) } + var listPlayer by remember { mutableStateOf(ControllerLobby.getPlayerInLobby(lobbyId!!)) } var currentQuestionIndex by remember { mutableIntStateOf(0) } val progressBarValues by remember { mutableStateOf(Array(listPlayer.size) { 0.0f }) } val progressBarTotalValues by remember { mutableStateOf(Array(listPlayer.size) { 0.0f }) } - var quizFinished by remember { mutableStateOf(false) } // Variable pour indiquer si le quiz est terminé ou non + var quizFinished by remember { mutableStateOf(false) } val windowInsetsController = remember { WindowCompat.getInsetsController(activity.window, activity.window.decorView) @@ -81,7 +82,7 @@ fun QuizMultiScreen(lobbyId: Int,serverName: String,activity: QuizMultiActivity) val timer = ticker(delayMillis = 3000) for (tick in timer) { if (quizFinished) break - var valueBD = ControllerLobby.getPlayerInLobby(lobbyId) + var valueBD = ControllerLobby.getPlayerInLobby(lobbyId!!) for ((index, player) in listPlayer.withIndex()) { progressBarTotalValues[index] = progressBarValues[index] + valueBD[index].playertime } @@ -150,7 +151,7 @@ fun QuizMultiScreen(lobbyId: Int,serverName: String,activity: QuizMultiActivity) Toast.makeText(context, "Oh ouii !!", Toast.LENGTH_SHORT).show() val formDataBuilder = MultipartBody.Builder().setType(MultipartBody.FORM) - val playertime = ControllerLobby.getLobbyUtiliserPlayerTime(lobbyId,MainActivity.idPlayerConnected) + 10 + val playertime = ControllerLobby.getLobbyUtiliserPlayerTime(lobbyId!!,MainActivity.idPlayerConnected) + 10 formDataBuilder.addFormDataPart("playertime", playertime.toString()) ControllerLobby.updateLobbyUtiliserPlayerTime(lobbyId,MainActivity.idPlayerConnected,formDataBuilder) @@ -191,10 +192,7 @@ fun QuizMultiScreen(lobbyId: Int,serverName: String,activity: QuizMultiActivity) } } else { Toast.makeText(context, "Fini !!", Toast.LENGTH_SHORT).show() - val intent = Intent(context, MainActivity::class.java) - //intent.putExtra("serverName", serverName) - //intent.putExtra("lobbyId", lobbyId) - context.startActivity(intent) + navController.navigate("home") quizFinished = true } }