From 5008cea1652ca059c623ce53c147f57e3a4c4fde Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Sun, 26 Mar 2023 11:25:32 -0700 Subject: [PATCH] Remove the blue dot from the start/end markers. Just the pins. --- .../main/java/net/voussoir/trkpt/TrackFragment.kt | 10 +++++----- .../net/voussoir/trkpt/helpers/MapOverlayHelper.kt | 4 ++-- ...d_blue_48dp.xml => ic_marker_track_end_48dp.xml} | 3 --- .../ic_marker_track_end_starred_blue_36dp.xml | 10 ---------- .../ic_marker_track_end_starred_blue_48dp.xml | 13 ------------- ...blue_48dp.xml => ic_marker_track_start_48dp.xml} | 3 --- .../ic_marker_track_start_starred_blue_48dp.xml | 13 ------------- 7 files changed, 7 insertions(+), 49 deletions(-) rename app/src/main/res/drawable/{ic_marker_track_end_blue_48dp.xml => ic_marker_track_end_48dp.xml} (79%) delete mode 100644 app/src/main/res/drawable/ic_marker_track_end_starred_blue_36dp.xml delete mode 100644 app/src/main/res/drawable/ic_marker_track_end_starred_blue_48dp.xml rename app/src/main/res/drawable/{ic_marker_track_start_blue_48dp.xml => ic_marker_track_start_48dp.xml} (79%) delete mode 100644 app/src/main/res/drawable/ic_marker_track_start_starred_blue_48dp.xml diff --git a/app/src/main/java/net/voussoir/trkpt/TrackFragment.kt b/app/src/main/java/net/voussoir/trkpt/TrackFragment.kt index ba2260f..ed7944e 100644 --- a/app/src/main/java/net/voussoir/trkpt/TrackFragment.kt +++ b/app/src/main/java/net/voussoir/trkpt/TrackFragment.kt @@ -327,11 +327,6 @@ class TrackFragment : Fragment(), MapListener, YesNoDialog.YesNoDialogListener previous_time = trkpt.time } - for (pl in track_segment_overlays) - { - create_start_end_markers(requireContext(), mapView, pl.actualPoints.first() as Trkpt, pl.actualPoints.last() as Trkpt) - } - val pointTheme = SimplePointTheme(track_geopoints, false) val style = Paint() style.style = Paint.Style.FILL @@ -361,6 +356,11 @@ class TrackFragment : Fragment(), MapListener, YesNoDialog.YesNoDialogListener return } }) + + for (pl in track_segment_overlays) + { + create_start_end_markers(requireContext(), mapView, pl.actualPoints.first() as Trkpt, pl.actualPoints.last() as Trkpt) + } } fun new_track_segment_overlay(): Polyline diff --git a/app/src/main/java/net/voussoir/trkpt/helpers/MapOverlayHelper.kt b/app/src/main/java/net/voussoir/trkpt/helpers/MapOverlayHelper.kt index 74170ae..918604e 100644 --- a/app/src/main/java/net/voussoir/trkpt/helpers/MapOverlayHelper.kt +++ b/app/src/main/java/net/voussoir/trkpt/helpers/MapOverlayHelper.kt @@ -35,12 +35,12 @@ fun create_start_end_markers(context: Context, map_view: MapView, startpoint: Tr Log.i("VOUSSOIR", "MapOverlayHelper.create_start_end_markers") val overlayItems: ArrayList = ArrayList() val startmarker: OverlayItem = createOverlayItem(context, startpoint.latitude, startpoint.longitude, startpoint.accuracy, startpoint.provider, startpoint.time) - startmarker.setMarker(ContextCompat.getDrawable(context, R.drawable.ic_marker_track_start_blue_48dp)!!) + startmarker.setMarker(ContextCompat.getDrawable(context, R.drawable.ic_marker_track_start_48dp)!!) overlayItems.add(startmarker) if (startpoint != endpoint) { val endmarker: OverlayItem = createOverlayItem(context, endpoint.latitude, endpoint.longitude, endpoint.accuracy, endpoint.provider, endpoint.time) - endmarker.setMarker(ContextCompat.getDrawable(context, R.drawable.ic_marker_track_end_blue_48dp)!!) + endmarker.setMarker(ContextCompat.getDrawable(context, R.drawable.ic_marker_track_end_48dp)!!) overlayItems.add(endmarker) } val overlay: ItemizedIconOverlay = createOverlay(context, overlayItems) diff --git a/app/src/main/res/drawable/ic_marker_track_end_blue_48dp.xml b/app/src/main/res/drawable/ic_marker_track_end_48dp.xml similarity index 79% rename from app/src/main/res/drawable/ic_marker_track_end_blue_48dp.xml rename to app/src/main/res/drawable/ic_marker_track_end_48dp.xml index b490715..789e201 100644 --- a/app/src/main/res/drawable/ic_marker_track_end_blue_48dp.xml +++ b/app/src/main/res/drawable/ic_marker_track_end_48dp.xml @@ -3,9 +3,6 @@ android:height="48dp" android:viewportWidth="48" android:viewportHeight="48"> - diff --git a/app/src/main/res/drawable/ic_marker_track_end_starred_blue_36dp.xml b/app/src/main/res/drawable/ic_marker_track_end_starred_blue_36dp.xml deleted file mode 100644 index a7f8a30..0000000 --- a/app/src/main/res/drawable/ic_marker_track_end_starred_blue_36dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_marker_track_end_starred_blue_48dp.xml b/app/src/main/res/drawable/ic_marker_track_end_starred_blue_48dp.xml deleted file mode 100644 index ed296cf..0000000 --- a/app/src/main/res/drawable/ic_marker_track_end_starred_blue_48dp.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_marker_track_start_blue_48dp.xml b/app/src/main/res/drawable/ic_marker_track_start_48dp.xml similarity index 79% rename from app/src/main/res/drawable/ic_marker_track_start_blue_48dp.xml rename to app/src/main/res/drawable/ic_marker_track_start_48dp.xml index e2c427b..7937a4b 100644 --- a/app/src/main/res/drawable/ic_marker_track_start_blue_48dp.xml +++ b/app/src/main/res/drawable/ic_marker_track_start_48dp.xml @@ -3,9 +3,6 @@ android:height="48dp" android:viewportWidth="48" android:viewportHeight="48"> - diff --git a/app/src/main/res/drawable/ic_marker_track_start_starred_blue_48dp.xml b/app/src/main/res/drawable/ic_marker_track_start_starred_blue_48dp.xml deleted file mode 100644 index 285ca99..0000000 --- a/app/src/main/res/drawable/ic_marker_track_start_starred_blue_48dp.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - -