From 7b4ab81f5c70ba69c2e19c010f651b1fa1583138 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Tue, 24 Jun 2025 23:44:08 +0200
Subject: [PATCH] Marker: replaced orange pushpin.

---
 .../ic_marker_orange_pushpin_with_shadow.svg  | 116 ------------------
 .../ui/markers/MarkerDetailFragment.java      |   2 +-
 .../opentracks/ui/markers/MarkerUtils.java    |   4 +-
 .../ic_marker_orange_pushpin_with_shadow.xml  |  59 ---------
 src/main/res/layout/marker_edit.xml           |   4 +-
 5 files changed, 4 insertions(+), 181 deletions(-)
 delete mode 100644 drawable-svg/ic_marker_orange_pushpin_with_shadow.svg
 delete mode 100644 src/main/res/drawable/ic_marker_orange_pushpin_with_shadow.xml

diff --git a/drawable-svg/ic_marker_orange_pushpin_with_shadow.svg b/drawable-svg/ic_marker_orange_pushpin_with_shadow.svg
deleted file mode 100644
index 533defb76..000000000
--- a/drawable-svg/ic_marker_orange_pushpin_with_shadow.svg
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
-   version="1.1"
-   id="svg8"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="ic_marker_orange_pushpin_with_shadow.svg">
-  <defs
-     id="defs2">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient871"
-       
-       x1="91.712517"
-       y1="266.48581"
-       x2="95.902588"
-       y2="266.72339"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="rotate(22.027833,208.46275,168.26892)"
-       
-       
-       >
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop867" />
-      <stop
-         style="stop-color:#898d8d;stop-opacity:1"
-         offset="1"
-         id="stop869" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.49497475"
-     inkscape:cx="298.98541"
-     inkscape:cy="561.0427"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     inkscape:document-rotation="0"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1012"
-     inkscape:window-x="0"
-     inkscape:window-y="1080"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       d="m 108.52826,213.29755 a 56.035402,7.0061195 5.281088 0 0 -22.425508,2.5321 56.035402,7.0061195 5.281088 0 0 -0.233576,0.17697 l -0.206706,-0.0237 c -0.04471,0.11554 -0.07454,0.2314 -0.09612,0.34752 a 56.035402,7.0061195 5.281088 0 0 0.337963,1.58159 c 0.980726,1.70884 3.760629,3.46326 6.583579,5.2188 l -22.744347,15.50009 a 67.064653,11.556784 4.2275244 0 0 -39.967588,5.26867 67.064653,11.556784 4.2275244 0 0 -0.729154,0.57564 67.064653,11.556784 4.2275244 0 0 -2.754353,1.36358 67.064653,11.556784 4.2275244 0 0 38.908736,16.04324 l -32.176847,27.0646 52.228334,-24.74551 a 67.064653,11.556784 4.2275244 0 0 71.411147,-3.8186 67.064653,11.556784 4.2275244 0 0 0.72812,-0.57507 67.064653,11.556784 4.2275244 0 0 2.75539,-1.36415 67.064653,11.556784 4.2275244 0 0 -12.38374,-10.59818 40.033569,5.0733922 5.2502179 0 0 0.0563,-0.0369 40.033569,5.0733922 5.2502179 0 0 0.37672,-0.34325 l 22.45186,-15.30075 c 8.23597,-0.65161 17.65581,-1.47811 22.94433,-3.00957 a 56.035402,7.0061195 5.281088 0 0 2.65514,-1.03772 56.035402,7.0061195 5.281088 0 0 -46.08401,-12.26953 56.035402,7.0061195 5.281088 0 0 -41.6357,-2.54991 z"
-       style="fill:#333333;fill-opacity:0.49421525;stroke:#000000;stroke-width:0.138931px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.265501"
-       id="path839" />
-    <path
-       style="fill:url(#linearGradient871);fill-opacity:1;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.265501"
-       d="M 70.603317,174.30832 33.024148,288.94657 94.566672,183.19473 Z"
-       id="path865"
-       sodipodi:nodetypes="cccc" />
-    <ellipse
-       cx="144.42586"
-       cy="113.06232"
-       rx="70.318817"
-       ry="39.974442"
-       id="ellipse26"
-       style="fill:#d45500;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583"
-       transform="rotate(22.027833)" />
-    <ellipse
-       style="fill:#ff6600;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583"
-       id="ellipse30"
-       ry="39.974442"
-       rx="70.318817"
-       cy="105.23625"
-       cx="145.017"
-       transform="rotate(22.027833)" />
-    <path
-       id="rect28"
-       style="fill:#d45500;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583"
-       d="m 85.662408,24.322061 c -0.890996,8.350369 2.928035,17.133472 6.825491,25.923906 l -23.333902,57.672763 -0.730686,1.80598 0.248621,0.10059 a 42.43035,17.360788 22.027833 0 0 33.303948,30.10067 42.43035,17.360788 22.027833 0 0 44.86507,1.52585 l 0.13892,0.0562 0.24519,-0.60599 a 42.43035,17.360788 22.027833 0 0 0.59472,-1.15581 42.43035,17.360788 22.027833 0 0 0.37668,-1.24514 l 22.45185,-55.492655 c 9.28986,-2.66566 20.09069,-6.13552 24.76397,-13.17485 z" />
-    <ellipse
-       style="fill:#ff6600;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583"
-       id="path24"
-       ry="23.966745"
-       rx="59.409279"
-       cy="-10.262156"
-       cx="148.14029"
-       transform="rotate(22.027833)" />
-  </g>
-</svg>
diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java
index a350d4af6..d7849b972 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java
@@ -238,7 +238,7 @@ public class MarkerDetailFragment extends Fragment {
             viewBinding.markerDetailMarkerPhoto.setImageURI(marker.getPhotoUrl());
             handler.postDelayed(hideText, HIDE_TEXT_DELAY.toMillis());
         } else {
-            viewBinding.markerDetailMarkerPhoto.setImageResource(MarkerUtils.ICON_ID);
+            viewBinding.markerDetailMarkerPhoto.setImageDrawable(MarkerUtils.getDefaultPhoto(getContext()));
         }
 
         ListItemUtils.setTextView(getActivity(), viewBinding.markerDetailMarkerName, marker.getName(), hasPhoto);
diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerUtils.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerUtils.java
index 2dde157b7..b9316bff8 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerUtils.java
@@ -26,15 +26,13 @@ public class MarkerUtils {
 
     private static final String TAG = FileUtils.class.getSimpleName();
 
-    static final int ICON_ID = R.drawable.ic_marker_orange_pushpin_with_shadow;
-
     private static final String JPEG_EXTENSION = "jpeg";
 
     private MarkerUtils() {
     }
 
     public static Drawable getDefaultPhoto(@NonNull Context context) {
-        return ContextCompat.getDrawable(context, ICON_ID);
+        return ContextCompat.getDrawable(context, R.drawable.ic_marker_show_24dp);
     }
 
     /**
diff --git a/src/main/res/drawable/ic_marker_orange_pushpin_with_shadow.xml b/src/main/res/drawable/ic_marker_orange_pushpin_with_shadow.xml
deleted file mode 100644
index 4cc987c00..000000000
--- a/src/main/res/drawable/ic_marker_orange_pushpin_with_shadow.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="24.040403dp"
-    android:height="34dp"
-    android:viewportWidth="210"
-    android:viewportHeight="297">
-    <path
-        android:fillAlpha="0.49421525"
-        android:fillColor="#333333"
-        android:pathData="m108.528,213.298a56.035,7.006 5.281,0 0,-22.426 2.532,56.035 7.006,5.281 0,0 -0.234,0.177l-0.207,-0.024c-0.045,0.116 -0.075,0.231 -0.096,0.348a56.035,7.006 5.281,0 0,0.338 1.582c0.981,1.709 3.761,3.463 6.584,5.219l-22.744,15.5a67.065,11.557 4.228,0 0,-39.968 5.269,67.065 11.557,4.228 0,0 -0.729,0.576 67.065,11.557 4.228,0 0,-2.754 1.364,67.065 11.557,4.228 0,0 38.909,16.043l-32.177,27.065 52.228,-24.746a67.065,11.557 4.228,0 0,71.411 -3.819,67.065 11.557,4.228 0,0 0.728,-0.575 67.065,11.557 4.228,0 0,2.755 -1.364,67.065 11.557,4.228 0,0 -12.384,-10.598 40.034,5.073 5.25,0 0,0.056 -0.037,40.034 5.073,5.25 0,0 0.377,-0.343l22.452,-15.301c8.236,-0.652 17.656,-1.478 22.944,-3.01a56.035,7.006 5.281,0 0,2.655 -1.038,56.035 7.006,5.281 0,0 -46.084,-12.27 56.035,7.006 5.281,0 0,-41.636 -2.55z"
-        android:strokeWidth="0.138931"
-        android:strokeAlpha="0.265501"
-        android:strokeColor="#000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" />
-    <path
-        android:pathData="M70.603,174.308 L33.024,288.947 94.567,183.195Z"
-        android:strokeWidth="0.264583"
-        android:strokeAlpha="0.265501"
-        android:strokeColor="#000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="67.193245"
-                android:endY="217.31992"
-                android:startX="63.39815"
-                android:startY="215.52817"
-                android:type="linear">
-                <item
-                    android:color="#FFFFFFFF"
-                    android:offset="0" />
-                <item
-                    android:color="#FF898D8D"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#d45500"
-        android:fillType="evenOdd"
-        android:pathData="M26.293,132.603a39.974,70.319 112.028,1 0,130.371 52.747a39.974,70.319 112.028,1 0,-130.371 -52.747z"
-        android:strokeWidth="0.264583" />
-    <path
-        android:fillColor="#ff6600"
-        android:fillType="evenOdd"
-        android:pathData="M29.776,125.57a39.974,70.319 112.028,1 0,130.371 52.747a39.974,70.319 112.028,1 0,-130.371 -52.747z"
-        android:strokeWidth="0.264583" />
-    <path
-        android:fillColor="#d45500"
-        android:fillType="evenOdd"
-        android:pathData="m85.662,24.322c-0.891,8.35 2.928,17.133 6.825,25.924l-23.334,57.673 -0.731,1.806 0.249,0.101a42.43,17.361 22.028,0 0,33.304 30.101,42.43 17.361,22.028 0,0 44.865,1.526l0.139,0.056 0.245,-0.606a42.43,17.361 22.028,0 0,0.595 -1.156,42.43 17.361,22.028 0,0 0.377,-1.245l22.452,-55.493c9.29,-2.666 20.091,-6.136 24.764,-13.175z"
-        android:strokeWidth="0.264583" />
-    <path
-        android:fillColor="#ff6600"
-        android:fillType="evenOdd"
-        android:pathData="M86.103,23.766a23.967,59.409 112.028,1 0,110.145 44.564a23.967,59.409 112.028,1 0,-110.145 -44.564z"
-        android:strokeWidth="0.264583" />
-</vector>
diff --git a/src/main/res/layout/marker_edit.xml b/src/main/res/layout/marker_edit.xml
index e7a71b4ee..8247c037e 100644
--- a/src/main/res/layout/marker_edit.xml
+++ b/src/main/res/layout/marker_edit.xml
@@ -59,7 +59,6 @@ limitations under the License.
                         android:id="@+id/marker_edit_name"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:drawableStart="@drawable/ic_marker_orange_pushpin_with_shadow"
                         android:inputType="textCapSentences"
                         android:selectAllOnFocus="true" />
 
@@ -148,7 +147,8 @@ limitations under the License.
             <Button
                 android:id="@+id/marker_edit_done"
                 style="@style/BottomButton"
-                android:layout_gravity="end" />
+                android:layout_gravity="end"
+                android:text="@string/generic_save" />
         </LinearLayout>
     </LinearLayout>