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

1 files changed, 9 insertions, 6 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
index 1a39ab1..768c0f0 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
@@ -6,8 +6,8 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.text.HtmlCompat
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
 import androidx.fragment.app.viewModels
 import kotlin.time.ExperimentalTime
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -16,7 +16,6 @@ import mx.trackermap.TrackerMap.android.databinding.UnitMapFragmentBinding
 import mx.trackermap.TrackerMap.android.details.DetailsActivity
 import mx.trackermap.TrackerMap.android.shared.UnitRenderData
 import mx.trackermap.TrackerMap.android.units.UnitsViewModel
-import mx.trackermap.TrackerMap.client.models.MapLayer
 import mx.trackermap.TrackerMap.client.models.UnitInformation
 
 @DelicateCoroutinesApi
@@ -61,10 +60,14 @@ class UnitMapFragment : Fragment() {
     }
 
     private fun initializeMap() {
-        shouldCenter = shouldCenter && unitsViewModel.selectedUnit.value == null
-        mapFragment = childFragmentManager.findFragmentById(R.id.unitsMap) as MapWrapperFragment
+        shouldCenter = true
+        mapFragment = MapWrapperFragment.newInstance(
+            overlayMarginTop = resources.getDimensionPixelSize(R.dimen.nav_height)
+        )
+        childFragmentManager.commit {
+            replace(R.id.unitsMap, mapFragment)
+        }
         mapFragment.setMarkerCallback(unitsViewModel::selectUnitWith)
-        mapFragment.setOverlayPaddingTop(resources.getDimensionPixelSize(R.dimen.nav_height))
     }
 
     private fun setupObservers() {
@@ -75,7 +78,7 @@ class UnitMapFragment : Fragment() {
             mapFragment.display(
                 units.toTypedArray(),
                 isReport = false,
-                center = shouldCenter
+                center = shouldCenter && unitsViewModel.selectedUnit.value == null
             )
             if (units.isNotEmpty()) {
                 shouldCenter = false