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