From f7a872066921bac3326e415e2df592183fdabf8c Mon Sep 17 00:00:00 2001
From: clement <clement@clement-turlure.fr>
Date: Mon, 8 Jul 2024 11:20:50 +0200
Subject: [PATCH] Add new activity to list actual marker for future edit in a
 form

---
 app/build.gradle.kts                          |  1 +
 app/src/main/AndroidManifest.xml              |  5 ++-
 .../main/java/com/example/busroute/BusStop.kt |  1 +
 .../java/com/example/busroute/MainActivity.kt | 13 ++++++--
 .../com/example/busroute/ValidateMarker.kt    | 31 +++++++++++++++++++
 app/src/main/res/layout/marker_form.xml       | 11 +++++++
 gradle/libs.versions.toml                     |  2 ++
 7 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/com/example/busroute/ValidateMarker.kt
 create mode 100644 app/src/main/res/layout/marker_form.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5a0b632..8ed57cf 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -60,6 +60,7 @@ dependencies {
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
     implementation(libs.play.services.location)
+    implementation(libs.androidx.appcompat)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e3a8ddd..36e148a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,10 +23,13 @@
             android:theme="@style/Theme.BusRoute">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ValidateMarker"
+            android:parentActivityName=".MainActivity"
+            android:theme="@style/Theme.AppCompat"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/busroute/BusStop.kt b/app/src/main/java/com/example/busroute/BusStop.kt
index 53b448f..42201d6 100644
--- a/app/src/main/java/com/example/busroute/BusStop.kt
+++ b/app/src/main/java/com/example/busroute/BusStop.kt
@@ -1,6 +1,7 @@
 package com.example.busroute
 
 import org.osmdroid.views.overlay.Marker
+import java.io.Serializable
 
 data class BusStop(val marker: Marker){
     override fun toString(): String {
diff --git a/app/src/main/java/com/example/busroute/MainActivity.kt b/app/src/main/java/com/example/busroute/MainActivity.kt
index 3de94f7..8c7e278 100644
--- a/app/src/main/java/com/example/busroute/MainActivity.kt
+++ b/app/src/main/java/com/example/busroute/MainActivity.kt
@@ -62,6 +62,9 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         val dbHelper = DbHelper(this)
+        isLocationPermissionGranted()
+
+
         val geocoder = Geocoder(this, Locale.getDefault())
 
 
@@ -99,14 +102,20 @@ class MainActivity : ComponentActivity() {
         val saveMarkButton = findViewById<Button>(R.id.saveMark)
         saveMarkButton.setOnClickListener{
             val db = dbHelper.writableDatabase
+            var stringList: ArrayList<String> = ArrayList<String>()
             busStopList.forEach {
                 val values = ContentValues().apply {
                     put(StopContract.StopEntry.LATITUDE, it.marker.position.latitude)
                     put(StopContract.StopEntry.LONGITUDE, it.marker.position.longitude)
                     put(StopContract.StopEntry.ORDER, busStopList.indexOf(it))
                 }
-                val newRowId = db?.insert(StopContract.StopEntry.TABLE_NAME, null, values)
+                stringList.add(it.toString())
+                //val newRowId = db?.insert(StopContract.StopEntry.TABLE_NAME, null, values)
             }
+            val intent = Intent(saveMarkButton.context, ValidateMarker::class.java)
+            intent.putExtra(ValidateMarker.MARKERS, stringList)
+            startActivity(intent)
+
             val dbread = dbHelper.readableDatabase
             val projection = arrayOf(BaseColumns._ID, StopContract.StopEntry.LATITUDE, StopContract.StopEntry.LONGITUDE, StopContract.StopEntry.ORDER)
             val selection = ""
@@ -181,7 +190,7 @@ class MainActivity : ComponentActivity() {
         locationOverlay.enableFollowLocation()
         map.overlays.add(locationOverlay)
 
-        isLocationPermissionGranted()
+
 //        val locationClient = LocationServices.getFusedLocationProviderClient(this)
 //
 //        locationRequest = LocationRequest.Builder(Priority.PRIORITY_BALANCED_POWER_ACCURACY,60)
diff --git a/app/src/main/java/com/example/busroute/ValidateMarker.kt b/app/src/main/java/com/example/busroute/ValidateMarker.kt
new file mode 100644
index 0000000..ef8e470
--- /dev/null
+++ b/app/src/main/java/com/example/busroute/ValidateMarker.kt
@@ -0,0 +1,31 @@
+package com.example.busroute
+
+import android.content.ContentValues
+import android.os.Bundle
+import android.os.PersistableBundle
+import android.util.Log
+import android.widget.TableLayout
+import android.widget.TextView
+import androidx.activity.ComponentActivity
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.children
+import java.util.ArrayList
+
+class ValidateMarker: AppCompatActivity() {
+
+    companion object{
+        const val MARKERS = "MARKERS"
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.marker_form)
+        val table = findViewById<TableLayout>(R.id.table)
+        val markers: ArrayList<String>? = intent.extras?.getStringArrayList(MARKERS)
+        markers!!.forEach{
+            val text = TextView(this)
+            text.text = it
+            table.addView(text)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/marker_form.xml b/app/src/main/res/layout/marker_form.xml
new file mode 100644
index 0000000..3592f8f
--- /dev/null
+++ b/app/src/main/res/layout/marker_form.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TableLayout
+        android:id="@+id/table"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:padding="16dp" />
+</GridLayout>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1f37fa2..8bb17c3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,6 +9,7 @@ lifecycleRuntimeKtx = "2.8.2"
 activityCompose = "1.9.0"
 composeBom = "2024.06.00"
 playServicesLocation = "21.3.0"
+appcompat = "1.7.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -26,6 +27,7 @@ androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-man
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
 play-services-location = { group = "com.google.android.gms", name = "play-services-location", version.ref = "playServicesLocation" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }