From 9462b539ea1668aee7cf2aa83e9f40083b61c7f8 Mon Sep 17 00:00:00 2001 From: Renaud BEURET Date: Tue, 2 Apr 2024 16:17:47 +0200 Subject: [PATCH] [FIX] Refactor factory --- .../app/src/main/java/fr/iut/sciencequest/view/games/Kahoot.kt | 2 +- .../app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt | 2 +- .../sciencequest/view/scientifiques/ScientifiqueListeScreen.kt | 2 +- .../main/java/fr/iut/sciencequest/viewModels/KahootViewModel.kt | 2 +- .../main/java/fr/iut/sciencequest/viewModels/PenduViewModel.kt | 2 +- .../fr/iut/sciencequest/viewModels/ScientifiquesDecouvertsVM.kt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/src/main/java/fr/iut/sciencequest/view/games/Kahoot.kt b/android/app/src/main/java/fr/iut/sciencequest/view/games/Kahoot.kt index 7158e3c..22a2ba3 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/view/games/Kahoot.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/view/games/Kahoot.kt @@ -29,7 +29,7 @@ import fr.iut.sciencequest.stub.StubQuestionWithReponses import fr.iut.sciencequest.view.TopBar @Composable -fun KahootScreen(viewModel: KahootViewModel = viewModel(factory = KahootViewModel.Factory), +fun KahootScreen(viewModel: KahootViewModel = viewModel(factory = KahootViewModel.ApiFactory), goToAccount: () -> Unit, goToHome: () -> Unit) { val state = viewModel.uiState.collectAsState() diff --git a/android/app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt b/android/app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt index 701e659..eb21bf8 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt @@ -23,7 +23,7 @@ import fr.iut.sciencequest.viewModels.PenduViewModel import fr.iut.sciencequest.view.TopBar @Composable -fun PenduScreen(viewModel: PenduViewModel = viewModel(factory = PenduViewModel.Factory), +fun PenduScreen(viewModel: PenduViewModel = viewModel(factory = PenduViewModel.ApiFactory), goToAccount: () -> Unit, goToHome: () -> Unit) { val state = viewModel.uiState.collectAsState() diff --git a/android/app/src/main/java/fr/iut/sciencequest/view/scientifiques/ScientifiqueListeScreen.kt b/android/app/src/main/java/fr/iut/sciencequest/view/scientifiques/ScientifiqueListeScreen.kt index 00928fb..3f8ceb4 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/view/scientifiques/ScientifiqueListeScreen.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/view/scientifiques/ScientifiqueListeScreen.kt @@ -12,7 +12,7 @@ import fr.iut.sciencequest.viewModels.ScientifiquesDecouvertsVM import fr.iut.sciencequest.view.TopBar @Composable -fun scientifiqueListeScreen(viewModel: ScientifiquesDecouvertsVM = viewModel(factory = ScientifiquesDecouvertsVM.Factory), +fun scientifiqueListeScreen(viewModel: ScientifiquesDecouvertsVM = viewModel(factory = ScientifiquesDecouvertsVM.ApiFactory), goToAccount: () -> Unit, goToHome: () -> Unit) { val liste by viewModel.listeScientifique.collectAsState() diff --git a/android/app/src/main/java/fr/iut/sciencequest/viewModels/KahootViewModel.kt b/android/app/src/main/java/fr/iut/sciencequest/viewModels/KahootViewModel.kt index 9d867ea..0e534f0 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/viewModels/KahootViewModel.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/viewModels/KahootViewModel.kt @@ -58,7 +58,7 @@ class KahootViewModel( } companion object { - val Factory: ViewModelProvider.Factory = object : ViewModelProvider.Factory { + val ApiFactory: ViewModelProvider.Factory = object : ViewModelProvider.Factory { @Suppress("UNCHECKED_CAST") override fun create( modelClass: Class diff --git a/android/app/src/main/java/fr/iut/sciencequest/viewModels/PenduViewModel.kt b/android/app/src/main/java/fr/iut/sciencequest/viewModels/PenduViewModel.kt index 9b859c8..9316e4f 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/viewModels/PenduViewModel.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/viewModels/PenduViewModel.kt @@ -86,7 +86,7 @@ class PenduViewModel( } companion object { - val Factory: ViewModelProvider.Factory = object : ViewModelProvider.Factory { + val ApiFactory: ViewModelProvider.Factory = object : ViewModelProvider.Factory { @Suppress("UNCHECKED_CAST") override fun create( modelClass: Class diff --git a/android/app/src/main/java/fr/iut/sciencequest/viewModels/ScientifiquesDecouvertsVM.kt b/android/app/src/main/java/fr/iut/sciencequest/viewModels/ScientifiquesDecouvertsVM.kt index ef1648f..1521430 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/viewModels/ScientifiquesDecouvertsVM.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/viewModels/ScientifiquesDecouvertsVM.kt @@ -26,7 +26,7 @@ class ScientifiquesDecouvertsVM( } companion object { - val Factory: ViewModelProvider.Factory = object : ViewModelProvider.Factory { + val ApiFactory: ViewModelProvider.Factory = object : ViewModelProvider.Factory { @Suppress("UNCHECKED_CAST") override fun create( modelClass: Class