From d11da40f0dd5a99d7c7ea47cb57d67850874fe66 Mon Sep 17 00:00:00 2001 From: visoulier Date: Tue, 12 Mar 2024 10:26:36 +0100 Subject: [PATCH] package rename --- .../sciencequest/ExampleInstrumentedTest.kt | 2 +- ScienceQuest/app/src/main/AndroidManifest.xml | 7 +-- .../com/example/sciencequest/MainActivity.kt | 45 ------------------- .../example/sciencequest/view/HomeScreen.kt | 22 --------- .../java/fr/iut/sciencequest/MainActivity.kt | 28 ++++++++++++ .../iut}/sciencequest/navigation/NavHost.kt | 6 +-- .../iut}/sciencequest/ui/theme/Color.kt | 2 +- .../iut}/sciencequest/ui/theme/Theme.kt | 2 +- .../iut}/sciencequest/ui/theme/Type.kt | 2 +- .../iut}/sciencequest/view/AccountScreen.kt | 2 +- .../fr/iut/sciencequest/view/HomeScreen.kt | 14 ++++++ .../iut}/sciencequest/view/TopBar.kt | 2 +- .../iut}/sciencequest/ExampleUnitTest.kt | 2 +- 13 files changed, 53 insertions(+), 83 deletions(-) rename ScienceQuest/app/src/androidTest/java/{com/example => fr/iut}/sciencequest/ExampleInstrumentedTest.kt (94%) delete mode 100644 ScienceQuest/app/src/main/java/com/example/sciencequest/MainActivity.kt delete mode 100644 ScienceQuest/app/src/main/java/com/example/sciencequest/view/HomeScreen.kt create mode 100644 ScienceQuest/app/src/main/java/fr/iut/sciencequest/MainActivity.kt rename ScienceQuest/app/src/main/java/{com/example => fr/iut}/sciencequest/navigation/NavHost.kt (87%) rename ScienceQuest/app/src/main/java/{com/example => fr/iut}/sciencequest/ui/theme/Color.kt (75%) rename ScienceQuest/app/src/main/java/{com/example => fr/iut}/sciencequest/ui/theme/Theme.kt (98%) rename ScienceQuest/app/src/main/java/{com/example => fr/iut}/sciencequest/ui/theme/Type.kt (95%) rename ScienceQuest/app/src/main/java/{com/example => fr/iut}/sciencequest/view/AccountScreen.kt (91%) create mode 100644 ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt rename ScienceQuest/app/src/main/java/{com/example => fr/iut}/sciencequest/view/TopBar.kt (96%) rename ScienceQuest/app/src/test/java/{com/example => fr/iut}/sciencequest/ExampleUnitTest.kt (90%) diff --git a/ScienceQuest/app/src/androidTest/java/com/example/sciencequest/ExampleInstrumentedTest.kt b/ScienceQuest/app/src/androidTest/java/fr/iut/sciencequest/ExampleInstrumentedTest.kt similarity index 94% rename from ScienceQuest/app/src/androidTest/java/com/example/sciencequest/ExampleInstrumentedTest.kt rename to ScienceQuest/app/src/androidTest/java/fr/iut/sciencequest/ExampleInstrumentedTest.kt index b0097e8..7215144 100644 --- a/ScienceQuest/app/src/androidTest/java/com/example/sciencequest/ExampleInstrumentedTest.kt +++ b/ScienceQuest/app/src/androidTest/java/fr/iut/sciencequest/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.example.sciencequest +package fr.iut.sciencequest import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/ScienceQuest/app/src/main/AndroidManifest.xml b/ScienceQuest/app/src/main/AndroidManifest.xml index 92567a3..2d56d98 100644 --- a/ScienceQuest/app/src/main/AndroidManifest.xml +++ b/ScienceQuest/app/src/main/AndroidManifest.xml @@ -13,12 +13,7 @@ android:theme="@style/Theme.ScienceQuest" tools:targetApi="31"> - diff --git a/ScienceQuest/app/src/main/java/com/example/sciencequest/MainActivity.kt b/ScienceQuest/app/src/main/java/com/example/sciencequest/MainActivity.kt deleted file mode 100644 index 5a06ca5..0000000 --- a/ScienceQuest/app/src/main/java/com/example/sciencequest/MainActivity.kt +++ /dev/null @@ -1,45 +0,0 @@ -package com.example.sciencequest - -import android.os.Bundle -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.compose.foundation.Image -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.size -import androidx.compose.material3.CenterAlignedTopAppBar -import androidx.compose.material3.FilledIconButton -import androidx.compose.material3.FloatingActionButton -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Surface -import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.Dp -import com.example.sciencequest.navigation.NavHost -import com.example.sciencequest.ui.theme.ScienceQuestTheme - -class MainActivity : ComponentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContent { - ScienceQuestTheme { - // A surface container using the 'background' color from the theme - Surface( - modifier = Modifier.fillMaxSize(), - color = MaterialTheme.colorScheme.background - ) { - NavHost() - } - } - } - } -} \ No newline at end of file diff --git a/ScienceQuest/app/src/main/java/com/example/sciencequest/view/HomeScreen.kt b/ScienceQuest/app/src/main/java/com/example/sciencequest/view/HomeScreen.kt deleted file mode 100644 index b8fb32e..0000000 --- a/ScienceQuest/app/src/main/java/com/example/sciencequest/view/HomeScreen.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.sciencequest.view - -import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Row -import androidx.compose.material3.FilledIconButton -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.res.painterResource -import com.example.sciencequest.R - -@Composable -fun HomeScreen(goToHome: () -> Unit, goToAccount: () -> Unit) { - topBar(goToAccount, goToHome) - mainContent() -} - -@Composable -fun mainContent() { - -} \ No newline at end of file diff --git a/ScienceQuest/app/src/main/java/fr/iut/sciencequest/MainActivity.kt b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/MainActivity.kt new file mode 100644 index 0000000..bd86650 --- /dev/null +++ b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/MainActivity.kt @@ -0,0 +1,28 @@ +package fr.iut.sciencequest + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +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.navigation.NavHost +import fr.iut.sciencequest.ui.theme.ScienceQuestTheme + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + ScienceQuestTheme { + // A surface container using the 'background' color from the theme + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + NavHost() + } + } + } + } +} \ No newline at end of file diff --git a/ScienceQuest/app/src/main/java/com/example/sciencequest/navigation/NavHost.kt b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/navigation/NavHost.kt similarity index 87% rename from ScienceQuest/app/src/main/java/com/example/sciencequest/navigation/NavHost.kt rename to ScienceQuest/app/src/main/java/fr/iut/sciencequest/navigation/NavHost.kt index 3f2e077..e0381ee 100644 --- a/ScienceQuest/app/src/main/java/com/example/sciencequest/navigation/NavHost.kt +++ b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/navigation/NavHost.kt @@ -1,4 +1,4 @@ -package com.example.sciencequest.navigation +package fr.iut.sciencequest.navigation import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable @@ -6,8 +6,8 @@ import androidx.compose.ui.Modifier import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import com.example.sciencequest.view.AccountScreen -import com.example.sciencequest.view.HomeScreen +import fr.iut.sciencequest.view.AccountScreen +import fr.iut.sciencequest.view.HomeScreen @Composable diff --git a/ScienceQuest/app/src/main/java/com/example/sciencequest/ui/theme/Color.kt b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/ui/theme/Color.kt similarity index 75% rename from ScienceQuest/app/src/main/java/com/example/sciencequest/ui/theme/Color.kt rename to ScienceQuest/app/src/main/java/fr/iut/sciencequest/ui/theme/Color.kt index 7386113..339eab8 100644 --- a/ScienceQuest/app/src/main/java/com/example/sciencequest/ui/theme/Color.kt +++ b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package com.example.sciencequest.ui.theme +package fr.iut.sciencequest.ui.theme import androidx.compose.ui.graphics.Color diff --git a/ScienceQuest/app/src/main/java/com/example/sciencequest/ui/theme/Theme.kt b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/ui/theme/Theme.kt similarity index 98% rename from ScienceQuest/app/src/main/java/com/example/sciencequest/ui/theme/Theme.kt rename to ScienceQuest/app/src/main/java/fr/iut/sciencequest/ui/theme/Theme.kt index a64fbba..9610f88 100644 --- a/ScienceQuest/app/src/main/java/com/example/sciencequest/ui/theme/Theme.kt +++ b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.example.sciencequest.ui.theme +package fr.iut.sciencequest.ui.theme import android.app.Activity import android.os.Build diff --git a/ScienceQuest/app/src/main/java/com/example/sciencequest/ui/theme/Type.kt b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/ui/theme/Type.kt similarity index 95% rename from ScienceQuest/app/src/main/java/com/example/sciencequest/ui/theme/Type.kt rename to ScienceQuest/app/src/main/java/fr/iut/sciencequest/ui/theme/Type.kt index 83cd31c..a411867 100644 --- a/ScienceQuest/app/src/main/java/com/example/sciencequest/ui/theme/Type.kt +++ b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package com.example.sciencequest.ui.theme +package fr.iut.sciencequest.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/ScienceQuest/app/src/main/java/com/example/sciencequest/view/AccountScreen.kt b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/AccountScreen.kt similarity index 91% rename from ScienceQuest/app/src/main/java/com/example/sciencequest/view/AccountScreen.kt rename to ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/AccountScreen.kt index eef75d3..fc30a6b 100644 --- a/ScienceQuest/app/src/main/java/com/example/sciencequest/view/AccountScreen.kt +++ b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/AccountScreen.kt @@ -1,4 +1,4 @@ -package com.example.sciencequest.view +package fr.iut.sciencequest.view import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth diff --git a/ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt new file mode 100644 index 0000000..229973c --- /dev/null +++ b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt @@ -0,0 +1,14 @@ +package fr.iut.sciencequest.view + +import androidx.compose.runtime.Composable + +@Composable +fun HomeScreen(goToHome: () -> Unit, goToAccount: () -> Unit) { + topBar(goToAccount, goToHome) + mainContent() +} + +@Composable +fun mainContent() { + +} \ No newline at end of file diff --git a/ScienceQuest/app/src/main/java/com/example/sciencequest/view/TopBar.kt b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/TopBar.kt similarity index 96% rename from ScienceQuest/app/src/main/java/com/example/sciencequest/view/TopBar.kt rename to ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/TopBar.kt index ed7ec6c..13d479f 100644 --- a/ScienceQuest/app/src/main/java/com/example/sciencequest/view/TopBar.kt +++ b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/TopBar.kt @@ -1,4 +1,4 @@ -package com.example.sciencequest.view +package fr.iut.sciencequest.view import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement diff --git a/ScienceQuest/app/src/test/java/com/example/sciencequest/ExampleUnitTest.kt b/ScienceQuest/app/src/test/java/fr/iut/sciencequest/ExampleUnitTest.kt similarity index 90% rename from ScienceQuest/app/src/test/java/com/example/sciencequest/ExampleUnitTest.kt rename to ScienceQuest/app/src/test/java/fr/iut/sciencequest/ExampleUnitTest.kt index 9b4d7ed..9ef6d34 100644 --- a/ScienceQuest/app/src/test/java/com/example/sciencequest/ExampleUnitTest.kt +++ b/ScienceQuest/app/src/test/java/fr/iut/sciencequest/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.example.sciencequest +package fr.iut.sciencequest import org.junit.Test