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] 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