Merge remote-tracking branch 'origin/master'

app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt

@@ -0,0 +1,6 @@
+package uca.baptistearthur.geocaching.model
+
+class Stub {
+
+
+}

app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt

@@ -4,14 +4,14 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import com.google.android.material.bottomnavigation.BottomNavigationView
-
 import uca.baptistearthur.geocaching.R
 import uca.baptistearthur.geocaching.ui.fragment.Map
+import uca.baptistearthur.geocaching.ui.fragment.RoadTrip
 
 class MainWindow: AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
 
-        val map = Map();
+        val map = Map()
 
         super.onCreate(savedInstanceState)
         setContentView(R.layout.main_window)
@@ -21,16 +21,12 @@ class MainWindow: AppCompatActivity() {
         navigation.selectedItemId= R.id.map
         navigation.setOnItemSelectedListener {
             when (it.itemId) {
-//                R.id.profile -> {
-//                    loadFragment(Profile())
-//                    true
-//                }
                 R.id.map -> {
                     loadFragment(map)
                     true
                 }
                 R.id.roadTrip -> {
-                    loadFragment(uca.baptistearthur.geocaching.ui.fragment.RoadTrip())
+                    loadFragment(RoadTrip())
                     true
                 }
                 else -> false

app/src/main/res/layout-land/main_window.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<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">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="10dp"
+        android:layout_weight="1"
+        android:background="@color/main_turquoise_700"
+        android:paddingLeft="20dp"
+        android:gravity="center_vertical"
+        android:text="@string/app_name"
+        android:textColor="@color/main_turquoise_50"
+        android:textSize="20sp"
+        android:textStyle="bold" />
+
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="8"/>
+
+    <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>

app/src/main/res/layout/fragment_roadtrip.xml

@@ -5,9 +5,10 @@
     android:layout_height="match_parent"
     tools:context=".ui.fragment.RoadTrip">
 
-    <TextView
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerViewRoadTripList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:text="Mes voyages !" />
+    />
 
 </FrameLayout>