From 984c6c31b797f5a3b79291700f55f1c58a7eeff7 Mon Sep 17 00:00:00 2001
From: "arthur.valin" <arthur.valin@etu.uca.fr>
Date: Fri, 3 Mar 2023 16:45:52 +0100
Subject: [PATCH 1/5] Updating layout and adding bottom tab bar menu

---
 app/src/main/res/drawable/list.xml       |  5 ++
 app/src/main/res/drawable/map.xml        |  5 ++
 app/src/main/res/drawable/profile.xml    |  5 ++
 app/src/main/res/layout/main_window.xml  | 80 ++++++++----------------
 app/src/main/res/menu/bottom_tabs.xml    | 18 ++++++
 app/src/main/res/values-night/themes.xml |  6 +-
 app/src/main/res/values/colors.xml       |  5 ++
 app/src/main/res/values/themes.xml       |  6 +-
 8 files changed, 70 insertions(+), 60 deletions(-)
 create mode 100644 app/src/main/res/drawable/list.xml
 create mode 100644 app/src/main/res/drawable/map.xml
 create mode 100644 app/src/main/res/drawable/profile.xml
 create mode 100644 app/src/main/res/menu/bottom_tabs.xml

diff --git a/app/src/main/res/drawable/list.xml b/app/src/main/res/drawable/list.xml
new file mode 100644
index 0000000..206e694
--- /dev/null
+++ b/app/src/main/res/drawable/list.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#FFFFFF" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/map.xml b/app/src/main/res/drawable/map.xml
new file mode 100644
index 0000000..ffd9dd9
--- /dev/null
+++ b/app/src/main/res/drawable/map.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
+</vector>
diff --git a/app/src/main/res/drawable/profile.xml b/app/src/main/res/drawable/profile.xml
new file mode 100644
index 0000000..d36b73c
--- /dev/null
+++ b/app/src/main/res/drawable/profile.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,5.9c1.16,0 2.1,0.94 2.1,2.1s-0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8s0.94,-2.1 2.1,-2.1m0,9c2.97,0 6.1,1.46 6.1,2.1v1.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
diff --git a/app/src/main/res/layout/main_window.xml b/app/src/main/res/layout/main_window.xml
index 1480d71..51e72d5 100644
--- a/app/src/main/res/layout/main_window.xml
+++ b/app/src/main/res/layout/main_window.xml
@@ -1,66 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-<!--    Trouver un moyen de virer le menu par défaut ou le garder et virer le frameLayout en dessous-->
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="55dp"
-        android:background="@color/green">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="@string/app_name"
-            android:textColor="@color/white"
-            android:layout_marginStart="25dp"
-            android:gravity="center"
-            android:textSize="20sp"
-            android:layout_marginLeft="25dp" />
-
-    </FrameLayout>
-
-<!--    Ici map, j'ai essayé de télécharger la map de google dans "Design" mais ca a cassé le projet donc à éviter pour l'instant je pense-->
-
+    <!--    Trouver un moyen de virer le menu par défaut ou le garder et virer le frameLayout en dessous-->
 
-<!--    Arriver à mettre le menu en bas + Ajouter des icones-->
-<!--    Faire un composant pour éviter la répétition ?-->
-    <LinearLayout
+    <TextView
         android:layout_width="match_parent"
-        android:layout_height="55dp"
-        android:gravity="center"
-        >
-
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="@string/profil"
-            android:textSize="11sp"
-            android:layout_marginRight="20dp"
-            style="?android:attr/buttonBarButtonStyle"/>
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="@string/carte"
-            android:textSize="11sp"
-            android:layout_marginRight="20dp"
-            android:layout_marginLeft="20dp"
-            style="?android:attr/buttonBarButtonStyle" />
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@color/main_turquoise_700"
+        android:gravity="center_vertical"
+        android:padding="20dp"
+        android:text="@string/app_name"
+        android:textColor="@color/main_turquoise_50"
+        android:textSize="20sp"
+        android:textStyle="bold" />
+
+    <!--    Ici map, j'ai essayé de télécharger la map de google dans "Design" mais ca a cassé le projet donc à éviter pour l'instant je pense-->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="8"></View>
 
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="@string/liste"
-            android:textSize="11sp"
-            android:layout_marginLeft="20dp"
-            style="?android:attr/buttonBarButtonStyle"/>
+    <!--    Faire un composant pour éviter la répétition ?-->
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottom_navigation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/main_turquoise_700"
+        app:menu="@menu/bottom_tabs" />
 
