From 477cf4deb6c97b72644a356d63ac19dcfac1ff3f Mon Sep 17 00:00:00 2001
From: babonneau <baptiste.bonneau@etu.uca.fr>
Date: Fri, 17 Mar 2023 17:30:45 +0100
Subject: [PATCH 1/6] debut voyages

---
 .../uca/baptistearthur/geocaching/model/Place.kt |  4 ++--
 .../baptistearthur/geocaching/model/RoadTrip.kt  |  2 +-
 .../uca/baptistearthur/geocaching/model/Stub.kt  |  9 +++++++++
 app/src/main/res/layout/cell_one_roadtrip.xml    | 11 +++++++++++
 app/src/main/res/layout/fragment_roadtrip.xml    | 16 +++++++++++++---
 app/src/main/res/values/strings.xml              |  1 +
 6 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/layout/cell_one_roadtrip.xml

diff --git a/app/src/main/java/uca/baptistearthur/geocaching/model/Place.kt b/app/src/main/java/uca/baptistearthur/geocaching/model/Place.kt
index 6904b27..9a49d28 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/model/Place.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/model/Place.kt
@@ -1,6 +1,6 @@
 package uca.baptistearthur.geocaching.model
 
 data class Place(
-    val latitude : Long,
-    val longitude : Long
+    val latitude: Double,
+    val longitude: Double
 )
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt b/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt
index cbabb74..c91fa76 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt
@@ -9,6 +9,6 @@ class RoadTrip(
 ){
 
     fun addPlaceToRoadTripList(place: Place) = places.add(place)
-    fun addPlaceToRoadTripList(latitude: Long, longitude: Long) = places.add(Place(latitude, longitude))
+    fun addPlaceToRoadTripList(latitude: Double, longitude: Double) = places.add(Place(latitude, longitude))
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt b/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt
index f2c610e..8f859a9 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt
@@ -1,6 +1,15 @@
 package uca.baptistearthur.geocaching.model
 
+import java.util.Date
+
 class Stub {
 
+    fun load(): List<RoadTrip> {
+        return listOf(
+            RoadTrip("France", Date(), listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333)) as ArrayList<Place>),
+            RoadTrip("Italie", Date(), listOf(Place(52.866667, 4.333333), Place(48.866667, 2.333333)) as ArrayList<Place>),
+            RoadTrip("Allemagne", Date(), listOf(Place(37.866667, 3.333333)) as ArrayList<Place>),
+        )
+    }
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/cell_one_roadtrip.xml b/app/src/main/res/layout/cell_one_roadtrip.xml
new file mode 100644
index 0000000..3d1f7e9
--- /dev/null
+++ b/app/src/main/res/layout/cell_one_roadtrip.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_roadtrip.xml b/app/src/main/res/layout/fragment_roadtrip.xml
index 272b3ab..cfd1335 100644
--- a/app/src/main/res/layout/fragment_roadtrip.xml
+++ b/app/src/main/res/layout/fragment_roadtrip.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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=".ui.fragment.RoadTrip">
+    tools:context=".ui.fragment.RoadTrip"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/roadtrip_title"
+        android:background="@color/main_turquoise_200"
+        android:textColor="@color/main_turquoise_50"
+        android:padding="10dp"
+        android:textSize="20dp"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerViewRoadTripList"
@@ -11,4 +21,4 @@
         android:layout_height="match_parent"
     />
 
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 101072f..a85716e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,6 +2,7 @@
     <string name="app_name">RoadTrip</string>
     <string name="carte">Carte</string>
     <string name="voyages">Voyages</string>
+    <string name="roadtrip_title">Mes RoadTrips:</string>v
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>
\ No newline at end of file
-- 
2.36.3


From 00c73807dbb2f73e0abfff1856b20e1bb3711cbd Mon Sep 17 00:00:00 2001
From: babonneau <baptiste.bonneau@etu.uca.fr>
Date: Mon, 20 Mar 2023 13:58:50 +0100
Subject: [PATCH 2/6] starting cells

---
 app/src/main/res/drawable/bin.xml             | 18 ++++++++++++
 app/src/main/res/drawable/right_arrow.xml     |  9 ++++++
 app/src/main/res/layout/cell_one_roadtrip.xml | 29 +++++++++++++++++--
 3 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/bin.xml
 create mode 100644 app/src/main/res/drawable/right_arrow.xml

