From 367be18e85ce4050c6c349387319ed6f8ec33152 Mon Sep 17 00:00:00 2001
From: TiclemFR <grandfiston@gmail.com>
Date: Mon, 1 Jul 2024 15:01:18 +0200
Subject: [PATCH] Add Database helper, can save marker in stop table and read
 it

---
 .idea/deploymentTargetSelector.xml            |  2 +-
 .../main/java/com/example/busroute/BusStop.kt |  9 ++
 .../com/example/busroute/Database/DbHelper.kt | 27 ++++++
 .../com/example/busroute/Database/Path.kt     | 18 ++++
 .../com/example/busroute/Database/Stop.kt     | 22 +++++
 .../java/com/example/busroute/MainActivity.kt | 84 +++++++++++++------
 app/src/main/res/layout/main.xml              | 18 ++++
 7 files changed, 153 insertions(+), 27 deletions(-)
 create mode 100644 app/src/main/java/com/example/busroute/BusStop.kt
 create mode 100644 app/src/main/java/com/example/busroute/Database/DbHelper.kt
 create mode 100644 app/src/main/java/com/example/busroute/Database/Path.kt
 create mode 100644 app/src/main/java/com/example/busroute/Database/Stop.kt

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index e10fce1..48aaad1 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-06-28T17:12:31.815486600Z">
+        <DropdownSelection timestamp="2024-07-01T11:57:37.460926400Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=y5v4t4fiif555tnb" />
diff --git a/app/src/main/java/com/example/busroute/BusStop.kt b/app/src/main/java/com/example/busroute/BusStop.kt
new file mode 100644
index 0000000..53b448f
--- /dev/null
+++ b/app/src/main/java/com/example/busroute/BusStop.kt
@@ -0,0 +1,9 @@
+package com.example.busroute
+
+import org.osmdroid.views.overlay.Marker
+
+data class BusStop(val marker: Marker){
+    override fun toString(): String {
+        return "${this.marker.position.latitude} | ${this.marker.position.longitude}\n"
+    }
+}
diff --git a/app/src/main/java/com/example/busroute/Database/DbHelper.kt b/app/src/main/java/com/example/busroute/Database/DbHelper.kt
new file mode 100644
index 0000000..e2ded4e
--- /dev/null
+++ b/app/src/main/java/com/example/busroute/Database/DbHelper.kt
@@ -0,0 +1,27 @@
+package com.example.busroute.Database
+
+import android.content.Context
+import android.database.sqlite.SQLiteDatabase
+import android.database.sqlite.SQLiteOpenHelper
+
+class DbHelper(context: Context) : SQLiteOpenHelper(context, DATABASE_NAME, null, DATABASE_VERSION) {
+    override fun onCreate(db: SQLiteDatabase) {
+        db.execSQL(PathContract.SQL_CREATE_ENTRIES)
+        db.execSQL(StopContract.SQL_CREATE_ENTRIES)
+    }
+    override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+        // This database is only a cache for online data, so its upgrade policy is
+        // to simply to discard the data and start over
+        db.execSQL(PathContract.SQL_DELETE_ENTRIES)
+        db.execSQL(StopContract.SQL_DELETE_ENTRIES)
+        onCreate(db)
+    }
+    override fun onDowngrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+        onUpgrade(db, oldVersion, newVersion)
+    }
+    companion object {
+        // If you change the database schema, you must increment the database version.
+        const val DATABASE_VERSION = 1
+        const val DATABASE_NAME = "BusRoute.db"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/busroute/Database/Path.kt b/app/src/main/java/com/example/busroute/Database/Path.kt
new file mode 100644
index 0000000..a5c2e30
--- /dev/null
+++ b/app/src/main/java/com/example/busroute/Database/Path.kt
@@ -0,0 +1,18 @@
+package com.example.busroute.Database
+
+import android.provider.BaseColumns
+
+object PathContract {
+    // Table contents are grouped together in an anonymous object.
+    object PathEntry : BaseColumns {
+        const val TABLE_NAME = "path"
+        const val PATH_NAME = "name"
+    }
+
+    const val SQL_CREATE_ENTRIES =
+        "CREATE TABLE ${PathEntry.TABLE_NAME} (" +
+                "${BaseColumns._ID} INTEGER PRIMARY KEY," +
+                "${PathEntry.PATH_NAME} TEXT)"
+
+    const val SQL_DELETE_ENTRIES = "DROP TABLE IF EXISTS ${PathEntry.TABLE_NAME}"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/busroute/Database/Stop.kt b/app/src/main/java/com/example/busroute/Database/Stop.kt
new file mode 100644
index 0000000..971e406
--- /dev/null
+++ b/app/src/main/java/com/example/busroute/Database/Stop.kt
@@ -0,0 +1,22 @@
+package com.example.busroute.Database
+
+import android.provider.BaseColumns
+
+object StopContract {
+    // Table contents are grouped together in an anonymous object.
+    object StopEntry : BaseColumns {
+        const val TABLE_NAME = "stop"
+        const val LATITUDE = "latitude"
+        const val LONGITUDE = "longitude"
+        const val ORDER = "'order'"
+    }
+
+    const val SQL_CREATE_ENTRIES =
+        "CREATE TABLE ${StopEntry.TABLE_NAME} (" +
+                "${BaseColumns._ID} INTEGER PRIMARY KEY," +
+                "${StopEntry.LATITUDE} DOUBLE, "+
+                "${StopEntry.LONGITUDE} DOUBLE, "+
+                "${StopEntry.ORDER} INTEGER)"
+
+    const val SQL_DELETE_ENTRIES = "DROP TABLE IF EXISTS ${StopEntry.TABLE_NAME}"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/busroute/MainActivity.kt b/app/src/main/java/com/example/busroute/MainActivity.kt
index a331b5f..83c3530 100644
--- a/app/src/main/java/com/example/busroute/MainActivity.kt
+++ b/app/src/main/java/com/example/busroute/MainActivity.kt
@@ -1,6 +1,7 @@
 package com.example.busroute
 
 import android.annotation.SuppressLint
+import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -10,6 +11,7 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Looper
 import android.preference.PreferenceManager
+import android.provider.BaseColumns
 import android.util.Log
 import android.view.WindowManager
 import android.widget.Button
@@ -17,7 +19,8 @@ import android.widget.TextView
 import androidx.activity.ComponentActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import com.google.android.gms.location.FusedLocationProviderClient
+import com.example.busroute.Database.DbHelper
+import com.example.busroute.Database.StopContract
 import com.google.android.gms.location.LocationCallback
 import com.google.android.gms.location.LocationRequest
 import com.google.android.gms.location.LocationResult
@@ -37,14 +40,10 @@ import org.osmdroid.views.overlay.gestures.RotationGestureOverlay
 class MainActivity : ComponentActivity() {
     private val REQUEST_PERMISSIONS_REQUEST_CODE = 1
     private lateinit var map : MapView
-    private lateinit var fusedLocationClient: FusedLocationProviderClient
 
     private lateinit var currentLocation: Location
-    lateinit var locationManager: LocationManager
+    private lateinit var locationManager: LocationManager
     private lateinit var mapController: IMapController
-
-    private lateinit var locationByGps: Location
-    private lateinit var locationByNetwork: Location
     private lateinit var positionMarker: Marker
 
     private lateinit var locationCallback: LocationCallback
@@ -52,10 +51,13 @@ class MainActivity : ComponentActivity() {
 
     private var latitude = 0.0
     private var longitude = 0.0
+    private var busStopList: ArrayList<BusStop> = ArrayList()
+
     @SuppressLint("MissingPermission")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        val dbHelper = DbHelper(this)
 
         locationManager = getSystemService(Context.LOCATION_SERVICE) as LocationManager
         getInstance().load(this, PreferenceManager.getDefaultSharedPreferences(this))
@@ -71,12 +73,59 @@ class MainActivity : ComponentActivity() {
         addMarkButton.setOnClickListener{
             val marker = Marker(map)
             marker.position = GeoPoint(latitude, longitude)
-            marker.title = "MARK BUTTON !!"
+            marker.title = "Bus Stop " + busStopList.size+1
             marker.textLabelFontSize = 10
             marker.icon = ContextCompat.getDrawable(this, org.osmdroid.library.R.drawable.moreinfo_arrow)
             map.overlays.add(marker)
             map.invalidate()
+            busStopList.add(BusStop(marker))
+            Log.i("marker", busStopList.toString())
         }
+        val removeMarkButton = findViewById<Button>(R.id.removeMark)
+        removeMarkButton.setOnClickListener{
+            if(busStopList.size < 1){
+                return@setOnClickListener
+            }
+            val marker = busStopList.last()
+            marker.marker.remove(map)
+            busStopList.remove(marker)
+        }
+        val saveMarkButton = findViewById<Button>(R.id.saveMark)
+        saveMarkButton.setOnClickListener{
+            val db = dbHelper.writableDatabase
+            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)
+            }
+            val dbread = dbHelper.readableDatabase
+            val projection = arrayOf(BaseColumns._ID, StopContract.StopEntry.LATITUDE, StopContract.StopEntry.LONGITUDE, StopContract.StopEntry.ORDER)
+            val selection = ""
+            val selectionArgs = arrayOf("")
+            val sortOrder = "${StopContract.StopEntry.ORDER} ASC"
+            val cursor = dbread.query(
+                StopContract.StopEntry.TABLE_NAME,   // The table to query
+                projection,             // The array of columns to return (pass null to get all)
+                null,              // The columns for the WHERE clause
+                null,          // The values for the WHERE clause
+                null,                   // don't group the rows
+                null,                   // don't filter by row groups
+                sortOrder               // The sort order
+            )
+            val itemIds = mutableListOf<Long>()
+            with(cursor) {
+                while (moveToNext()) {
+                    val item = getString(getColumnIndexOrThrow(StopContract.StopEntry.LATITUDE))+getString(getColumnIndexOrThrow(StopContract.StopEntry.LONGITUDE))
+                    //itemIds.add(itemId)
+                }
+            }
+            cursor.close()
+        }
+
+
         val mapsButton = findViewById<Button>(R.id.maps)
         mapsButton.setOnClickListener{
             val mapIntentUri =
@@ -84,6 +133,7 @@ class MainActivity : ComponentActivity() {
             val mapIntent = Intent(Intent.ACTION_VIEW, mapIntentUri)
             mapIntent.setPackage("com.google.android.apps.maps")
             startActivity(mapIntent)
+
         }
 
         val rotationGestureOverlay = RotationGestureOverlay(map)
@@ -111,7 +161,7 @@ class MainActivity : ComponentActivity() {
                             location.provider = LocationManager.NETWORK_PROVIDER
                         }
                     }
-
+                    currentLocation = location
                     latitude = location.latitude
                     longitude = location.longitude
                     mapController.animateTo(GeoPoint(latitude, longitude))
@@ -191,22 +241,4 @@ class MainActivity : ComponentActivity() {
                 REQUEST_PERMISSIONS_REQUEST_CODE)
         }
     }
-
-
-    /*private fun requestPermissionsIfNecessary(String[] permissions) {
-        val permissionsToRequest = ArrayList<String>();
-        permissions.forEach { permission ->
-        if (ContextCompat.checkSelfPermission(this, permission)
-                != PackageManager.PERMISSION_GRANTED) {
-            // Permission is not granted
-            permissionsToRequest.add(permission);
-        }
-    }
-        if (permissionsToRequest.size() > 0) {
-            ActivityCompat.requestPermissions(
-                    this,
-                    permissionsToRequest.toArray(new String[0]),
-                    REQUEST_PERMISSIONS_REQUEST_CODE);
-        }
-    }*/
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 76f5f62..eb9769b 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -21,6 +21,24 @@
                 android:textColor="@color/black"
                 android:clickable="true"
                 android:text="Add marker" />
+            <Button
+                android:id="@+id/removeMark"
+                android:layout_width="150dp"
+                android:layout_height="wrap_content"
+                android:backgroundTint="@color/white"
+                android:focusable="true"
+                android:textColor="@color/black"
+                android:clickable="true"
+                android:text="Remove last marker" />
+            <Button
+                android:id="@+id/saveMark"
+                android:layout_width="150dp"
+                android:layout_height="wrap_content"
+                android:backgroundTint="@color/white"
+                android:focusable="true"
+                android:textColor="@color/black"
+                android:clickable="true"
+                android:text="Save Markers" />
             <Button
                 android:id="@+id/maps"
                 android:layout_width="150dp"