aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src/main/java
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-01-13 03:09:40 -0600
committerIván Ávalos <avalos@disroot.org>2022-01-13 03:09:40 -0600
commite4f46831685da5eeb927e2fa3c21dcd0374875c9 (patch)
tree604954f84c06042d8da158512fbc9e5865546c27 /androidApp/src/main/java
parent72d4b1005a885fee7b44bdfcdffa830b27c7d12b (diff)
downloadetbsa-trackermap-mobile-e4f46831685da5eeb927e2fa3c21dcd0374875c9.tar.gz
etbsa-trackermap-mobile-e4f46831685da5eeb927e2fa3c21dcd0374875c9.tar.bz2
etbsa-trackermap-mobile-e4f46831685da5eeb927e2fa3c21dcd0374875c9.zip
Replaced screen labels background with outline
Diffstat (limited to 'androidApp/src/main/java')
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt17
1 files changed, 10 insertions, 7 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 b8fbc57..ef1e27f 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
@@ -1,7 +1,6 @@
package mx.trackermap.TrackerMap.android.map
import android.graphics.Bitmap
-import android.graphics.Color
import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater
@@ -131,17 +130,18 @@ class MapFragment : GlobeMapFragment() {
}.toTypedArray()
val fontSize = context?.resources?.getDimensionPixelSize(R.dimen.marker_label_text_size)
- val reportColor = ContextCompat.getColor(context!!, R.color.colorReport)
- val labelColor = ContextCompat.getColor(context!!, R.color.colorMarkerLabel)
- val labelBgColor = ContextCompat.getColor(context!!, R.color.bgColorMarkerLabel)
+ 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 vectorInfo = VectorInfo()
- vectorInfo.setColor(reportColor)
+ vectorInfo.setColor(colorReport)
vectorInfo.setLineWidth(20.0f)
val labelInfo = LabelInfo()
- labelInfo.textColor = labelColor
- labelInfo.backgroundColor = labelBgColor
+ labelInfo.textColor = colorLabel
+ labelInfo.outlineColor = colorLabelOutline
+ labelInfo.outlineSize = 3.0f
fontSize?.let {
labelInfo.fontSize = it.toFloat()
}
@@ -233,6 +233,7 @@ class MapFragment : GlobeMapFragment() {
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 vectorInfo = VectorInfo()
vectorInfo.setColor(colorFill)
@@ -240,6 +241,8 @@ class MapFragment : GlobeMapFragment() {
val labelInfo = LabelInfo()
labelInfo.textColor = colorLabel
+ labelInfo.outlineColor = colorLabelOutline
+ labelInfo.outlineSize = 3.0f
fontSize?.let {
labelInfo.fontSize = it.toFloat()
}