Moved MapFragment.Marker and MarkerTransformations functions to Marker model in shared module

1 files changed, 9 insertions, 16 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt
index a76ebde..a07f054 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt
@@ -38,6 +38,7 @@ import mx.trackermap.TrackerMap.android.R
 import mx.trackermap.TrackerMap.android.shared.MarkerTransformations
 import mx.trackermap.TrackerMap.client.models.Geofence
 import mx.trackermap.TrackerMap.client.models.MapLayer
+import mx.trackermap.TrackerMap.client.models.Marker
 import mx.trackermap.TrackerMap.utils.MapCalculus
 import mx.trackermap.TrackerMap.utils.MarkerType
 
@@ -48,14 +49,6 @@ open class MapFragment : GlobeMapFragment() {
 
     private var loader: QuadImageLoader? = null
 
-    data class Marker(
-        val id: Int,
-        val name: String,
-        val latitude: Double,
-        val longitude: Double,
-        val type: MarkerType = MarkerType.DEFAULT
-    )
-
     var hasStarted: Boolean = false
     val setupCallbacks = mutableListOf<SetupCallback>()
     var markerCallback: MarkerCallback? = null
@@ -185,9 +178,9 @@ open class MapFragment : GlobeMapFragment() {
         }.toTypedArray()
 
         val fontSize = context?.resources?.getDimensionPixelSize(R.dimen.marker_label_text_size)
-        val colorReport = ContextCompat.getColor(context!!, R.color.colorReport)
-        val colorLabel = ContextCompat.getColor(context!!, R.color.colorMarkerLabel)
-        val colorLabelOutline = ContextCompat.getColor(context!!, R.color.colorMarkerLabelOutline)
+        val colorReport = ContextCompat.getColor(requireContext(), R.color.colorReport)
+        val colorLabel = ContextCompat.getColor(requireContext(), R.color.colorMarkerLabel)
+        val colorLabelOutline = ContextCompat.getColor(requireContext(), R.color.colorMarkerLabelOutline)
         val vectorWidth = context?.resources?.getDimensionPixelSize(R.dimen.report_label_width)?.toFloat()
 
         val vectorInfo = VectorInfo()
@@ -291,9 +284,9 @@ open class MapFragment : GlobeMapFragment() {
         clear(true)
 
         val fontSize = context?.resources?.getDimensionPixelSize(R.dimen.marker_label_text_size)
-        val colorFill = ContextCompat.getColor(context!!, R.color.colorGeofence)
-        val colorLabel = ContextCompat.getColor(context!!, R.color.colorGeofenceLabel)
-        val colorLabelOutline = ContextCompat.getColor(context!!, R.color.colorMarkerLabelOutline)
+        val colorFill = ContextCompat.getColor(requireContext(), R.color.colorGeofence)
+        val colorLabel = ContextCompat.getColor(requireContext(), R.color.colorGeofenceLabel)
+        val colorLabelOutline = ContextCompat.getColor(requireContext(), R.color.colorMarkerLabelOutline)
         val vectorWidth = context?.resources?.getDimensionPixelSize(R.dimen.geofence_label_width)?.toFloat()
 
         val vectorInfo = VectorInfo()
@@ -430,8 +423,8 @@ open class MapFragment : GlobeMapFragment() {
 
     private fun getIcon(markerType: MarkerType): Bitmap {
         return ResourcesCompat.getDrawable(
-            activity!!.resources,
+            requireActivity().resources,
             MarkerTransformations.markerTypeToResourceId(markerType),
-            activity!!.theme)!!.toBitmap(144, 144)
+            requireActivity().theme)!!.toBitmap(144, 144)
     }
 }
\ No newline at end of file