karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Marker: replaced orange pushpin.

Browse Source
This commit is contained in:
Dennis Guse
2025-06-24 23:44:08 +02:00
parent 90446639b0
commit 7b4ab81f5c
5 changed files with 4 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java
+1 -1
View File
@@ -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);
src/main/java/de/dennisguse/opentracks/ui/markers/MarkerUtils.java
+1 -3
View File
@@ -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);
}
/**
src/main/res/drawable/ic_marker_orange_pushpin_with_shadow.xml
-59
View File
@@ -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>
src/main/res/layout/marker_edit.xml
+2 -2
View File
@@ -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>