From f0d51f3c1b81d208d354dc509bcfc22a6ca19eff Mon Sep 17 00:00:00 2001
From: babonneau <baptiste.bonneau@etu.uca.fr>
Date: Thu, 6 Apr 2023 09:54:23 +0200
Subject: [PATCH] application & database fixed. View modified (cell_place)

---
 app/src/main/AndroidManifest.xml              |  2 +
 .../geocaching/application/RTApplication.kt   | 18 +----
 .../geocaching/converters/Converters.kt       | 14 +++-
 .../geocaching/data/{Database.kt => BDD.kt}   | 17 +++--
 .../geocaching/recyclerview/PlacesAdapter.kt  |  3 +-
 .../recyclerview/PlacesViewHolder.kt          |  4 +-
 .../recyclerview/RoadTripAdapter.kt           |  3 +-
 .../geocaching/ui/activity/MainWindow.kt      |  1 +
 .../ui/fragment/RoadTripFragment.kt           | 11 +++-
 .../viewModels/RoadTripViewModel.kt           |  6 +-
 app/src/main/res/drawable/corner_radius.xml   | 20 ++++++
 app/src/main/res/layout/cell_one_roadtrip.xml |  1 -
 app/src/main/res/layout/cell_place.xml        | 66 +++++++++++++------
 app/src/main/res/layout/roadtrip_detail.xml   |  4 +-
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/strings.xml           |  2 +-
 16 files changed, 116 insertions(+), 57 deletions(-)
 rename app/src/main/java/uca/baptistearthur/geocaching/data/{Database.kt => BDD.kt} (58%)
 create mode 100644 app/src/main/res/drawable/corner_radius.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1db3331..958174a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
         tools:ignore="ScopedStorage" />
 
     <application
+        android:name=".application.RTApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -21,6 +22,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Geocaching"
+        android:enableOnBackInvokedCallback="true"
         tools:targetApi="31">
         <activity
             android:name=".ui.activity.MainWindow"
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/application/RTApplication.kt b/app/src/main/java/uca/baptistearthur/geocaching/application/RTApplication.kt
index d314a10..bb90148 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/application/RTApplication.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/application/RTApplication.kt
@@ -1,24 +1,10 @@
 package uca.baptistearthur.geocaching.application
 
 import android.app.Application