diff --git a/app/src/main/res/drawable/bin.xml b/app/src/main/res/drawable/bin.xml
new file mode 100644
index 0000000..10025ad
--- /dev/null
+++ b/app/src/main/res/drawable/bin.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="91dp"
+    android:height="91dp"
+    android:viewportWidth="91"
+    android:viewportHeight="91">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M67.305,36.442v-8.055c0,-0.939 -0.762,-1.701 -1.7,-1.701H54.342v-5.524c0,-0.938 -0.761,-1.7 -1.699,-1.7h-12.75c-0.939,0 -1.701,0.762 -1.701,1.7v5.524H26.93c-0.939,0 -1.7,0.762 -1.7,1.701v8.055c0,0.938 0.761,1.699 1.7,1.699h0.488v34.021c0,0.938 0.761,1.7 1.699,1.7h29.481c3.595,0 6.52,-2.924 6.52,-6.518V38.142h0.486C66.543,38.142 67.305,37.381 67.305,36.442zM41.592,22.862h9.35v3.824h-9.35V22.862zM61.719,67.345c0,1.719 -1.4,3.117 -3.12,3.117h-27.78v-32.32l30.9,0.002V67.345zM63.904,34.742H28.629v-4.655h11.264h12.75h11.262V34.742z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M36.066,44.962h3.4v19.975h-3.4z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M44.566,44.962h3.4v19.975h-3.4z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M53.066,44.962h3.4v19.975h-3.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/right_arrow.xml b/app/src/main/res/drawable/right_arrow.xml
new file mode 100644
index 0000000..72736fb
--- /dev/null
+++ b/app/src/main/res/drawable/right_arrow.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="800dp"
+    android:height="800dp"
+    android:viewportWidth="330"
+    android:viewportHeight="330">
+  <path
+      android:pathData="M250.61,154.39l-150,-150c-5.86,-5.86 -15.35,-5.86 -21.21,0c-5.86,5.86 -5.86,15.35 0,21.21l139.39,139.39L79.39,304.39c-5.86,5.86 -5.86,15.35 0,21.21C82.32,328.54 86.16,330 90,330s7.68,-1.46 10.61,-4.39l150,-150c2.81,-2.81 4.39,-6.63 4.39,-10.61C255,161.02 253.42,157.2 250.61,154.39z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/layout/cell_one_roadtrip.xml b/app/src/main/res/layout/cell_one_roadtrip.xml
index 3d1f7e9..bdc02bd 100644
--- a/app/src/main/res/layout/cell_one_roadtrip.xml
+++ b/app/src/main/res/layout/cell_one_roadtrip.xml
@@ -1,11 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="45dp"
+    android:orientation="horizontal">
 
-    <TextView
+    <Button
+        android:id="@+id/btnGetRoadTripsInfo"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="wrap_content"
+        android:text="@string/app_name"
+        android:layout_gravity="center"
+        android:layout_marginLeft="20dp"
+        android:textSize="20sp"
+        android:layout_marginStart="20dp"
+        android:background="@color/white"
+        android:textColor="@color/black"
+        android:drawableLeft="@drawable/right_arrow"
+        android:drawableStart="@drawable/right_arrow"
+    />
+
+
+    <ImageButton
+        android:id="@+id/btnDeleteRoadTrips"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/bin"
+        android:background="@color/white"
+        android:layout_marginRight="20dp"
+
+    />
 
 
 </LinearLayout>
\ No newline at end of file
-- 
2.36.3


From f91a64bc15770fdf3fe7b788a8ac96b1f0eab155 Mon Sep 17 00:00:00 2001
From: Baptiiiiste <baptiste.Tab4@gmail.com>
Date: Tue, 21 Mar 2023 21:19:44 +0100
Subject: [PATCH 3/6] cell

---
 .../baptistearthur/geocaching/data/Stub.kt    |  6 +++++
 .../geocaching/ui/activity/MainWindow.kt      | 11 ++++++++
 app/src/main/res/layout/cell_one_roadtrip.xml | 25 +++++++++----------
 app/src/main/res/layout/fragment_roadtrip.xml |  9 ++++++-
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/data/Stub.kt

diff --git a/app/src/main/java/uca/baptistearthur/geocaching/data/Stub.kt b/app/src/main/java/uca/baptistearthur/geocaching/data/Stub.kt
new file mode 100644
index 0000000..09a8bc2
--- /dev/null
+++ b/app/src/main/java/uca/baptistearthur/geocaching/data/Stub.kt
@@ -0,0 +1,6 @@
+package uca.baptistearthur.geocaching.data
+
+class Stub {
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt
index d68ce9c..f627c5f 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt
@@ -3,6 +3,7 @@ package uca.baptistearthur.geocaching.ui.activity
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import uca.baptistearthur.geocaching.R
 import uca.baptistearthur.geocaching.ui.fragment.Map
@@ -16,6 +17,7 @@ class MainWindow: AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.main_window)
 
+//        Bottom menu
         loadFragment(Map())
         val navigation = findViewById<BottomNavigationView>(R.id.bottom_navigation)
         navigation.selectedItemId= R.id.map
@@ -32,11 +34,20 @@ class MainWindow: AppCompatActivity() {
                 else -> false
             }
         }
+
+//        Map
+//        code here
+
+
+//        Voyages
+//        code here
+
     }
     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/res/layout/cell_one_roadtrip.xml b/app/src/main/res/layout/cell_one_roadtrip.xml
index bdc02bd..4b23d44 100644
--- a/app/src/main/res/layout/cell_one_roadtrip.xml
+++ b/app/src/main/res/layout/cell_one_roadtrip.xml
@@ -6,29 +6,28 @@
 
     <Button
         android:id="@+id/btnGetRoadTripsInfo"
-        android:layout_width="match_parent"
+        android:layout_width="314dp"
         android:layout_height="wrap_content"
-        android:text="@string/app_name"
-        android:layout_gravity="center"
-        android:layout_marginLeft="20dp"
-        android:textSize="20sp"
-        android:layout_marginStart="20dp"
+        android:layout_gravity="start"
         android:background="@color/white"
-        android:textColor="@color/black"
-        android:drawableLeft="@drawable/right_arrow"
         android:drawableStart="@drawable/right_arrow"
+        android:drawableLeft="@drawable/right_arrow"
+        android:gravity="left"
+        android:text="@string/app_name"
+        android:textColor="@color/black"
+        android:textSize="20sp"
     />
 
-
     <ImageButton
-        android:id="@+id/btnDeleteRoadTrips"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_gravity="end"
         android:src="@drawable/bin"
         android:background="@color/white"
-        android:layout_marginRight="20dp"
-
+        android:scaleType="fitCenter"
     />
 
 
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_roadtrip.xml b/app/src/main/res/layout/fragment_roadtrip.xml
index cfd1335..582e94a 100644
--- a/app/src/main/res/layout/fragment_roadtrip.xml
+++ b/app/src/main/res/layout/fragment_roadtrip.xml
@@ -15,10 +15,17 @@
         android:padding="10dp"
         android:textSize="20dp"/>
 
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/add_roadtrip_button"
+        android:layout_gravity="center"
+    />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerViewRoadTripList"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
     />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a85716e..b82b251 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
     <string name="carte">Carte</string>
     <string name="voyages">Voyages</string>
     <string name="roadtrip_title">Mes RoadTrips:</string>v
+    <string name="add_roadtrip_button">+ Ajouter un voyage</string>v
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>
\ No newline at end of file
-- 
2.36.3


From f2a38eb3398db478ccb8fc02a4a8f7429ecf3ef9 Mon Sep 17 00:00:00 2001
From: babonneau <baptiste.bonneau@etu.uca.fr>
Date: Wed, 22 Mar 2023 09:48:17 +0100
Subject: [PATCH 4/6] recycler view & adapter & viewholder + pb on stub &
 recyclerview display

---
 .../baptistearthur/geocaching/model/Stub.kt   | 23 ++++++----
 .../recyclerview/RoadTripAdapter.kt           | 26 ++++++++++++
 .../recyclerview/RoadTripViewHolder.kt        | 15 +++++++
 .../geocaching/ui/activity/MainWindow.kt      | 27 +++++++-----
 .../{RoadTrip.kt => RoadTripFragment.kt}      |  4 +-
 app/src/main/res/layout/cell_one_roadtrip.xml | 42 ++++++-------------
 6 files changed, 88 insertions(+), 49 deletions(-)
 create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt
 create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripViewHolder.kt
 rename app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/{RoadTrip.kt => RoadTripFragment.kt} (95%)

