Pass overlay top margin and whether should show layer toggle as arguments for MapWrapperFragment, and refactored stuff

1 files changed, 3 insertions, 12 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
index adc0cb9..9fcef7f 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
@@ -19,7 +19,7 @@ import mx.trackermap.TrackerMap.android.databinding.UnitsActivityBinding
 import mx.trackermap.TrackerMap.android.devices.DevicesFragment
 import mx.trackermap.TrackerMap.android.map.UnitMapFragment
 import mx.trackermap.TrackerMap.android.session.UserInformationActivity
-import mx.trackermap.TrackerMap.client.models.MapLayer
+import mx.trackermap.TrackerMap.android.shared.Utils
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import kotlin.time.ExperimentalTime
 
@@ -94,18 +94,9 @@ class UnitsActivity : AppCompatActivity() {
     }
 
     private fun showLayersPopUp(view: View) {
-        val popOver = PopupMenu(this, view)
-        popOver.menuInflater.inflate(R.menu.map_layers, popOver.menu)
-        popOver.setOnMenuItemClickListener { item ->
-            val layer = when (item.itemId) {
-                R.id.layerStreets -> MapLayer.Type.STREETS
-                R.id.layerSatellite -> MapLayer.Type.SATELLITE
-                else -> MapLayer.Type.STREETS
-            }
-            unitsViewModel.setMapLayerType(layer)
-            true
+        Utils.showLayersPopUp(this, view) {
+            unitsViewModel.setMapLayerType(it)
         }
-        popOver.show()
     }
 
     private fun unfocusSearch(clearText: Boolean = false) {