diff options
Diffstat (limited to 'androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared')
3 files changed, 13 insertions, 21 deletions
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt index 88cb422..e99b8e6 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt @@ -25,6 +25,7 @@ object MarkerTransformations { fun markerTypeToResourceId(markerType: Marker.Type): Int { return when (markerType) { Marker.Type.ANIMAL -> R.drawable.map_animal + Marker.Type.BACKHOE -> R.drawable.map_backhoe Marker.Type.BICYCLE -> R.drawable.map_bicycle Marker.Type.BOAT -> R.drawable.map_boat Marker.Type.BUS -> R.drawable.map_bus @@ -55,6 +56,7 @@ object MarkerTransformations { private fun markerTypeToStringId(markerType: Marker.Type): Int { return when (markerType) { Marker.Type.ANIMAL -> R.string.unit_category_animal + Marker.Type.BACKHOE -> R.string.unit_category_backhoe Marker.Type.BICYCLE -> R.string.unit_category_bicycle Marker.Type.BOAT -> R.string.unit_category_boat Marker.Type.BUS -> R.string.unit_category_bus diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/UnitRenderData.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/UnitRenderData.kt index 340371a..6e96552 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/UnitRenderData.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/UnitRenderData.kt @@ -90,27 +90,16 @@ class UnitRenderData { } /* Status icon */ - when (unit.getStatus()) { - UnitInformation.Status.ONLINE -> { - statusIcon.setColorFilter( - ContextCompat.getColor(context, R.color.colorOnline) - ) - } - UnitInformation.Status.OFFLINE -> { - statusIcon.setColorFilter( - ContextCompat.getColor(context, R.color.colorOffline) - ) - } - else -> { - statusIcon.setColorFilter(Color.GRAY) - } - } - - /* Ignition icon */ - ignitionIcon.visibility = if (unit.getIgnition()) { - View.VISIBLE + if (unit.getIgnition()) { + statusIcon.setColorFilter( + ContextCompat.getColor(context, R.color.colorOnline) + ) + statusIcon.contentDescription = context.getString(R.string.unit_ignition_on) } else { - View.GONE + statusIcon.setColorFilter( + ContextCompat.getColor(context, R.color.colorOffline) + ) + statusIcon.contentDescription = context.getString(R.string.unit_ignition_off) } /* Engine stop */ diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt index fefb67e..dfe0681 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt @@ -39,7 +39,8 @@ class Utils { popOver.setOnMenuItemClickListener { item -> val layer = when (item.itemId) { R.id.layerStreets -> MapLayer.Type.STREETS - R.id.layerSatellite -> MapLayer.Type.SATELLITE + R.id.layerGmapsStreets -> MapLayer.Type.GMAPS_STREETS + R.id.layerGmapsSatellite -> MapLayer.Type.GMAPS_SATELLITE else -> MapLayer.Type.STREETS } callback(layer) |