From ab3563723e5b02da2d731c868686d0781bf0474e Mon Sep 17 00:00:00 2001 From: Jeremy DUCOURTHIAL Date: Thu, 14 Mar 2024 22:00:49 +0100 Subject: [PATCH] =?UTF-8?q?feat=20:=20question,=20bar=20et=20chrono=20ajus?= =?UTF-8?q?t=C3=A9=20+=20sycro=20multi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mathseduc/ConnexionPlayerActivity.kt | 2 + .../example/mathseduc/QuizMultiActivity.kt | 4 +- .../mathseduc/ServerDetailsActivity.kt | 54 +----------- .../mathseduc/controllers/ControllerLobby.kt | 86 ++++++++++++++++++- .../controllers/ControllerQuestion.kt | 1 - .../com/example/mathseduc/models/Utiliser.kt | 1 - .../mathseduc/ui/activity_quiz_multi.kt | 46 ++++++++-- 7 files changed, 130 insertions(+), 64 deletions(-) diff --git a/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt b/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt index 24d71ad..ca9d0e1 100644 --- a/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt +++ b/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt @@ -129,6 +129,8 @@ fun ConnexionPlayerContent(activity: ConnexionPlayerActivity) { if (isAuthenticated != -1) { MainActivity.idPlayerConnected = isAuthenticated Toast.makeText(context, "Connexion réussie, bienvenue $nickname !", Toast.LENGTH_SHORT).show() + val intent = Intent(context, MainActivity::class.java) + context.startActivity(intent) } else { Toast.makeText(context, "Connexion échouée. Veuillez réessayer.", Toast.LENGTH_SHORT).show() } 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 ffad1e3..fa067a6 100644 --- a/Android/app/src/main/java/com/example/mathseduc/QuizMultiActivity.kt +++ b/Android/app/src/main/java/com/example/mathseduc/QuizMultiActivity.kt @@ -21,7 +21,9 @@ class QuizMultiActivity : ComponentActivity() { setContent { MathsEducTheme { val lobbyId = intent.getIntExtra("lobbyId",-1) - QuizMultiScreen(lobbyId) //TODO sus + val serverName = intent.getStringExtra("serverName") + + 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 4fd4413..8c4715b 100644 --- a/Android/app/src/main/java/com/example/mathseduc/ServerDetailsActivity.kt +++ b/Android/app/src/main/java/com/example/mathseduc/ServerDetailsActivity.kt @@ -60,54 +60,6 @@ class ServerDetailsActivity : ComponentActivity() { setContent { ServerDetailPage() } - - /* - onBackPressedDispatcher.addCallback(this, onBackPressedCallback) - //setContentView(R.layout.activity_server_details) - - val serverName = intent.getStringExtra("serverName") - - val serverNameTextView = findViewById(R.id.titleServerDetails) - serverNameTextView.text = serverName - - val lobbyId = intent.getIntExtra("lobbyId", -1) - - if (savedInstanceState != null) { - playerList = savedInstanceState?.getParcelableArrayList("playerList") ?: emptyList() - } else { - val playerId = ControllerPlayer.getPlayersIdFromLobbyId(lobbyId) - if (playerId != null) { - playerList = playerId.mapNotNull { playerId -> - ControllerPlayer.getPlayerInfoById(playerId.toString()) - } - } - } - - val listViewPlayers = findViewById(R.id.listViewPlayers) - playerAdapter = PlayerAdapter(this, playerList) - listViewPlayers.adapter = playerAdapter - - handler.postDelayed(refreshRunnable, refreshInterval) - - val btnLaunchQuiz = findViewById