-    </LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/menu/bottom_tabs.xml b/app/src/main/res/menu/bottom_tabs.xml
new file mode 100644
index 0000000..84dfd2d
--- /dev/null
+++ b/app/src/main/res/menu/bottom_tabs.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <menu xmlns:android="http://schemas.android.com/apk/res/android">
+        <item
+            android:id="@+id/profile"
+            android:enabled="true"
+            android:title="@string/profil"
+            android:icon="@drawable/profile"/>
+        <item
+            android:id="@+id/map"
+            android:enabled="true"
+            android:title="@string/carte"
+            android:icon="@drawable/map"/>
+        <item
+            android:id="@+id/list"
+            android:enabled="true"
+            android:title="@string/liste"
+            android:icon="@drawable/list" />
+    </menu>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 4c291af..ef4f8e8 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,9 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Geocaching" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Geocaching" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/purple_700</item>
+        <item name="colorPrimaryVariant">@color/purple_200</item>
         <item name="colorOnPrimary">@color/black</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e863661..2c25fb7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,4 +9,9 @@
     <color name="white">#FFFFFFFF</color>
     <color name="green">#FF3D7D3C</color>
     <color name="green_variant">#FF659964</color>
+
+    <color name="main_turquoise_700">#2f3e46</color>
+    <color name="main_turquoise_500">#354f52</color>
+    <color name="main_turquoise_200">#52796f</color>
+    <color name="main_turquoise_50">#cad2c5</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c27377e..607676c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,9 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Geocaching" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Geocaching" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/green</item>
-        <item name="colorPrimaryVariant">@color/green_variant</item>
+        <item name="colorPrimary">@color/main_turquoise_50</item>
+        <item name="colorPrimaryVariant">@color/main_turquoise_500</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>

From 3a71233073c62df5d8cc5b090a4526ef9c3a9d7f Mon Sep 17 00:00:00 2001
From: "arthur.valin" <arthur.valin@etu.uca.fr>
Date: Fri, 3 Mar 2023 17:33:09 +0100
Subject: [PATCH 2/5] Adding OpenStreetMap view

---
 app/build.gradle                              |  3 ++
 app/src/main/AndroidManifest.xml              | 34 +++++++++++++++----
 .../baptistearthur/geocaching/MainWindow.kt   |  6 ++++
 app/src/main/res/layout/main_window.xml       | 11 +++---
 app/src/main/res/menu/bottom_tabs.xml         | 34 +++++++++----------
 build.gradle                                  |  1 +
 settings.gradle                               |  1 +
 7 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 16f2993..92336a8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
 }
 
 android {
@@ -40,4 +41,6 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    implementation "androidx.fragment:fragment-ktx:1.5.5"
+    implementation 'org.osmdroid:osmdroid-android:6.1.14'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a2340f2..3471887 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools" >
 
     <application
         android:allowBackup="true"
@@ -11,15 +11,37 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Geocaching"
-        tools:targetApi="31">
+        tools:targetApi="31" >
 
-        <activity android:name=".MainWindow" android:exported="true">
+        <!--
+             TODO: Before you run your application, you need a Google Maps API key.
+
+             To get one, follow the directions here:
+
+                https://developers.google.com/maps/documentation/android-sdk/get-api-key
+
+             Once you have your API key (it starts with "AIza"), define a new property in your
+             project's local.properties file (e.g. MAPS_API_KEY=Aiza...), and replace the
+             "YOUR_API_KEY" string in this file with "${MAPS_API_KEY}".
+        -->
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="YOUR_API_KEY" />
+
+        <activity
+            android:name=".MainWindow"
+            android:exported="true" >
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
     </application>
 
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"  />
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/MainWindow.kt b/app/src/main/java/uca/baptistearthur/geocaching/MainWindow.kt
index 1730b46..65491c7 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/MainWindow.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/MainWindow.kt
@@ -3,10 +3,16 @@ package uca.baptistearthur.geocaching
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 
+import org.osmdroid.config.Configuration
 class MainWindow: AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
+
         super.onCreate(savedInstanceState)
+        Configuration.getInstance().userAgentValue = "Geocaching"
+
+        // Set the user agent for OsmDroid
+
         setContentView(R.layout.main_window)
     }
 
