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 a0c2b85..ffad1e3 100644 --- a/Android/app/src/main/java/com/example/mathseduc/QuizMultiActivity.kt +++ b/Android/app/src/main/java/com/example/mathseduc/QuizMultiActivity.kt @@ -20,7 +20,8 @@ class QuizMultiActivity : ComponentActivity() { setContent { MathsEducTheme { - QuizMultiScreen() + val lobbyId = intent.getIntExtra("lobbyId",-1) + QuizMultiScreen(lobbyId) //TODO sus } } } @@ -32,10 +33,3 @@ class QuizMultiActivity : ComponentActivity() { } } -@Preview(showBackground = true) -@Composable -fun QuizMultiScreenPreview() { - MathsEducTheme { - QuizMultiScreen() - } -} 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 70313dc..679cf32 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,7 @@ package com.example.mathseduc.ui import android.os.CountDownTimer +import android.util.Log import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -30,25 +31,19 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.example.mathseduc.QuizMultiActivity import com.example.mathseduc.controllers.ControllerLobby +import com.example.mathseduc.controllers.ControllerQuestion import com.example.mathseduc.ui.theme.Colors import com.example.mathseduc.ui.theme.MathsEducTheme -@Preview -@Composable -fun QuizMultiPreview() { - MathsEducTheme { - QuizMultiScreen() - } -} + @Composable -fun QuizMultiScreen() { +fun QuizMultiScreen(lobbyId: Int) { var progressBar1Value by remember { mutableStateOf(0.0f) } var chronoValue by remember { mutableStateOf(0.0f) } - //val lobbyId = intent.getIntExtra("lobbyId",-1) - //var listQuestion = ControllerLobby.getIdQuestionsLobby() + var listQuestion = ControllerQuestion.getQuestionsForLobby(ControllerLobby.getIdQuestionsLobby(lobbyId)) Column( modifier = Modifier @@ -103,7 +98,7 @@ fun QuizMultiScreen() { .background(color = Color.Gray, shape = RoundedCornerShape(8.dp)) ) { Text( - text = "Question", + text = "test", modifier = Modifier .padding(16.dp), color = Color.White,