diff --git a/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt b/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt
index 8f859a9..265098c 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt
@@ -4,12 +4,21 @@ import java.util.Date
 
 class Stub {
 
-    fun load(): List<RoadTrip> {
-        return listOf(
-            RoadTrip("France", Date(), listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333)) as ArrayList<Place>),
-            RoadTrip("Italie", Date(), listOf(Place(52.866667, 4.333333), Place(48.866667, 2.333333)) as ArrayList<Place>),
-            RoadTrip("Allemagne", Date(), listOf(Place(37.866667, 3.333333)) as ArrayList<Place>),
-        )
-    }
+//    private val list = listOf(
+//        RoadTrip(
+//            "France",
+//            Date(),
+//            listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333)) as ArrayList<Place>
+//        ),
+//        RoadTrip(
+//            "Italie",
+//            Date(),
+//            listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333)) as ArrayList<Place>
+//        ),
+//    )
+
+//    fun load(): List<RoadTrip> {
+//        return list
+//    }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt
new file mode 100644
index 0000000..91dfb62
--- /dev/null
+++ b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt
@@ -0,0 +1,26 @@
+package uca.baptistearthur.geocaching.recyclerview
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import uca.baptistearthur.geocaching.R
+import uca.baptistearthur.geocaching.model.RoadTrip
+
+
+class RoadTripAdapter (val voyages: List<RoadTrip>) : Adapter<RoadTripViewHolder>(){
+
+    override fun onBindViewHolder(holder: RoadTripViewHolder, position: Int) {
+        holder.itemView.findViewById<Button>(R.id.btnGetRoadTripsInfo).text = "test"
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RoadTripViewHolder {
+        return RoadTripViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.cell_one_roadtrip, parent, false))
+    }
+
+    override fun getItemCount(): Int {
+        return voyages.size
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripViewHolder.kt b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripViewHolder.kt
new file mode 100644
index 0000000..0dd59d5
--- /dev/null
+++ b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripViewHolder.kt
@@ -0,0 +1,15 @@
+package uca.baptistearthur.geocaching.recyclerview
+
+import android.util.Log
+import android.view.View
+import android.widget.Button
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import uca.baptistearthur.geocaching.R
+
+class RoadTripViewHolder(val cellule: View): ViewHolder(cellule) {
+
+//    init{
+//        cellule.findViewById<Button>(R.id.btnGetRoadTripsInfo). ...
+//    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt
index f627c5f..2cac96b 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt
@@ -1,15 +1,22 @@
 package uca.baptistearthur.geocaching.ui.activity
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.commit
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import uca.baptistearthur.geocaching.R
+
+import uca.baptistearthur.geocaching.model.Stub
+import uca.baptistearthur.geocaching.recyclerview.RoadTripAdapter
 import uca.baptistearthur.geocaching.ui.fragment.Map
-import uca.baptistearthur.geocaching.ui.fragment.RoadTrip
+import uca.baptistearthur.geocaching.ui.fragment.RoadTripFragment
+import uca.baptistearthur.geocaching.model.RoadTrip
 
 class MainWindow: AppCompatActivity() {
+//    private val model: List<RoadTrip> = Stub().load()
     override fun onCreate(savedInstanceState: Bundle?) {
 
         val map = Map()
@@ -28,21 +35,21 @@ class MainWindow: AppCompatActivity() {
                     true
                 }
                 R.id.roadTrip -> {
-                    loadFragment(RoadTrip())
+                    loadFragment(RoadTripFragment())
                     true
                 }
                 else -> false
             }
         }
+    }
 
-//        Map
-//        code here
-
-
-//        Voyages
-//        code here
+    // RecyclerView voyage
+//    override fun onResume() {
+//        super.onResume()
+//        findViewById<RecyclerView>(R.id.recyclerViewRoadTripList).adapter = RoadTripAdapter(model)
+//        findViewById<RecyclerView>(R.id.recyclerViewRoadTripList).layoutManager = LinearLayoutManager(this)
+//    }
 
-    }
     private fun loadFragment(fragment: Fragment){
         val transaction = supportFragmentManager.beginTransaction()
         transaction.replace(R.id.fragment_container, fragment)
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTrip.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTripFragment.kt
similarity index 95%
rename from app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTrip.kt
rename to app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTripFragment.kt
index 4dce937..41229d0 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTrip.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTripFragment.kt
@@ -17,7 +17,7 @@ private const val ARG_PARAM2 = "param2"
  * Use the [RoadTrip.newInstance] factory method to
  * create an instance of this fragment.
  */
-class RoadTrip : Fragment() {
+class RoadTripFragment : Fragment() {
     // TODO: Rename and change types of parameters
     private var param1: String? = null
     private var param2: String? = null
@@ -50,7 +50,7 @@ class RoadTrip : Fragment() {
         // TODO: Rename and change types and number of parameters
         @JvmStatic
         fun newInstance(param1: String, param2: String) =
-            RoadTrip().apply {
+            RoadTripFragment().apply {
                 arguments = Bundle().apply {
                     putString(ARG_PARAM1, param1)
                     putString(ARG_PARAM2, param2)
diff --git a/app/src/main/res/layout/cell_one_roadtrip.xml b/app/src/main/res/layout/cell_one_roadtrip.xml
index 4b23d44..851c7ef 100644
--- a/app/src/main/res/layout/cell_one_roadtrip.xml
+++ b/app/src/main/res/layout/cell_one_roadtrip.xml
@@ -1,33 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/btnGetRoadTripsInfo"
     android:layout_width="match_parent"
     android:layout_height="45dp"
-    android:orientation="horizontal">
-
-    <Button
-        android:id="@+id/btnGetRoadTripsInfo"
-        android:layout_width="314dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:background="@color/white"
-        android:drawableStart="@drawable/right_arrow"
-        android:drawableLeft="@drawable/right_arrow"
-        android:gravity="left"
-        android:text="@string/app_name"
-        android:textColor="@color/black"
-        android:textSize="20sp"
-    />
-
-    <ImageButton
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_gravity="end"
-        android:src="@drawable/bin"
-        android:background="@color/white"
-        android:scaleType="fitCenter"
-    />
-
-
-
-</LinearLayout>
\ No newline at end of file
+    android:layout_gravity="start"
+    android:background="@color/white"
+    android:drawableStart="@drawable/right_arrow"
+    android:drawableLeft="@drawable/right_arrow"
+    android:gravity="left"
+    android:text="@string/app_name"
+    android:textColor="@color/black"
+    android:textSize="20sp"
+/>
-- 
2.36.3


From 02fd486bc115b41d15ce32f5a8472b82dd021f56 Mon Sep 17 00:00:00 2001
From: Baptiiiiste <baptiste.Tab4@gmail.com>
Date: Sat, 25 Mar 2023 23:45:27 +0100
Subject: [PATCH 5/6] Affichage de la recyclerview, fonction d'ajout d'un
 voyage

---
 .../baptistearthur/geocaching/data/Stub.kt    | 30 ++++++++++++-
 .../geocaching/model/RoadTrip.kt              |  2 +-
 .../baptistearthur/geocaching/model/Stub.kt   | 24 -----------
 .../recyclerview/RoadTripAdapter.kt           | 16 +++----
 .../recyclerview/RoadTripViewHolder.kt        |  5 +--
 .../geocaching/ui/activity/MainWindow.kt      | 16 ++-----
 .../ui/fragment/RoadTripFragment.kt           | 43 ++++++++++++++++---
 app/src/main/res/layout/cell_one_roadtrip.xml |  4 +-
 app/src/main/res/layout/fragment_roadtrip.xml | 31 ++++++++++---
 app/src/main/res/values/strings.xml           |  6 ++-
 10 files changed, 108 insertions(+), 69 deletions(-)
 delete mode 100644 app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt

diff --git a/app/src/main/java/uca/baptistearthur/geocaching/data/Stub.kt b/app/src/main/java/uca/baptistearthur/geocaching/data/Stub.kt
index 09a8bc2..0ddbabe 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/data/Stub.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/data/Stub.kt
@@ -1,6 +1,34 @@
 package uca.baptistearthur.geocaching.data
 
-class Stub {
+import uca.baptistearthur.geocaching.model.Place
+import uca.baptistearthur.geocaching.model.RoadTrip
+import java.util.Date
 
+class Stub {
+    fun load(): MutableList<RoadTrip> {
+        val list = listOf(
+            RoadTrip(
+                "France",
+                Date(),
+                listOf(Place(49.3, 49.3)).toMutableList()
+            ),
+            RoadTrip(
+                "Italie",
+                Date(),
+                listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333)).toMutableList()
+            ),
+            RoadTrip(
+                "Danemark",
+                Date(),
+                listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333)).toMutableList()
+            ),
+            RoadTrip(
+                "Islande",
+                Date(),
+                listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333), Place(48.866667, 2.333333)).toMutableList()
+            ),
+        )
+        return list.toMutableList()
+    }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt b/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt
index c91fa76..4352b37 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt
@@ -5,7 +5,7 @@ import java.util.Date
 class RoadTrip(
     val name: String,
     val date: Date,
-    val places: ArrayList<Place>
+    val places: MutableList<Place>
 ){
 
     fun addPlaceToRoadTripList(place: Place) = places.add(place)
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt b/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt
deleted file mode 100644
index 265098c..0000000
--- a/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package uca.baptistearthur.geocaching.model
-
-import java.util.Date
-
-class Stub {
-
-//    private val list = listOf(
-//        RoadTrip(
-//            "France",
-//            Date(),
-//            listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333)) as ArrayList<Place>
-//        ),
-//        RoadTrip(
-//            "Italie",
-//            Date(),
-//            listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333)) as ArrayList<Place>
-//        ),
-//    )
-
-//    fun load(): List<RoadTrip> {
-//        return list
-//    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt
index 91dfb62..17796f6 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt
@@ -1,26 +1,22 @@
 package uca.baptistearthur.geocaching.recyclerview
 
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.Adapter
 import uca.baptistearthur.geocaching.R
 import uca.baptistearthur.geocaching.model.RoadTrip
 
 
-class RoadTripAdapter (val voyages: List<RoadTrip>) : Adapter<RoadTripViewHolder>(){
-
-    override fun onBindViewHolder(holder: RoadTripViewHolder, position: Int) {
-        holder.itemView.findViewById<Button>(R.id.btnGetRoadTripsInfo).text = "test"
-    }
+class RoadTripAdapter (val voyages: List<RoadTrip>) : RecyclerView.Adapter<RoadTripViewHolder>(){
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RoadTripViewHolder {
         return RoadTripViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.cell_one_roadtrip, parent, false))
     }
 
-    override fun getItemCount(): Int {
-        return voyages.size
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: RoadTripViewHolder, position: Int) {
+        holder.roadTripAccessButton.text = ">  " + voyages[position].name
     }
+    override fun getItemCount(): Int = voyages.size
 }
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripViewHolder.kt b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripViewHolder.kt
index 0dd59d5..d87236b 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripViewHolder.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripViewHolder.kt
@@ -1,6 +1,5 @@
 package uca.baptistearthur.geocaching.recyclerview
 
-import android.util.Log
 import android.view.View
 import android.widget.Button
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
@@ -8,8 +7,6 @@ import uca.baptistearthur.geocaching.R
 
 class RoadTripViewHolder(val cellule: View): ViewHolder(cellule) {
 
-//    init{
-//        cellule.findViewById<Button>(R.id.btnGetRoadTripsInfo). ...
-//    }
+    var roadTripAccessButton: Button = cellule.findViewById(R.id.btnGetRoadTripsInfo)
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt
index 2cac96b..7cc7524 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt
@@ -2,21 +2,21 @@ package uca.baptistearthur.geocaching.ui.activity
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import uca.baptistearthur.geocaching.R
-
-import uca.baptistearthur.geocaching.model.Stub
+import uca.baptistearthur.geocaching.model.RoadTrip
 import uca.baptistearthur.geocaching.recyclerview.RoadTripAdapter
+
 import uca.baptistearthur.geocaching.ui.fragment.Map
 import uca.baptistearthur.geocaching.ui.fragment.RoadTripFragment
-import uca.baptistearthur.geocaching.model.RoadTrip
 
 class MainWindow: AppCompatActivity() {
-//    private val model: List<RoadTrip> = Stub().load()
+    @SuppressLint("MissingInflatedId")
     override fun onCreate(savedInstanceState: Bundle?) {
 
         val map = Map()
@@ -43,18 +43,10 @@ class MainWindow: AppCompatActivity() {
         }
     }
 
-    // RecyclerView voyage
-//    override fun onResume() {
-//        super.onResume()
-//        findViewById<RecyclerView>(R.id.recyclerViewRoadTripList).adapter = RoadTripAdapter(model)
-//        findViewById<RecyclerView>(R.id.recyclerViewRoadTripList).layoutManager = LinearLayoutManager(this)
-//    }
-
     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/ui/fragment/RoadTripFragment.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTripFragment.kt
index 41229d0..40fc0db 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTripFragment.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTripFragment.kt
@@ -1,11 +1,20 @@
 package uca.baptistearthur.geocaching.ui.fragment
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.EditText
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import uca.baptistearthur.geocaching.R
+import uca.baptistearthur.geocaching.data.Stub
+import uca.baptistearthur.geocaching.model.RoadTrip
+import uca.baptistearthur.geocaching.recyclerview.RoadTripAdapter
+import java.util.*
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -21,6 +30,11 @@ class RoadTripFragment : Fragment() {
     // TODO: Rename and change types of parameters
     private var param1: String? = null
     private var param2: String? = null
+    private var model = Stub().load()
+    private var roadTripRecyclerView : RecyclerView? = null
+    private var editTextRoadTripName: EditText? = null
+    private var buttonAddNewRoadTrip: Button? = null
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -30,14 +44,31 @@ class RoadTripFragment : Fragment() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_roadtrip, container, false)
+    @SuppressLint("NotifyDataSetChanged")
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val view = inflater.inflate(R.layout.fragment_roadtrip, container, false)
+
+        roadTripRecyclerView = view?.findViewById(R.id.recyclerViewRoadTripList)
+        roadTripRecyclerView?.adapter = RoadTripAdapter(model)
+        roadTripRecyclerView?.layoutManager = LinearLayoutManager(context)
+
+        editTextRoadTripName = view?.findViewById(R.id.editTextRoadTripName)
+        buttonAddNewRoadTrip = view?.findViewById(R.id.buttonAddNewRoadTrip)
+
+        buttonAddNewRoadTrip?.setOnClickListener {
+            val roadTripName = editTextRoadTripName?.text.toString()
+            editTextRoadTripName?.text?.clear()
+            val roadTrip = RoadTrip(roadTripName, Date(), mutableListOf())
+            model.add(roadTrip)
+            roadTripRecyclerView?.adapter?.notifyDataSetChanged()
+        }
+
+            return view
     }
 
+
+
+
     companion object {
         /**
          * Use this factory method to create a new instance of
diff --git a/app/src/main/res/layout/cell_one_roadtrip.xml b/app/src/main/res/layout/cell_one_roadtrip.xml
index 851c7ef..a29b808 100644
--- a/app/src/main/res/layout/cell_one_roadtrip.xml
+++ b/app/src/main/res/layout/cell_one_roadtrip.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/btnGetRoadTripsInfo"
     android:layout_width="match_parent"
     android:layout_height="45dp"
@@ -9,7 +10,6 @@
     android:drawableStart="@drawable/right_arrow"
     android:drawableLeft="@drawable/right_arrow"
     android:gravity="left"
-    android:text="@string/app_name"
     android:textColor="@color/black"
     android:textSize="20sp"
-/>
+    tools:ignore="RtlHardcoded" />
diff --git a/app/src/main/res/layout/fragment_roadtrip.xml b/app/src/main/res/layout/fragment_roadtrip.xml
index 582e94a..07d0ee3 100644
--- a/app/src/main/res/layout/fragment_roadtrip.xml
+++ b/app/src/main/res/layout/fragment_roadtrip.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.fragment.RoadTrip"
+    tools:context=".ui.fragment.RoadTripFragment"
     android:orientation="vertical">
 
     <TextView
@@ -13,14 +13,31 @@
         android:background="@color/main_turquoise_200"
         android:textColor="@color/main_turquoise_50"
         android:padding="10dp"
-        android:textSize="20dp"/>
+        android:textSize="20sp"/>
 
-    <Button
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/add_roadtrip_button"
-        android:layout_gravity="center"
-    />
+        android:orientation="horizontal"
+        >
+
+        <EditText
+            android:id="@+id/editTextRoadTripName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/textaddNewRoadTrip"
+            android:layout_weight="1"/>
+
+        <Button
+            android:id="@+id/buttonAddNewRoadTrip"
+            android:layout_width="50dp"
+            android:layout_height="wrap_content"
+            android:text="@string/add_roadtrip_button"
+            android:layout_gravity="center"
+            android:backgroundTint="@color/main_turquoise_200"
+        />
+
+    </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerViewRoadTripList"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b82b251..0418ad3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,8 +2,10 @@
     <string name="app_name">RoadTrip</string>
     <string name="carte">Carte</string>
     <string name="voyages">Voyages</string>
-    <string name="roadtrip_title">Mes RoadTrips:</string>v
-    <string name="add_roadtrip_button">+ Ajouter un voyage</string>v
+    <string name="roadtrip_title">Mes RoadTrips:</string>
+    <string name="add_roadtrip_button">+</string>
+    <string name="textaddNewRoadTrip">Entrez le nom du nouveau voyage</string>
+
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>
\ No newline at end of file
-- 
2.36.3


From fe58ff22da152227a8e7254f11a06c0ef59e5cfa Mon Sep 17 00:00:00 2001
From: Baptiiiiste <baptiste.Tab4@gmail.com>
Date: Mon, 27 Mar 2023 22:32:34 +0200
Subject: [PATCH 6/6] Moving loadFragment in a service, Creating the
 recyclerView for a roadtrip's places, Starting to display this recyclerView
 in RoadTripRecyclerView by getting the roadTrip by name

---
 .../geocaching/recyclerview/PlacesAdapter.kt  | 23 +++++++
 .../recyclerview/PlacesViewHolder.kt          | 14 ++++
 .../recyclerview/RoadTripViewHolder.kt        | 15 ++++
 .../geocaching/services/FragmentService.kt    | 16 +++++
 .../geocaching/ui/activity/MainWindow.kt      | 21 ++----
 .../ui/fragment/DetailledRoadTripFragment.kt  | 68 +++++++++++++++++++
 .../ui/fragment/RoadTripFragment.kt           | 26 ++++---
 app/src/main/res/layout/cell_place.xml        | 31 +++++++++
 .../layout/fragment_detailled_roadtrip.xml    | 42 ++++++++++++
 app/src/main/res/values/strings.xml           |  2 +
 10 files changed, 235 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesAdapter.kt
 create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesViewHolder.kt
 create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/services/FragmentService.kt
 create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/DetailledRoadTripFragment.kt
 create mode 100644 app/src/main/res/layout/cell_place.xml
 create mode 100644 app/src/main/res/layout/fragment_detailled_roadtrip.xml

diff --git a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesAdapter.kt b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesAdapter.kt
new file mode 100644
index 0000000..3e3b60f
--- /dev/null
+++ b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesAdapter.kt
@@ -0,0 +1,23 @@
+package uca.baptistearthur.geocaching.recyclerview
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import uca.baptistearthur.geocaching.R
+import uca.baptistearthur.geocaching.model.Place
+import uca.baptistearthur.geocaching.model.RoadTrip
+
+
+class PlacesAdapter (val places: List<Place>) : RecyclerView.Adapter<PlacesViewHolder>(){
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PlacesViewHolder {
+        return PlacesViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.cell_one_roadtrip, parent, false))
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: PlacesViewHolder, position: Int) {
+        holder.placeText.text = ">  " + places[position].longitude + " - " + places[position].latitude
+    }
+    override fun getItemCount(): Int = places.size
+}
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesViewHolder.kt b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesViewHolder.kt
new file mode 100644
index 0000000..745cdb2
--- /dev/null
+++ b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesViewHolder.kt
@@ -0,0 +1,14 @@
+package uca.baptistearthur.geocaching.recyclerview
+
+import android.view.View
+import android.widget.Button
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import uca.baptistearthur.geocaching.R
+
+class PlacesViewHolder(val cellule: View): ViewHolder(cellule) {
+
+    var placeDeleteButton: Button = cellule.findViewById(R.id.btnDeletePlace)
+    var placeText: TextView = cellule.findViewById(R.id.txtPlaceName)
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripViewHolder.kt b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripViewHolder.kt
index d87236b..a6bd2b8 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripViewHolder.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripViewHolder.kt
@@ -1,12 +1,27 @@
 package uca.baptistearthur.geocaching.recyclerview
 
+import android.util.Log
 import android.view.View
 import android.widget.Button
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import uca.baptistearthur.geocaching.R
+import uca.baptistearthur.geocaching.model.RoadTrip
+import uca.baptistearthur.geocaching.services.FragmentService
+import uca.baptistearthur.geocaching.ui.activity.MainWindow
+import uca.baptistearthur.geocaching.ui.fragment.DetailledRoadTripFragment
 
 class RoadTripViewHolder(val cellule: View): ViewHolder(cellule) {
 
     var roadTripAccessButton: Button = cellule.findViewById(R.id.btnGetRoadTripsInfo)
 
+    init{
+        roadTripAccessButton.setOnClickListener{
+            val roadTripName = roadTripAccessButton.text.substring(3)
+            Log.d("RoadTripViewHolder", "RoadTripViewHolder clicked: ${roadTripName}")
+
+//            val roadTrip: RoadTrip = Find roadtrip by name here
+//            FragmentService().loadFragment(DetailledRoadTripFragment(roadTrip), (cellule.context as MainWindow).supportFragmentManager)
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/services/FragmentService.kt b/app/src/main/java/uca/baptistearthur/geocaching/services/FragmentService.kt
new file mode 100644
index 0000000..37359f6
--- /dev/null
+++ b/app/src/main/java/uca/baptistearthur/geocaching/services/FragmentService.kt
@@ -0,0 +1,16 @@
+package uca.baptistearthur.geocaching.services
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import uca.baptistearthur.geocaching.R
+import uca.baptistearthur.geocaching.ui.fragment.DetailledRoadTripFragment
+
+class FragmentService {
+
+    fun loadFragment(fragment: Fragment, supportFragmentManager: FragmentManager){
+        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/ui/activity/MainWindow.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt
index 7cc7524..b38938c 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt
@@ -2,15 +2,10 @@ package uca.baptistearthur.geocaching.ui.activity
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import uca.baptistearthur.geocaching.R
-import uca.baptistearthur.geocaching.model.RoadTrip
-import uca.baptistearthur.geocaching.recyclerview.RoadTripAdapter
+import uca.baptistearthur.geocaching.services.FragmentService
 
 import uca.baptistearthur.geocaching.ui.fragment.Map
 import uca.baptistearthur.geocaching.ui.fragment.RoadTripFragment
@@ -24,18 +19,20 @@ class MainWindow: AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.main_window)
 
+        val fragmentService = FragmentService()
+
 //        Bottom menu
-        loadFragment(Map())
+        fragmentService.loadFragment(Map(), supportFragmentManager)
         val navigation = findViewById<BottomNavigationView>(R.id.bottom_navigation)
         navigation.selectedItemId= R.id.map
         navigation.setOnItemSelectedListener {
             when (it.itemId) {
                 R.id.map -> {
-                    loadFragment(map)
+                    fragmentService.loadFragment(map, supportFragmentManager)
                     true
                 }
                 R.id.roadTrip -> {
-                    loadFragment(RoadTripFragment())
+                    fragmentService.loadFragment(RoadTripFragment(), supportFragmentManager)
                     true
                 }
                 else -> false
@@ -43,10 +40,4 @@ class MainWindow: AppCompatActivity() {
         }
     }
 
-    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/ui/fragment/DetailledRoadTripFragment.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/DetailledRoadTripFragment.kt
new file mode 100644
index 0000000..e10fa9d
--- /dev/null
+++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/DetailledRoadTripFragment.kt
@@ -0,0 +1,68 @@
+package uca.baptistearthur.geocaching.ui.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import uca.baptistearthur.geocaching.R
+import uca.baptistearthur.geocaching.model.RoadTrip
+import uca.baptistearthur.geocaching.recyclerview.PlacesAdapter
+import uca.baptistearthur.geocaching.recyclerview.RoadTripAdapter
+
+// 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 [RoadTrip.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class DetailledRoadTripFragment(val roadTrip: RoadTrip): Fragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+    private var placesRecyclerView : RecyclerView? = 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? {
+        val view = inflater.inflate(R.layout.fragment_detailled_roadtrip, container, false)
+
+        placesRecyclerView = view?.findViewById(R.id.recyclerViewPlacesList)
+        placesRecyclerView?.adapter = PlacesAdapter(roadTrip.places)
+        placesRecyclerView?.layoutManager = LinearLayoutManager(context)
+
+        return view
+    }
+
+    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) =
+            RoadTripFragment().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/ui/fragment/RoadTripFragment.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTripFragment.kt
index 40fc0db..a3870a6 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTripFragment.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTripFragment.kt
@@ -2,6 +2,7 @@ package uca.baptistearthur.geocaching.ui.fragment
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.util.Log
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
@@ -14,6 +15,8 @@ import uca.baptistearthur.geocaching.R
 import uca.baptistearthur.geocaching.data.Stub
 import uca.baptistearthur.geocaching.model.RoadTrip
 import uca.baptistearthur.geocaching.recyclerview.RoadTripAdapter
+import uca.baptistearthur.geocaching.services.FragmentService
+import uca.baptistearthur.geocaching.ui.activity.MainWindow
 import java.util.*
 
 // TODO: Rename parameter arguments, choose names that match
@@ -44,7 +47,7 @@ class RoadTripFragment : Fragment() {
         }
     }
 
-    @SuppressLint("NotifyDataSetChanged")
+    @SuppressLint("MissingInflatedId")
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(R.layout.fragment_roadtrip, container, false)
 
@@ -56,17 +59,24 @@ class RoadTripFragment : Fragment() {
         buttonAddNewRoadTrip = view?.findViewById(R.id.buttonAddNewRoadTrip)
 
         buttonAddNewRoadTrip?.setOnClickListener {
-            val roadTripName = editTextRoadTripName?.text.toString()
-            editTextRoadTripName?.text?.clear()
-            val roadTrip = RoadTrip(roadTripName, Date(), mutableListOf())
-            model.add(roadTrip)
-            roadTripRecyclerView?.adapter?.notifyDataSetChanged()
+            addRoadTrip(editTextRoadTripName!!, roadTripRecyclerView!!)
         }
 
-            return view
+        return view
     }
 
-
+    @SuppressLint("NotifyDataSetChanged")
+    fun addRoadTrip(editText: EditText, recyclerView: RecyclerView) {
+        val roadTripName = editText.text.toString().trim()
+        if(roadTripName.isNotEmpty() && roadTripName.length <= 20){
+            editText.text?.clear()
+            val roadTrip = RoadTrip(roadTripName, Date(), mutableListOf())
+            model.add(roadTrip)
+            recyclerView.adapter?.notifyDataSetChanged()
+        }else{
+            editText.error = "Le nom du voyage doit être compris entre 1 et 20 caractères."
+        }
+    }
 
 
     companion object {
diff --git a/app/src/main/res/layout/cell_place.xml b/app/src/main/res/layout/cell_place.xml
new file mode 100644
index 0000000..b1f5495
--- /dev/null
+++ b/app/src/main/res/layout/cell_place.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/txtPlaceName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="> TMP/ Place Name"
+        android:textColor="@color/black"
+        android:padding="5dp"
+        android:textSize="17sp"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp" />
+
+    <Button
+        android:id="@+id/btnDeletePlace"
+        android:layout_width="50dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="X"
+        android:backgroundTint="@color/main_turquoise_200"
+        />
+
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_detailled_roadtrip.xml b/app/src/main/res/layout/fragment_detailled_roadtrip.xml
new file mode 100644
index 0000000..8fb1614
--- /dev/null
+++ b/app/src/main/res/layout/fragment_detailled_roadtrip.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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=".ui.fragment.DetailledRoadTripFragment"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="TMP/ Roadtrip Name"
+        android:background="@color/main_turquoise_200"
+        android:textColor="@color/main_turquoise_50"
+        android:padding="10dp"
+        android:textSize="20sp"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/placesList"
+        android:textColor="@color/main_turquoise_200"
+        android:padding="5dp"
+        android:textSize="17sp"/>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerViewPlacesList"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+    />
+
+    <Button
+        android:id="@+id/btnDeleteRoadTrip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/btnDeleteRoadTrip"
+        android:backgroundTint="@color/main_turquoise_500"
+        android:layout_margin="10dp"/>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0418ad3..96929e0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,6 +5,8 @@
     <string name="roadtrip_title">Mes RoadTrips:</string>
     <string name="add_roadtrip_button">+</string>
     <string name="textaddNewRoadTrip">Entrez le nom du nouveau voyage</string>
+    <string name="placesList">Vos lieux à visiter:</string>
+    <string name="btnDeleteRoadTrip">Supprimer le voyage</string>
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
-- 
2.36.3