From a6d8eb26a90cef80b1b2f0efd87a32aa2b0340de Mon Sep 17 00:00:00 2001
From: visoulier <victor.soulier@etu.uca.fr>
Date: Tue, 12 Mar 2024 10:58:16 +0100
Subject: [PATCH] fix package name

---
 ScienceQuest/.idea/.gitignore                               | 3 ---
 ScienceQuest/.idea/gradle.xml                               | 1 -
 ScienceQuest/.idea/misc.xml                                 | 1 +
 ScienceQuest/app/build.gradle.kts                           | 6 +++---
 .../java/fr/iut/sciencequest/ExampleInstrumentedTest.kt     | 2 +-
 .../app/src/main/java/fr/iut/sciencequest/view/TopBar.kt    | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 ScienceQuest/.idea/.gitignore

diff --git a/ScienceQuest/.idea/.gitignore b/ScienceQuest/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/ScienceQuest/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/ScienceQuest/.idea/gradle.xml b/ScienceQuest/.idea/gradle.xml
index 0897082..32522c1 100644
--- a/ScienceQuest/.idea/gradle.xml
+++ b/ScienceQuest/.idea/gradle.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/ScienceQuest/.idea/misc.xml b/ScienceQuest/.idea/misc.xml
index 8978d23..0ad17cb 100644
--- a/ScienceQuest/.idea/misc.xml
+++ b/ScienceQuest/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
diff --git a/ScienceQuest/app/build.gradle.kts b/ScienceQuest/app/build.gradle.kts
index a72c194..7572095 100644
--- a/ScienceQuest/app/build.gradle.kts
+++ b/ScienceQuest/app/build.gradle.kts
@@ -1,14 +1,14 @@
 plugins {
-    id("com.android.application")
+    id("fr.iut.application")
     id("org.jetbrains.kotlin.android")
 }
 
 android {
-    namespace = "com.example.sciencequest"
+    namespace = "fr.iut.sciencequest"
     compileSdk = 34
 
     defaultConfig {
-        applicationId = "com.example.sciencequest"
+        applicationId = "fr.iut.sciencequest"
         minSdk = 21
         targetSdk = 34
         versionCode = 1
diff --git a/ScienceQuest/app/src/androidTest/java/fr/iut/sciencequest/ExampleInstrumentedTest.kt b/ScienceQuest/app/src/androidTest/java/fr/iut/sciencequest/ExampleInstrumentedTest.kt
index 7215144..20a68e8 100644
--- a/ScienceQuest/app/src/androidTest/java/fr/iut/sciencequest/ExampleInstrumentedTest.kt
+++ b/ScienceQuest/app/src/androidTest/java/fr/iut/sciencequest/ExampleInstrumentedTest.kt
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.example.sciencequest", appContext.packageName)
+        assertEquals("fr.iut.sciencequest", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/TopBar.kt b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/TopBar.kt
index 13d479f..919bdd2 100644
--- a/ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/TopBar.kt
+++ b/ScienceQuest/app/src/main/java/fr/iut/sciencequest/view/TopBar.kt
@@ -10,7 +10,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
-import com.example.sciencequest.R
+import fr.iut.sciencequest.R
 
 @Composable
 fun topBar(goToAccount: () -> Unit, goToHome: () -> Unit, modifier: Modifier? = Modifier.fillMaxWidth()) {