Merge branch 'master' of https://codefirst.iut.uca.fr/git/WhatTheFantasy/WF-Android

What_The_Fantasy/app/build.gradle.kts

@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace = "com.example.what_the_fantasy"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.example.what_the_fantasy"
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
 
@@ -59,6 +59,8 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.navigation.common.android)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/AccueilPage.kt

@@ -0,0 +1,6 @@
+package com.example.what_the_fantasy
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun AccueilPage() {}

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/FavoritePage.kt

@@ -0,0 +1,11 @@
+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() {}

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/LoginPage.kt

@@ -0,0 +1,13 @@
+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() {
+}

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/MainActivity.kt

@@ -12,6 +12,7 @@ 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
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -19,28 +20,8 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             What_The_FantasyTheme {
-                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
+                LoginPage()
-                    Title(
-                        title = "What The Fantasy",
-                        modifier = Modifier.padding(innerPadding)
-                    )
             }
         }
     }
-    }
-}
-
-@Composable
-fun Title(title: String, modifier: Modifier = Modifier) {
-    Text(
-        text = "Welcome to $title!",
-        modifier = modifier
-    )
-}
-
-@Composable
-fun GreetingPreview() {
-    What_The_FantasyTheme {
-        Title("What the fantasy")
-    }
 }

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ProfilPage.kt

@@ -0,0 +1,17 @@
+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() {}

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/QuizPage.kt

@@ -0,0 +1,11 @@
+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() {}

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/QuotePage.kt

@@ -0,0 +1,11 @@
+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() {}

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/SearchPage.kt

@@ -0,0 +1,11 @@
+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() {}

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/SignUpPage.kt

@@ -0,0 +1,11 @@
+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() {}

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/SubmitQuotePage.kt

@@ -0,0 +1,11 @@
+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() {}

What_The_Fantasy/gradle/libs.versions.toml

@@ -8,6 +8,8 @@ espressoCore = "3.5.1"
 lifecycleRuntimeKtx = "2.6.1"
 activityCompose = "1.8.0"
 composeBom = "2024.04.01"
+navigationCompose = "2.8.6"
+navigationCommonAndroid = "2.9.0-alpha05"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -24,6 +26,8 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin
 androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
+androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
+androidx-navigation-common-android = { group = "androidx.navigation", name = "navigation-common-android", version.ref = "navigationCommonAndroid" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }