alix.jeudi--lemoine
/
ScienceQuest
forked from tom.biard/ScienceQuest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] Nom package pour respecter conventions de nommage

Browse Source
RepositoryAndroid
Renaud BEURET 1 year ago
parent b22cee99e9
commit 6d038ffe30
15 changed files with 16 additions and 41 deletions
Show Stats Download Patch File Download Diff File

5
android/app/src/main/java/fr/iut/sciencequest/MainActivity.kt
Unescape View File

@ -1,18 +1,13 @@
package fr.iut.sciencequest
import android.os.Bundle
import android.util.Log
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.viewModels
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.ui.Modifier
import fr.iut.sciencequest.ViewModels.ScientifiquesDecouvertsVM
import fr.iut.sciencequest.model.dto.extensions.ToModel
import fr.iut.sciencequest.navigation.NavHost
import fr.iut.sciencequest.stub.StubScientifique1
import fr.iut.sciencequest.ui.theme.ScienceQuestTheme
class MainActivity : ComponentActivity() {

7
android/app/src/main/java/fr/iut/sciencequest/navigation/NavHost.kt
Unescape View File

@ -1,18 +1,11 @@
package fr.iut.sciencequest.navigation
import android.content.Context
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import fr.iut.sciencequest.ViewModels.KahootViewModel
import fr.iut.sciencequest.ViewModels.PenduViewModel
import fr.iut.sciencequest.ViewModels.ScientifiquesDecouvertsVM
import fr.iut.sciencequest.stub.StubQuestionWithReponses
import fr.iut.sciencequest.view.AccountScreen
import fr.iut.sciencequest.view.HomeScreen
import fr.iut.sciencequest.view.LoginScreen

2
android/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt
Unescape View File

@ -14,8 +14,6 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.viewmodel.compose.viewModel
import fr.iut.sciencequest.ViewModels.KahootViewModel
@Composable
fun HomeScreen(goToHome: () -> Unit,

2
android/app/src/main/java/fr/iut/sciencequest/view/Login.kt
Unescape View File

@ -26,7 +26,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import fr.iut.sciencequest.R
import fr.iut.sciencequest.ViewModels.LoginViewModel
import fr.iut.sciencequest.viewModels.LoginViewModel
@Composable
fun LoginScreen(viewModel: LoginViewModel = viewModel(),

5
android/app/src/main/java/fr/iut/sciencequest/view/games/Kahoot.kt
Unescape View File

@ -21,15 +21,12 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import fr.iut.sciencequest.R
import fr.iut.sciencequest.ViewModels.KahootViewModel
import fr.iut.sciencequest.viewModels.KahootViewModel
import fr.iut.sciencequest.model.dto.extensions.ToModel
import fr.iut.sciencequest.model.dto.question.QuestionWithSimpleResponseDTO
import fr.iut.sciencequest.model.dto.reponse.ReponseSimpleDTO
import fr.iut.sciencequest.model.metier.question.QuestionWithSimpleReponse
import fr.iut.sciencequest.model.metier.reponse.ReponseSimple
import fr.iut.sciencequest.stub.StubQuestionWithReponses
import fr.iut.sciencequest.view.TopBar
import java.util.Timer
@Composable
fun KahootScreen(viewModel: KahootViewModel = viewModel(factory = KahootViewModel.Factory),

2
android/app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt
Unescape View File

@ -19,7 +19,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import fr.iut.sciencequest.R
import fr.iut.sciencequest.ViewModels.PenduViewModel
import fr.iut.sciencequest.viewModels.PenduViewModel
import fr.iut.sciencequest.view.TopBar
@Composable

7
android/app/src/main/java/fr/iut/sciencequest/view/scientifiques/ScientifiqueListeScreen.kt
Unescape View File

@ -1,19 +1,14 @@
package fr.iut.sciencequest.view.scientifiques
import android.util.Log
import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.lifecycle.viewmodel.compose.viewModel
import fr.iut.sciencequest.R
import fr.iut.sciencequest.ViewModels.ScientifiquesDecouvertsVM
import fr.iut.sciencequest.model.dto.extensions.ToModel
import fr.iut.sciencequest.model.metier.Scientifique
import fr.iut.sciencequest.stub.getScientifiqueListeStub
import fr.iut.sciencequest.viewModels.ScientifiquesDecouvertsVM
import fr.iut.sciencequest.view.TopBar
@Composable

4
android/app/src/main/java/fr/iut/sciencequest/ViewModels/KahootViewModel.kt → android/app/src/main/java/fr/iut/sciencequest/viewModels/KahootViewModel.kt
Unescape View File

@ -1,4 +1,4 @@
package fr.iut.sciencequest.ViewModels
package fr.iut.sciencequest.viewModels
import android.os.Handler
import android.os.Looper
@ -6,7 +6,7 @@ import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewModelScope
import fr.iut.sciencequest.ViewModels.UiStates.KahootUIState
import fr.iut.sciencequest.viewModels.uiStates.KahootUIState
import fr.iut.sciencequest.model.repositories.question.IQuestionRepository
import fr.iut.sciencequest.model.repositories.question.QuestionAPIRepository
import kotlinx.coroutines.flow.MutableStateFlow

4
android/app/src/main/java/fr/iut/sciencequest/ViewModels/LoginViewModel.kt → android/app/src/main/java/fr/iut/sciencequest/viewModels/LoginViewModel.kt
Unescape View File

@ -1,7 +1,7 @@
package fr.iut.sciencequest.ViewModels
package fr.iut.sciencequest.viewModels
import androidx.lifecycle.ViewModel
import fr.iut.sciencequest.ViewModels.UiStates.LoginUIState
import fr.iut.sciencequest.viewModels.uiStates.LoginUIState
import kotlinx.coroutines.flow.MutableStateFlow
class LoginViewModel: ViewModel() {

5
android/app/src/main/java/fr/iut/sciencequest/ViewModels/PenduViewModel.kt → android/app/src/main/java/fr/iut/sciencequest/viewModels/PenduViewModel.kt
Unescape View File

@ -1,11 +1,10 @@
package fr.iut.sciencequest.ViewModels
package fr.iut.sciencequest.viewModels
import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewModelScope
import fr.iut.sciencequest.ViewModels.UiStates.PenduUIState
import fr.iut.sciencequest.model.dto.extensions.ToModel
import fr.iut.sciencequest.viewModels.uiStates.PenduUIState
import fr.iut.sciencequest.model.repositories.scientifique.IScientifiqueRepository
import fr.iut.sciencequest.model.repositories.scientifique.ScientifiqueAPIRepository
import kotlinx.coroutines.flow.MutableStateFlow

4
android/app/src/main/java/fr/iut/sciencequest/ViewModels/ScientifiquesDecouvertsVM.kt → android/app/src/main/java/fr/iut/sciencequest/viewModels/ScientifiquesDecouvertsVM.kt
Unescape View File

@ -1,10 +1,10 @@
package fr.iut.sciencequest.ViewModels
package fr.iut.sciencequest.viewModels
import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewModelScope
import fr.iut.sciencequest.ViewModels.UiStates.ScientifiqueDecouvertsUIState
import fr.iut.sciencequest.viewModels.uiStates.ScientifiqueDecouvertsUIState
import fr.iut.sciencequest.model.repositories.scientifique.IScientifiqueRepository
import fr.iut.sciencequest.model.repositories.scientifique.ScientifiqueAPIRepository
import kotlinx.coroutines.flow.MutableStateFlow

4
android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/KahootUIState.kt → android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/KahootUIState.kt
Unescape View File

@ -1,8 +1,6 @@
package fr.iut.sciencequest.ViewModels.UiStates
package fr.iut.sciencequest.viewModels.uiStates
import fr.iut.sciencequest.model.dto.extensions.ToModel
import fr.iut.sciencequest.model.dto.question.QuestionWithSimpleResponseDTO
import fr.iut.sciencequest.model.dto.reponse.ReponseSimpleDTO
import fr.iut.sciencequest.model.metier.question.QuestionWithSimpleReponse
import fr.iut.sciencequest.stub.StubQuestionWithReponses

2
android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/LoginUIState.kt → android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/LoginUIState.kt
Unescape View File

@ -1,4 +1,4 @@
package fr.iut.sciencequest.ViewModels.UiStates
package fr.iut.sciencequest.viewModels.uiStates
data class LoginUIState (
val pseudo: String = "Pseudo",

2
android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/PenduUIState.kt → android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/PenduUIState.kt
Unescape View File

@ -1,4 +1,4 @@
package fr.iut.sciencequest.ViewModels.UiStates
package fr.iut.sciencequest.viewModels.uiStates
data class PenduUIState(
val isWon: Boolean = false,

2
android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/ScientifiqueDecouvertsUIState.kt → android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/ScientifiqueDecouvertsUIState.kt
Unescape View File

@ -1,4 +1,4 @@
package fr.iut.sciencequest.ViewModels.UiStates
package fr.iut.sciencequest.viewModels.uiStates
import fr.iut.sciencequest.model.metier.Scientifique
Write Preview
Loading…
Cancel
Save