From b500df729681e2db325d08370d16908d584e72e8 Mon Sep 17 00:00:00 2001 From: DimazzP Date: Sun, 23 Feb 2025 11:39:44 +0700 Subject: [PATCH] update reward screen --- app/src/main/java/com/example/lexilearn/MainActivity.kt | 2 +- .../com/example/lexilearn/ui/views/pHome/HomeViewModel.kt | 2 +- .../ui/views/pResultScreening/ResultScreeningScreen.kt | 3 ++- .../ui/views/pResultScreening/ResultScreeningViewModel.kt | 8 ++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/example/lexilearn/ui/views/pResultScreening/ResultScreeningViewModel.kt diff --git a/app/src/main/java/com/example/lexilearn/MainActivity.kt b/app/src/main/java/com/example/lexilearn/MainActivity.kt index b0c366f..3a88de8 100644 --- a/app/src/main/java/com/example/lexilearn/MainActivity.kt +++ b/app/src/main/java/com/example/lexilearn/MainActivity.kt @@ -90,7 +90,7 @@ fun MyApp() { composable("spell") { SpellScreen(navController) } composable("write") { WriteScreen(navController) } composable("screening") { ScreeningScreen(navController) } - composable("resultscreening") { ResultScreeningScreen(navController) } +// composable("resultscreening") { ResultScreeningScreen(navController) } composable("learnAlphabet") { LearnAlphabetScreen(navController) } composable("learnNumber") { LearnNumberScreen(navController) } // composable( diff --git a/app/src/main/java/com/example/lexilearn/ui/views/pHome/HomeViewModel.kt b/app/src/main/java/com/example/lexilearn/ui/views/pHome/HomeViewModel.kt index b902430..5446e43 100644 --- a/app/src/main/java/com/example/lexilearn/ui/views/pHome/HomeViewModel.kt +++ b/app/src/main/java/com/example/lexilearn/ui/views/pHome/HomeViewModel.kt @@ -16,7 +16,7 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) { fun prepareCompetitionQuiz(callback: (List) -> Unit) { _materialRepository.getAllMaterialData("all") { materials -> - _quizRepository.getRandomMaterials(10, materials) { randomData -> + _quizRepository.getRandomMaterials(3, materials) { randomData -> randomData.forEach { println(it) } callback(randomData) } diff --git a/app/src/main/java/com/example/lexilearn/ui/views/pResultScreening/ResultScreeningScreen.kt b/app/src/main/java/com/example/lexilearn/ui/views/pResultScreening/ResultScreeningScreen.kt index 805dbbb..3bcbd06 100644 --- a/app/src/main/java/com/example/lexilearn/ui/views/pResultScreening/ResultScreeningScreen.kt +++ b/app/src/main/java/com/example/lexilearn/ui/views/pResultScreening/ResultScreeningScreen.kt @@ -38,9 +38,10 @@ import com.example.lexilearn.ui.components.CustomButton import com.example.lexilearn.ui.theme.cprimary import com.example.lexilearn.ui.theme.ctextBlack import com.example.lexilearn.ui.theme.cwhite +import com.example.lexilearn.ui.views.pScreening.ScreeningViewModel @Composable -fun ResultScreeningScreen(navController: NavController) { +fun ResultScreeningScreen(navController: NavController, totalScore: Int, viewModel: ScreeningViewModel) { GradientScreening( backButton = { navController.popBackStack() }, headerText = stringResource(id = R.string.rescreentitle), diff --git a/app/src/main/java/com/example/lexilearn/ui/views/pResultScreening/ResultScreeningViewModel.kt b/app/src/main/java/com/example/lexilearn/ui/views/pResultScreening/ResultScreeningViewModel.kt new file mode 100644 index 0000000..73bfb45 --- /dev/null +++ b/app/src/main/java/com/example/lexilearn/ui/views/pResultScreening/ResultScreeningViewModel.kt @@ -0,0 +1,8 @@ +package com.example.lexilearn.ui.views.pResultScreening + +import android.app.Application +import androidx.lifecycle.AndroidViewModel + +class ResultScreeningViewModel(application: Application) : AndroidViewModel(application) { + +} \ No newline at end of file