-import uca.baptistearthur.geocaching.data.Database
+import uca.baptistearthur.geocaching.data.BDD
 
 class RTApplication: Application() {
 
-//    val db: Database by lazy {
-//        Database.getInstance(this)
-//    }
-
-    //
-
-//    lateinit var db: Database
-//
-//    override fun onCreate() {
-//        super.onCreate()
-//
-//        // Initialiser la propriété db ici
-//        db = Database.getInstance(this) as Database
-//    }
-
+    val db: BDD by lazy { BDD.getInstance(this) }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/converters/Converters.kt b/app/src/main/java/uca/baptistearthur/geocaching/converters/Converters.kt
index 525ab4e..2d396ec 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/converters/Converters.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/converters/Converters.kt
@@ -1,12 +1,13 @@
 package uca.baptistearthur.geocaching.converters
 
-import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.room.TypeConverter
 import com.google.gson.Gson
+import com.google.gson.internal.bind.util.ISO8601Utils.format
 import com.google.gson.reflect.TypeToken
 import uca.baptistearthur.geocaching.model.Place
 import uca.baptistearthur.geocaching.model.RoadTripEntity
+import java.lang.String.format
+import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.util.*
 
@@ -40,5 +41,12 @@ class Converters {
 }
 
 fun Date.toFrenchFormat(): String {
-    return "${this.day}/${this.month}/${this.year} - ${this.hours}h${this.minutes}"
+
+    val day: String = if(this.date < 10) "0${this.date}" else "${this.date}"
+    val month: String = if(this.month < 10) "0${this.month}" else "${this.month}"
+    val year = "${this.year + 1900}"
+    val hours: String = if(this.hours < 10) "0${this.hours}" else "${this.hours}"
+    val minutes: String = if(this.minutes < 10) "0${this.minutes}" else "${this.minutes}"
+
+    return "$day/$month/$year - ${hours}h$minutes"
 }
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/data/Database.kt b/app/src/main/java/uca/baptistearthur/geocaching/data/BDD.kt
similarity index 58%
rename from app/src/main/java/uca/baptistearthur/geocaching/data/Database.kt
rename to app/src/main/java/uca/baptistearthur/geocaching/data/BDD.kt
index 60629d7..93bf533 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/data/Database.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/data/BDD.kt
@@ -3,24 +3,29 @@ package uca.baptistearthur.geocaching.data
 import android.content.Context
 import androidx.room.Room
 import androidx.room.RoomDatabase
+import androidx.room.Database
 import androidx.room.TypeConverters
 import uca.baptistearthur.geocaching.converters.Converters
 import uca.baptistearthur.geocaching.model.RoadTripEntity
 
-@androidx.room.Database(entities = arrayOf(RoadTripEntity::class), version=1)
+@Database(entities = [RoadTripEntity::class], version=1)
 @TypeConverters(Converters::class)
-abstract class Database : RoomDatabase(){
+abstract class BDD : RoomDatabase(){
 
     abstract fun roadTripDAO(): RoadTripDAO
 
     companion object{
-        private var INSTANCE: Database ?= null
-
-        fun getInstance(context: Context) =
+        private var INSTANCE: BDD ?= null
+        fun getInstance(context: Context): BDD =
             INSTANCE ?: synchronized(this){
-                val db = Room.databaseBuilder(context, Database::class.java, "roadTripDB").build()
+                val db = Room.databaseBuilder(context, BDD::class.java, "roadTripDB").build()
                 INSTANCE = db
+                INSTANCE!!
             }
+
+
+
+
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesAdapter.kt b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesAdapter.kt
index 2e3c2f8..0a2d5da 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesAdapter.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesAdapter.kt
@@ -16,7 +16,8 @@ class PlacesAdapter (val places: List<Place>) : RecyclerView.Adapter<PlacesViewH
 
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: PlacesViewHolder, position: Int) {
-        holder.placeText.text = "" + (position+1) + ") LAT: " + places[position].latitude + " - LONG: " + places[position].longitude
+        holder.placeName.text = "Ici sera le nom"
+        holder.placeAddress.text = "Ici sera l'adresse"
     }
     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
index 745cdb2..56302a2 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesViewHolder.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesViewHolder.kt
@@ -8,7 +8,7 @@ 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)
+    var placeName: TextView = cellule.findViewById(R.id.txtPlaceName)
+    var placeAddress: TextView = cellule.findViewById(R.id.txtPlaceAddress)
 
 }
\ 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 3fb49b0..7eb02c7 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt
@@ -21,4 +21,5 @@ class RoadTripAdapter(val voyages: List<RoadTripEntity>, val navController: NavC
         holder.clickedRoadTrip = voyages[position]
     }
     override fun getItemCount(): Int = voyages.size
-}
\ 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 320821d..84b8719 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
@@ -21,6 +21,7 @@ class MainWindow: AppCompatActivity() {
 //        RoadTripViewModelFactory((this.application as RTApplication).db.roadTripDAO())
 //    }
 
+
     @SuppressLint("MissingInflatedId")
     override fun onCreate(savedInstanceState: Bundle?) {
 
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 74b045c..fd4c9a9 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
@@ -8,13 +8,18 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.EditText
+import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import uca.baptistearthur.geocaching.R
+import uca.baptistearthur.geocaching.application.RTApplication
 import uca.baptistearthur.geocaching.data.Stub
 import uca.baptistearthur.geocaching.model.RoadTripEntity
 import uca.baptistearthur.geocaching.recyclerview.RoadTripAdapter
+import uca.baptistearthur.geocaching.ui.activity.MainWindow
+import uca.baptistearthur.geocaching.viewModels.RoadTripViewModel
+import uca.baptistearthur.geocaching.viewModels.RoadTripViewModelFactory
 import java.util.*
 
 // TODO: Rename parameter arguments, choose names that match
@@ -31,8 +36,12 @@ 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 model = Stub().load()
+
+//    private val roadTripViewModel: RoadTripViewModel by viewModels<RoadTripViewModel> {
+//        RoadTripViewModelFactory((MainWindow().application as RTApplication).db.roadTripDAO()) // MainWindow().application ????? bof bof
+//    }
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/viewModels/RoadTripViewModel.kt b/app/src/main/java/uca/baptistearthur/geocaching/viewModels/RoadTripViewModel.kt
index 656ac4f..ea5060f 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/viewModels/RoadTripViewModel.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/viewModels/RoadTripViewModel.kt
@@ -1,7 +1,7 @@
 package uca.baptistearthur.geocaching.viewModels
 
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.asLiveData
+//import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.launch
 import uca.baptistearthur.geocaching.data.RoadTripDAO
@@ -9,9 +9,9 @@ import uca.baptistearthur.geocaching.model.RoadTripEntity
 
 class RoadTripViewModel(val dao: RoadTripDAO): ViewModel() {
 
-    fun getRoadTripById(id: Int) = dao.getRoadTripById(id).asLiveData()
+    fun getRoadTripById(id: Int) = dao.getRoadTripById(id)//.asLiveData()
 
-    fun getAllRoadTrips() = dao.getAllRoadTrips().asLiveData()
+    fun getAllRoadTrips() = dao.getAllRoadTrips()//.asLiveData()
 
     fun insertRoadTrip(r: RoadTripEntity){
         viewModelScope.launch {
diff --git a/app/src/main/res/drawable/corner_radius.xml b/app/src/main/res/drawable/corner_radius.xml
new file mode 100644
index 0000000..938ae06
--- /dev/null
+++ b/app/src/main/res/drawable/corner_radius.xml
@@ -0,0 +1,20 @@
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"   >
+
+    <solid
+        android:color="@color/gray" >
+    </solid>
+
+    <padding
+        android:left="5dp"
+        android:top="5dp"
+        android:right="5dp"
+        android:bottom="5dp"    >
+    </padding>
+
+    <corners
+        android:radius="11dp"   >
+    </corners>
+
+</shape>
diff --git a/app/src/main/res/layout/cell_one_roadtrip.xml b/app/src/main/res/layout/cell_one_roadtrip.xml
index c233193..5d5c79c 100644
--- a/app/src/main/res/layout/cell_one_roadtrip.xml
+++ b/app/src/main/res/layout/cell_one_roadtrip.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="45dp"
     android:layout_gravity="start"
-    android:backgroundTint="@color/white"
     android:drawableStart="@drawable/right_arrow"
     android:drawableLeft="@drawable/right_arrow"
     android:gravity="left"
diff --git a/app/src/main/res/layout/cell_place.xml b/app/src/main/res/layout/cell_place.xml
index 1fb7913..10ab788 100644
--- a/app/src/main/res/layout/cell_place.xml
+++ b/app/src/main/res/layout/cell_place.xml
@@ -4,26 +4,50 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginRight="10dp"
-    android:layout_marginLeft="10dp">
-
-        <TextView
-            android:id="@+id/txtPlaceName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1) LAT: 49.264562 - LONG: 48.5485248"
-            android:textSize="17sp"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            android:textColor="@color/main_turquoise_500"
-            />
-
-        <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"
-            />
+    android:layout_marginLeft="10dp"
+    android:layout_margin="5dp"
+    android:background="@drawable/corner_radius"
+    >
+
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_margin="10dp"
+        android:src="@drawable/center" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            >
+
+                <TextView
+                    android:id="@+id/txtPlaceName"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="TMP/ ici c'est le nom"
+                    android:layout_weight="1"
+                    android:textSize="17dp"
+                    android:textColor="@color/black"
+                    />
+
+                <TextView
+                    android:id="@+id/txtPlaceAddress"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="TMP/ ici c'est l'adresse"
+                    android:layout_weight="1"
+                    android:textSize="13dp"
+                    />
+
+
+        </LinearLayout>
+
+
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/roadtrip_detail.xml b/app/src/main/res/layout/roadtrip_detail.xml
index da576aa..5db53a9 100644
--- a/app/src/main/res/layout/roadtrip_detail.xml
+++ b/app/src/main/res/layout/roadtrip_detail.xml
@@ -37,7 +37,9 @@
         android:layout_height="match_parent"
         android:clickable="true"
         android:focusable="true"
-        android:layout_weight="1"/>
+        android:layout_weight="1"
+        android:background="@drawable/corner_radius"
+        android:layout_margin="5dp"/>
 
     <TextView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2c25fb7..c1f4892 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,6 +10,7 @@
     <color name="green">#FF3D7D3C</color>
     <color name="green_variant">#FF659964</color>
 
+    <color name="gray">#ececec</color>
     <color name="main_turquoise_700">#2f3e46</color>
     <color name="main_turquoise_500">#354f52</color>
     <color name="main_turquoise_200">#52796f</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 96929e0..b69cabd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <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="placesList">Lieux à visiter sur votre chemin:</string>
     <string name="btnDeleteRoadTrip">Supprimer le voyage</string>
 
     <!-- TODO: Remove or change this placeholder text -->