diff --git a/app/src/main/res/layout/main_window.xml b/app/src/main/res/layout/main_window.xml
index 51e72d5..44b5448 100644
--- a/app/src/main/res/layout/main_window.xml
+++ b/app/src/main/res/layout/main_window.xml
@@ -6,8 +6,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <!--    Trouver un moyen de virer le menu par défaut ou le garder et virer le frameLayout en dessous-->
-
     <TextView
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -20,13 +18,14 @@
         android:textSize="20sp"
         android:textStyle="bold" />
 
-    <!--    Ici map, j'ai essayé de télécharger la map de google dans "Design" mais ca a cassé le projet donc à éviter pour l'instant je pense-->
-    <View
+    <org.osmdroid.views.MapView
+        android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="8"></View>
+        android:layout_weight="8"
+        android:clickable="true"
+        android:focusable="true" />
 
-    <!--    Faire un composant pour éviter la répétition ?-->
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottom_navigation"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/menu/bottom_tabs.xml b/app/src/main/res/menu/bottom_tabs.xml
index 84dfd2d..d8469db 100644
--- a/app/src/main/res/menu/bottom_tabs.xml
+++ b/app/src/main/res/menu/bottom_tabs.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <menu xmlns:android="http://schemas.android.com/apk/res/android">
-        <item
-            android:id="@+id/profile"
-            android:enabled="true"
-            android:title="@string/profil"
-            android:icon="@drawable/profile"/>
-        <item
-            android:id="@+id/map"
-            android:enabled="true"
-            android:title="@string/carte"
-            android:icon="@drawable/map"/>
-        <item
-            android:id="@+id/list"
-            android:enabled="true"
-            android:title="@string/liste"
-            android:icon="@drawable/list" />
-    </menu>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/profile"
+        android:enabled="true"
+        android:title="@string/profil"
+        android:icon="@drawable/profile"/>
+    <item
+        android:id="@+id/map"
+        android:enabled="true"
+        android:title="@string/carte"
+        android:icon="@drawable/map"/>
+    <item
+        android:id="@+id/list"
+        android:enabled="true"
+        android:title="@string/liste"
+        android:icon="@drawable/list" />
+</menu>
diff --git a/build.gradle b/build.gradle
index c518bc1..f8ba472 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,4 +3,5 @@ plugins {
     id 'com.android.application' version '7.3.0' apply false
     id 'com.android.library' version '7.3.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
+    id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index a3c4cc7..9087274 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,6 +3,7 @@ pluginManagement {
         gradlePluginPortal()
         google()
         mavenCentral()
+
     }
 }
 dependencyResolutionManagement {

From 7f6c10db7551c6daa975fdf90efd34e1a4082c25 Mon Sep 17 00:00:00 2001
From: "arthur.valin" <arthur.valin@etu.uca.fr>
Date: Mon, 6 Mar 2023 16:38:09 +0100
Subject: [PATCH 3/5] Adding navigation between fragments and starting map
 configuration

---
 app/build.gradle                              |   1 +
 app/src/main/AndroidManifest.xml              |  31 ++----
 .../uca/baptistearthur/geocaching/List.kt     |  59 +++++++++++
 .../baptistearthur/geocaching/MainWindow.kt   |  33 +++++-
 .../java/uca/baptistearthur/geocaching/Map.kt | 100 ++++++++++++++++++
 .../uca/baptistearthur/geocaching/Profile.kt  |  59 +++++++++++
 app/src/main/res/layout/fragment_list.xml     |  13 +++
 app/src/main/res/layout/fragment_map.xml      |  15 +++
 app/src/main/res/layout/fragment_profile.xml  |  13 +++
 app/src/main/res/layout/main_window.xml       |   8 +-
 app/src/main/res/values/strings.xml           |   2 +
 11 files changed, 301 insertions(+), 33 deletions(-)
 create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/List.kt
 create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/Map.kt
 create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/Profile.kt
 create mode 100644 app/src/main/res/layout/fragment_list.xml
 create mode 100644 app/src/main/res/layout/fragment_map.xml
 create mode 100644 app/src/main/res/layout/fragment_profile.xml

diff --git a/app/build.gradle b/app/build.gradle
index 92336a8..cc18ac3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,4 +43,5 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     implementation "androidx.fragment:fragment-ktx:1.5.5"
     implementation 'org.osmdroid:osmdroid-android:6.1.14'
+
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3471887..7804d9a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" >
 
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_A"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"  />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"  />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -12,36 +20,13 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Geocaching"
         tools:targetApi="31" >
-
-        <!--
-             TODO: Before you run your application, you need a Google Maps API key.
-
-             To get one, follow the directions here:
-
-                https://developers.google.com/maps/documentation/android-sdk/get-api-key
-
-             Once you have your API key (it starts with "AIza"), define a new property in your
-             project's local.properties file (e.g. MAPS_API_KEY=Aiza...), and replace the
-             "YOUR_API_KEY" string in this file with "${MAPS_API_KEY}".
-        -->
-        <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="YOUR_API_KEY" />
-
         <activity
             android:name=".MainWindow"
             android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
-
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"  />
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/List.kt b/app/src/main/java/uca/baptistearthur/geocaching/List.kt
new file mode 100644
index 0000000..d082f99
--- /dev/null
+++ b/app/src/main/java/uca/baptistearthur/geocaching/List.kt
@@ -0,0 +1,59 @@
+package uca.baptistearthur.geocaching
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+// TODO: Rename parameter arguments, choose names that match
+// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [List.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class List : Fragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        arguments?.let {
+            param1 = it.getString(ARG_PARAM1)
+            param2 = it.getString(ARG_PARAM2)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_list, container, false)
+    }
+
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment List.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            List().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
+                }
+            }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/MainWindow.kt b/app/src/main/java/uca/baptistearthur/geocaching/MainWindow.kt
index 65491c7..0774e7a 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/MainWindow.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/MainWindow.kt
@@ -2,18 +2,41 @@ package uca.baptistearthur.geocaching
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import com.google.android.material.bottomnavigation.BottomNavigationView
 
 import org.osmdroid.config.Configuration
 class MainWindow: AppCompatActivity() {
-
     override fun onCreate(savedInstanceState: Bundle?) {
 
         super.onCreate(savedInstanceState)
-        Configuration.getInstance().userAgentValue = "Geocaching"
-
-        // Set the user agent for OsmDroid
-
         setContentView(R.layout.main_window)
+
+        loadFragment(Map())
+        val navigation = findViewById<BottomNavigationView>(R.id.bottom_navigation)
+        navigation.selectedItemId= R.id.map
+        navigation.setOnItemSelectedListener {
+            when (it.itemId) {
+                R.id.profile -> {
+                    loadFragment(Profile())
+                    true
+                }
+                R.id.map -> {
+                    loadFragment(Map())
+                    true
+                }
+                R.id.list -> {
+                    loadFragment(List())
+                    true
+                }
+                else -> false
+            }
+        }
+    }
+    private fun loadFragment(fragment: Fragment){
+        val transaction = supportFragmentManager.beginTransaction()
+        transaction.replace(R.id.fragment_container, fragment)
+        transaction.commit()
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/Map.kt b/app/src/main/java/uca/baptistearthur/geocaching/Map.kt
new file mode 100644
index 0000000..34d2d00
--- /dev/null
+++ b/app/src/main/java/uca/baptistearthur/geocaching/Map.kt
@@ -0,0 +1,100 @@
+package uca.baptistearthur.geocaching
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.location.LocationManager
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import org.osmdroid.config.Configuration
+import org.osmdroid.util.GeoPoint
+import org.osmdroid.views.MapView
+import org.osmdroid.views.overlay.ScaleBarOverlay
+import android.Manifest.permission.ACCESS_FINE_LOCATION
+import android.hardware.SensorManager
+import android.location.Location
+import android.location.LocationListener
+import androidx.activity.result.contract.ActivityResultContracts
+import org.osmdroid.views.overlay.compass.CompassOverlay
+import org.osmdroid.views.overlay.compass.InternalCompassOrientationProvider
+import org.osmdroid.views.overlay.mylocation.GpsMyLocationProvider
+import org.osmdroid.views.overlay.mylocation.MyLocationNewOverlay
+
+class Map : Fragment() {
+    private lateinit var map : MapView
+    val defaultPoint = GeoPoint(48.8583, 2.2944)
+    var isMapCentered = false;
+    val locationListener = object : LocationListener {
+        override fun onLocationChanged(location: Location) {
+            val geoPoint = GeoPoint(location.latitude, location.longitude)
+            if(!isMapCentered){
+                map.controller.setCenter(geoPoint)
+                isMapCentered=true;
+            }
+            map.invalidate()
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Configuration.getInstance().userAgentValue = "Geocaching"
+
+    }
+
+    val requestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission())
+    { map.controller.setCenter(defaultPoint); }
+
+    private fun configureMap(view: View){
+        map = view.findViewById(R.id.mapView)
+        map.controller.setZoom(20.0);
+        if (ContextCompat.checkSelfPermission(requireActivity(), ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+            requestPermissionLauncher.launch(ACCESS_FINE_LOCATION)
+        }
+        map.controller.setCenter(defaultPoint)
+
+        val compassOverlay = CompassOverlay(context, InternalCompassOrientationProvider(context), map);
+        compassOverlay.enableCompass();
+        map.getOverlays().add(compassOverlay);
+
+        val scaleBarOverlay = ScaleBarOverlay(map)
+        scaleBarOverlay.setAlignRight(true)
+        map.overlays.add(scaleBarOverlay)
+
+        val myLocation = MyLocationNewOverlay(GpsMyLocationProvider(context), map)
+        myLocation.enableFollowLocation()
+        myLocation.enableMyLocation()
+        map.overlays.add(myLocation)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        val view = inflater.inflate(R.layout.fragment_map, container, false)
+        configureMap(view)
+        return view
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (ContextCompat.checkSelfPermission(requireActivity(), ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+            val locationManager = requireActivity().getSystemService(Context.LOCATION_SERVICE) as LocationManager
+            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0f, locationListener)
+        }
+        map.onResume() //needed for compass, my location overlays, v6.0.0 and up
+    }
+
+    override fun onPause() {
+        super.onPause()
+        if (ContextCompat.checkSelfPermission(requireActivity(), ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+            val locationManager = requireActivity().getSystemService(Context.LOCATION_SERVICE) as LocationManager
+            locationManager.removeUpdates(locationListener)
+            isMapCentered=false;
+        }
+        map.onPause()  //needed for compass, my location overlays, v6.0.0 and up
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/Profile.kt b/app/src/main/java/uca/baptistearthur/geocaching/Profile.kt
new file mode 100644
index 0000000..5cca43b
--- /dev/null
+++ b/app/src/main/java/uca/baptistearthur/geocaching/Profile.kt
@@ -0,0 +1,59 @@
+package uca.baptistearthur.geocaching
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+// TODO: Rename parameter arguments, choose names that match
+// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [Profile.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class Profile : Fragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        arguments?.let {
+            param1 = it.getString(ARG_PARAM1)
+            param2 = it.getString(ARG_PARAM2)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_profile, container, false)
+    }
+
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment Profile.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            Profile().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
+                }
+            }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml
new file mode 100644
index 0000000..a037be3
--- /dev/null
+++ b/app/src/main/res/layout/fragment_list.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".List">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="List" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
new file mode 100644
index 0000000..6ebeadb
--- /dev/null
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Map">
+
+    <org.osmdroid.views.MapView
+        android:id="@+id/mapView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clickable="true"
+        android:focusable="true" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
new file mode 100644
index 0000000..491bbff
--- /dev/null
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Profile">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="PROFILE" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_window.xml b/app/src/main/res/layout/main_window.xml
index 44b5448..318c14e 100644
--- a/app/src/main/res/layout/main_window.xml
+++ b/app/src/main/res/layout/main_window.xml
@@ -18,13 +18,11 @@
         android:textSize="20sp"
         android:textStyle="bold" />
 
-    <org.osmdroid.views.MapView
-        android:id="@+id/mapView"
+    <FrameLayout
+        android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="8"
-        android:clickable="true"
-        android:focusable="true" />
+        android:layout_weight="8"/>
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottom_navigation"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 77daa05..24696d9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,4 +3,6 @@
     <string name="profil">Profil</string>
     <string name="carte">Carte</string>
     <string name="liste">Liste</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>
\ No newline at end of file

From 226f96fc096a3925488f0afa7e4a7b4f5f4c834b Mon Sep 17 00:00:00 2001
From: "arthur.valin" <arthur.valin@etu.uca.fr>
Date: Mon, 6 Mar 2023 21:27:18 +0100
Subject: [PATCH 4/5] Adding custom Recenter overlay

---
 .../java/uca/baptistearthur/geocaching/Map.kt |  6 ++
 .../geocaching/RecenterOverlay.kt             | 72 +++++++++++++++++++
 app/src/main/res/drawable/center.xml          |  5 ++
 3 files changed, 83 insertions(+)
 create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/RecenterOverlay.kt
 create mode 100644 app/src/main/res/drawable/center.xml

diff --git a/app/src/main/java/uca/baptistearthur/geocaching/Map.kt b/app/src/main/java/uca/baptistearthur/geocaching/Map.kt
index 34d2d00..5d66bc5 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/Map.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/Map.kt
@@ -23,6 +23,7 @@ import org.osmdroid.views.overlay.compass.InternalCompassOrientationProvider
 import org.osmdroid.views.overlay.mylocation.GpsMyLocationProvider
 import org.osmdroid.views.overlay.mylocation.MyLocationNewOverlay
 
+
 class Map : Fragment() {
     private lateinit var map : MapView
     val defaultPoint = GeoPoint(48.8583, 2.2944)
@@ -67,6 +68,11 @@ class Map : Fragment() {
         myLocation.enableFollowLocation()
         myLocation.enableMyLocation()
         map.overlays.add(myLocation)
+
+        val recenter = RecenterOverlay(GpsMyLocationProvider(context), map)
+        recenter.enableMyLocation()
+        map.overlays.add(recenter);
+
     }
 
     override fun onCreateView(
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/RecenterOverlay.kt b/app/src/main/java/uca/baptistearthur/geocaching/RecenterOverlay.kt
new file mode 100644
index 0000000..eee6a23
--- /dev/null
+++ b/app/src/main/java/uca/baptistearthur/geocaching/RecenterOverlay.kt
@@ -0,0 +1,72 @@
+package uca.baptistearthur.geocaching
+
+import android.graphics.*
+import android.graphics.drawable.shapes.Shape
+import android.location.Location
+import android.view.GestureDetector
+import android.view.MotionEvent
+import androidx.appcompat.widget.AppCompatDrawableManager
+import androidx.core.content.ContextCompat
+import org.osmdroid.util.GeoPoint
+import org.osmdroid.views.MapView
+import org.osmdroid.views.overlay.Overlay
+import org.osmdroid.views.overlay.mylocation.IMyLocationConsumer
+import org.osmdroid.views.overlay.mylocation.IMyLocationProvider
+
+
+class RecenterOverlay(val myLocationProvider: IMyLocationProvider, val mapView: MapView) : Overlay(), GestureDetector.OnGestureListener, IMyLocationConsumer {
+
+    private val gestureDetector: GestureDetector = GestureDetector(mapView.context, this)
+
+    private var circleRectF=RectF();
+
+
+    override fun draw(canvas: Canvas, mapView: MapView, shadow: Boolean) {
+
+        val circleSize = 300f
+        val circlePadding = 20f
+        val circleX = canvas.width - circleSize - circlePadding
+        val circleY = canvas.height - circleSize - circlePadding
+        circleRectF=RectF(circleX, circleY, circleX + circleSize, circleY + circleSize)
+
+        val paint = Paint().apply {
+            color = Color.WHITE
+            style = Paint.Style.FILL
+        }
+        canvas.drawCircle(
+            circleX + circleSize / 2,
+            circleY + circleSize / 2,
+            circleSize / 2,
+            paint
+        )
+
+        val iconSize = 180
+        val icon = ContextCompat.getDrawable(mapView.context, R.drawable.center)
+
+        val iconX = (circleX + circleSize / 2 - iconSize / 2).toInt()
+        val iconY = (circleY + circleSize / 2 - iconSize / 2).toInt()
+
+        icon?.setBounds(iconX, iconY, iconX + iconSize, iconY + iconSize)
+        icon?.draw(canvas)
+    }
+
+    fun enableMyLocation() {
+        myLocationProvider.startLocationProvider(this);
+    }
+
+    override fun onSingleTapConfirmed(e: MotionEvent?, mapView: MapView?) =
+        myLocationProvider.lastKnownLocation?.let {
+            if (e != null && circleRectF.contains(e.x, e.y)) {
+                mapView?.controller?.setCenter(GeoPoint(it.latitude, it.longitude))
+            }
+            true
+        } ?: false
+
+    override fun onDown(p0: MotionEvent) = true
+    override fun onShowPress(p0: MotionEvent) = Unit
+    override fun onSingleTapUp(p0: MotionEvent) = true
+    override fun onScroll(p0: MotionEvent, p1: MotionEvent, p2: Float, p3: Float) = true;
+    override fun onLongPress(p0: MotionEvent) = Unit
+    override fun onFling(p0: MotionEvent, p1: MotionEvent, p2: Float, p3: Float) = true
+    override fun onLocationChanged(location: Location?, source: IMyLocationProvider?) = Unit
+}
diff --git a/app/src/main/res/drawable/center.xml b/app/src/main/res/drawable/center.xml
new file mode 100644
index 0000000..e215d44
--- /dev/null
+++ b/app/src/main/res/drawable/center.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M5,15L3,15v4c0,1.1 0.9,2 2,2h4v-2L5,19v-4zM5,5h4L9,3L5,3c-1.1,0 -2,0.9 -2,2v4h2L5,5zM19,3h-4v2h4v4h2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19h-4v2h4c1.1,0 2,-0.9 2,-2v-4h-2v4zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+</vector>

From 0cf19438cc5d22fa8d2743780f24533f5d782383 Mon Sep 17 00:00:00 2001
From: "arthur.valin" <arthur.valin@etu.uca.fr>
Date: Mon, 6 Mar 2023 21:46:49 +0100
Subject: [PATCH 5/5] Correcting bug on RecenterOverlay due to badly handled
 lifecycle

---
 .../geocaching/RecenterOverlay.kt             | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/uca/baptistearthur/geocaching/RecenterOverlay.kt b/app/src/main/java/uca/baptistearthur/geocaching/RecenterOverlay.kt
index eee6a23..47aae20 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/RecenterOverlay.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/RecenterOverlay.kt
@@ -17,7 +17,6 @@ import org.osmdroid.views.overlay.mylocation.IMyLocationProvider
 class RecenterOverlay(val myLocationProvider: IMyLocationProvider, val mapView: MapView) : Overlay(), GestureDetector.OnGestureListener, IMyLocationConsumer {
 
     private val gestureDetector: GestureDetector = GestureDetector(mapView.context, this)
-
     private var circleRectF=RectF();
 
 
@@ -54,14 +53,36 @@ class RecenterOverlay(val myLocationProvider: IMyLocationProvider, val mapView:
         myLocationProvider.startLocationProvider(this);
     }
 
+    fun disableMyLocation(){
+        myLocationProvider.stopLocationProvider();
+    }
+
     override fun onSingleTapConfirmed(e: MotionEvent?, mapView: MapView?) =
         myLocationProvider.lastKnownLocation?.let {
             if (e != null && circleRectF.contains(e.x, e.y)) {
                 mapView?.controller?.setCenter(GeoPoint(it.latitude, it.longitude))
+                mapView?.controller?.setZoom(20.0);
+
             }
             true
         } ?: false
 
+
+    override fun onResume() {
+        super.onResume()
+        enableMyLocation()
+    }
+
+    override fun onPause(){
+        disableMyLocation()
+        super.onPause()
+    }
+
+    override fun onDetach(mapView: MapView?) {
+        disableMyLocation()
+        super.onDetach(mapView)
+    }
+
     override fun onDown(p0: MotionEvent) = true
     override fun onShowPress(p0: MotionEvent) = Unit
     override fun onSingleTapUp(p0: MotionEvent) = true