diff options
| author | Iván Ávalos <avalos@disroot.org> | 2022-01-29 22:33:13 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2022-01-29 22:33:13 -0600 |
| commit | 3f4400be135ee50b9da9c9aa7e709b04b26f80ac (patch) | |
| tree | bb858c409a22d2176aecbe8f7774043d92723916 /androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt | |
| parent | 4ff1b200f12fc335abd1f0f6117649f50b3968ce (diff) | |
| download | etbsa-trackermap-mobile-3f4400be135ee50b9da9c9aa7e709b04b26f80ac.tar.gz etbsa-trackermap-mobile-3f4400be135ee50b9da9c9aa7e709b04b26f80ac.tar.bz2 etbsa-trackermap-mobile-3f4400be135ee50b9da9c9aa7e709b04b26f80ac.zip | |
Moved MarkerType to Marker.Type in shared module
Diffstat (limited to 'androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt')
| -rw-r--r-- | androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt | 9 |
1 files changed, 4 insertions, 5 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 a07f054..b04bfbc 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 @@ -40,7 +40,6 @@ 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 typealias SetupCallback = () -> Unit typealias MarkerCallback = (Int?) -> Unit @@ -203,9 +202,9 @@ open class MapFragment : GlobeMapFragment() { screenMarker.image = if (isReport) { // For reports, position, start and end, icons must be different when (i) { - 0 -> getIcon(MarkerType.REPORT_START) - markers.size - 1 -> getIcon(MarkerType.REPORT_END) - else -> getIcon(MarkerType.REPORT_POSITION) + 0 -> getIcon(Marker.Type.REPORT_START) + markers.size - 1 -> getIcon(Marker.Type.REPORT_END) + else -> getIcon(Marker.Type.REPORT_POSITION) } } else getIcon(marker.type) screenMarker.size = if (isReport) { @@ -421,7 +420,7 @@ open class MapFragment : GlobeMapFragment() { } } - private fun getIcon(markerType: MarkerType): Bitmap { + private fun getIcon(markerType: Marker.Type): Bitmap { return ResourcesCompat.getDrawable( requireActivity().resources, MarkerTransformations.markerTypeToResourceId(markerType), |