aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-01-13 04:18:54 -0600
committerIván Ávalos <avalos@disroot.org>2022-01-13 04:18:54 -0600
commit15c8f18da01b661d4f23dc25bee0b4b31355bbea (patch)
tree28b4e3f62bc8e707572e9710675e92f741fc3113 /androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt
parent5e07a10d16501ec047a021ddef52d22474375a2a (diff)
downloadetbsa-trackermap-mobile-15c8f18da01b661d4f23dc25bee0b4b31355bbea.tar.gz
etbsa-trackermap-mobile-15c8f18da01b661d4f23dc25bee0b4b31355bbea.tar.bz2
etbsa-trackermap-mobile-15c8f18da01b661d4f23dc25bee0b4b31355bbea.zip
Added device icon to unit_item.xml (+ a11y) and moved category logic to MarkerTransformations
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.kt29
1 files changed, 2 insertions, 27 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 002b981..34ff655 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
@@ -317,32 +317,7 @@ class MapFragment : GlobeMapFragment() {
private fun getIcon(markerType: MarkerType): Bitmap {
return ResourcesCompat.getDrawable(
activity!!.resources,
- when (markerType) {
- MarkerType.ANIMAL -> R.drawable.map_animal
- MarkerType.BICYCLE -> R.drawable.map_bicycle
- MarkerType.BOAT -> R.drawable.map_boat
- MarkerType.BUS -> R.drawable.map_bus
- MarkerType.CAR -> R.drawable.map_car
- MarkerType.CRANE -> R.drawable.map_crane
- MarkerType.DEFAULT -> R.drawable.map_default
- MarkerType.HELICOPTER -> R.drawable.map_helicopter
- MarkerType.MOTORCYCLE -> R.drawable.map_motorcycle
- MarkerType.OFFROAD -> R.drawable.map_offroad
- MarkerType.PERSON -> R.drawable.map_person
- MarkerType.PICKUP -> R.drawable.map_pickup
- MarkerType.PLANE -> R.drawable.map_plane
- MarkerType.SCOOTER -> R.drawable.map_scooter
- MarkerType.SHIP -> R.drawable.map_ship
- MarkerType.TRACTOR -> R.drawable.map_tractor
- MarkerType.TRAIN -> R.drawable.map_train
- MarkerType.TRAM -> R.drawable.map_tram
- MarkerType.TROLLEYBUS -> R.drawable.map_trolleybus
- MarkerType.TRUCK -> R.drawable.map_truck
- MarkerType.VAN -> R.drawable.map_van
-
- MarkerType.REPORT_POSITION -> R.drawable.map_report_position
- MarkerType.REPORT_START -> R.drawable.map_report_start
- MarkerType.REPORT_END -> R.drawable.map_report_end
- }, activity!!.theme)!!.toBitmap(144, 144)
+ MarkerTransformations.markerTypeToResourceId(markerType),
+ activity!!.theme)!!.toBitmap(144, 144)
}
} \ No newline at end of file