Merge branch “feature/marker-list-to-compose”

Author: Pygmalion69

app/build.gradle

@@ -168,6 +168,8 @@ dependencies {
     implementation 'androidx.activity:activity-compose:1.13.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0'
     implementation 'androidx.compose.runtime:runtime-livedata'
+    implementation 'androidx.compose.material:material-icons-core'
+    implementation 'androidx.compose.material:material-icons-extended'
 
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'

app/src/main/java/org/nitri/opentopo/CacheSettingsFragment.kt

@@ -117,7 +117,7 @@ class CacheSettingsFragment : DialogFragment() {
             // Required for Compose TextFields inside AppCompat AlertDialog.
             // Without this, Compose receives focus but the soft keyboard may not appear.
             dialog.window?.clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM)
-            dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+            dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
         }
 
         return dialog

app/src/main/java/org/nitri/opentopo/MapFragment.kt

@@ -57,6 +57,7 @@ import org.nitri.opentopo.util.MapOrientation
 import org.nitri.opentopo.util.OrientationSensor
 import org.nitri.opentopo.util.Utils
 import org.nitri.opentopo.view.AboutDialog
+import org.nitri.opentopo.view.MarkerEditorDialog
 import org.nitri.opentopo.viewmodel.LocationViewModel
 import org.nitri.opentopo.viewmodel.MarkerViewModel
 import org.nitri.ors.OrsClient
@@ -319,7 +320,7 @@ class MapFragment : Fragment(), LocationListener, PopupMenu.OnMenuItemClickListe
         locationOverlay?.isOptionsMenuEnabled = true
         compassOverlay?.enableCompass()
         mapView.visibility = View.VISIBLE
-        overlayHelper = OverlayHelper(hostActivity, mapView)
+        overlayHelper = OverlayHelper(hostActivity, mapView, parentFragmentManager)
         setTilesOverlay()
     }
 
@@ -328,6 +329,30 @@ class MapFragment : Fragment(), LocationListener, PopupMenu.OnMenuItemClickListe
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        parentFragmentManager.setFragmentResultListener(
+            MarkerEditorDialog.RESULT_REQUEST_KEY,
+            viewLifecycleOwner
+        ) { _, result ->
+            val markerId = result.getInt(MarkerEditorDialog.RESULT_MARKER_ID)
+            when (result.getString(MarkerEditorDialog.RESULT_ACTION)) {
+                MarkerEditorDialog.RESULT_ACTION_UPDATE -> {
+                    val currentMarker = markerViewModel.markers.value
+                        ?.firstOrNull { it.id == markerId }
+                        ?: return@setFragmentResultListener
+
+                    val updated = currentMarker.copy(
+                        name = result.getString(MarkerEditorDialog.RESULT_NAME).orEmpty(),
+                        description = result.getString(MarkerEditorDialog.RESULT_DESCRIPTION).orEmpty()
+                    )
+                    markerViewModel.updateMarker(updated)
+                }
+
+                MarkerEditorDialog.RESULT_ACTION_DELETE -> {
+                    markerViewModel.removeMarker(markerId)
+                }
+            }
+        }
+
         viewLifecycleOwner.lifecycleScope.launch {
             if (!mapViewInitialized) {
                 initializeMapView()