Réorganisation selon MVVM

3 months ago · 6e495991d4
parent 3cd3e3dcd5
commit 6e495991d4
28 changed files with 76 additions and 118 deletions
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/AccueilPage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/AccueilPage.kt
@ -1,6 +0,0 @@
-package com.example.what_the_fantasy
-
-import androidx.compose.runtime.Composable
-
-@Composable
-fun AccueilPage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/FavoritePage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/FavoritePage.kt
@ -1,11 +0,0 @@
-package com.example.what_the_fantasy
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.compose.runtime.Composable
-import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme
-
-@Composable
-fun FavoritePage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/LoginPage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/LoginPage.kt
@ -1,13 +0,0 @@
-package com.example.what_the_fantasy
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme
-
-@Composable
-fun LoginPage() {
-}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/MainActivity.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/MainActivity.kt
@ -4,15 +4,8 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
 import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme
-import com.example.what_the_fantasy.LoginPage
+import com.example.what_the_fantasy.ui.screens.LoginPage

 class MainActivity : ComponentActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ProfilPage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ProfilPage.kt
@ -1,17 +0,0 @@
-package com.example.what_the_fantasy
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme
-
-@Composable
-fun ProfilPage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/QuizPage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/QuizPage.kt
@ -1,11 +0,0 @@
-package com.example.what_the_fantasy
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.compose.runtime.Composable
-import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme
-
-@Composable
-fun QuizPage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/QuotePage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/QuotePage.kt
@ -1,11 +0,0 @@
-package com.example.what_the_fantasy
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.compose.runtime.Composable
-import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme
-
-@Composable
-fun QuotePage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/SearchPage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/SearchPage.kt
@ -1,11 +0,0 @@
-package com.example.what_the_fantasy
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.compose.runtime.Composable
-import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme
-
-@Composable
-fun SearchPage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/SignUpPage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/SignUpPage.kt
@ -1,11 +0,0 @@
-package com.example.what_the_fantasy
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.compose.runtime.Composable
-import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme
-
-@Composable
-fun SignUpPage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/SubmitQuotePage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/SubmitQuotePage.kt
@ -1,11 +0,0 @@
-package com.example.what_the_fantasy
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.compose.runtime.Composable
-import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme
-
-@Composable
-fun SubmitQuotePage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/local/CharacterStub.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/local/CharacterStub.kt
@ -1,4 +1,6 @@
-package com.example.what_the_fantasy.data
+package com.example.what_the_fantasy.data.local
+
+import com.example.what_the_fantasy.data.model.Character

 object CharacterStub {
    private val aragorn = Character(
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/local/ImageStub.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/local/ImageStub.kt
@ -1,4 +1,6 @@
-package com.example.what_the_fantasy.data
+package com.example.what_the_fantasy.data.local
+
+import com.example.what_the_fantasy.data.model.Image

 object ImageStub {
    private val imageAragorn = Image(
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/local/QuoteStub.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/local/QuoteStub.kt
@ -1,4 +1,6 @@
-package com.example.what_the_fantasy.data
+package com.example.what_the_fantasy.data.local
+
+import com.example.what_the_fantasy.data.model.Quote

 object QuoteStub {
    private val quoteAragorn1 = Quote(
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/local/SourceStub.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/local/SourceStub.kt
@ -1,4 +1,6 @@
-package com.example.what_the_fantasy.data
+package com.example.what_the_fantasy.data.local
+
+import com.example.what_the_fantasy.data.model.Source

 object SourceStub {
    private val sourceLOTR = Source(
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/model/Character.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/model/Character.kt
@ -1,4 +1,4 @@
-package com.example.what_the_fantasy.data
+package com.example.what_the_fantasy.data.model

 data class Character (
    val id: Int,
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/model/Image.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/model/Image.kt
@ -1,4 +1,4 @@
-package com.example.what_the_fantasy.data
+package com.example.what_the_fantasy.data.model

 data class Image(
    val id: Int,
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/model/Quote.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/model/Quote.kt
@ -1,4 +1,4 @@
-package com.example.what_the_fantasy.data
+package com.example.what_the_fantasy.data.model

 data class Quote (
    val id: Int,
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/model/Source.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/model/Source.kt
@ -1,4 +1,4 @@
-package com.example.what_the_fantasy.data
+package com.example.what_the_fantasy.data.model

 data class Source (
    val id: Int,
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/components/NavBar.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/components/NavBar.kt
@ -0,0 +1,4 @@
+package com.example.what_the_fantasy.ui.components
+
+class NavBar {
+}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/AccueilPage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/AccueilPage.kt
@ -0,0 +1,6 @@
+package com.example.what_the_fantasy.ui.screens
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun AccueilPage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/FavoritePage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/FavoritePage.kt
@ -0,0 +1,6 @@
+package com.example.what_the_fantasy.ui.screens
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun FavoritePage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/LoginPage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/LoginPage.kt
@ -0,0 +1,7 @@
+package com.example.what_the_fantasy.ui.screens
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun LoginPage() {
+}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/ProfilPage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/ProfilPage.kt
@ -0,0 +1,6 @@
+package com.example.what_the_fantasy.ui.screens
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun ProfilPage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/QuizPage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/QuizPage.kt
@ -0,0 +1,6 @@
+package com.example.what_the_fantasy.ui.screens
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun QuizPage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/QuotePage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/QuotePage.kt
@ -0,0 +1,6 @@
+package com.example.what_the_fantasy.ui.screens
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun QuotePage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/SearchPage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/SearchPage.kt
@ -0,0 +1,6 @@
+package com.example.what_the_fantasy.ui.screens
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun SearchPage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/SignUpPage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/SignUpPage.kt
@ -0,0 +1,6 @@
+package com.example.what_the_fantasy.ui.screens
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun SignUpPage() {}
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/SubmitQuotePage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/SubmitQuotePage.kt
@ -0,0 +1,6 @@
+package com.example.what_the_fantasy.ui.screens
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun SubmitQuotePage() {}