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

Refactor: use marker instead of waypoint.

Browse Source 
Fixes #389.
This commit is contained in:
Dennis Guse
2020-09-23 17:16:34 +02:00
parent 8643b50bd1
commit e939778beb
29 changed files with 349 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/layout/marker_detail_fragment.xml
+7 -7
View File
@@ -18,7 +18,7 @@ limitations under the License.
android:layout_height="match_parent">
<ImageView
android:id="@+id/marker_detail_waypoint_photo"
android:id="@+id/marker_detail_marker_photo"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/image_photo_marker"
@@ -29,7 +29,7 @@ limitations under the License.
android:layout_height="wrap_content">
<!-- A gradient on top of the text -->
<ImageView
android:id="@+id/marker_detail_waypoint_text_gradient"
android:id="@+id/marker_detail_marker_text_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:alpha=".6"
@@ -37,7 +37,7 @@ limitations under the License.
android:src="@drawable/text_gradient" />
<LinearLayout
android:id="@+id/marker_detail_waypoint_info"
android:id="@+id/marker_detail_marker_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="80dp"
@@ -45,20 +45,20 @@ limitations under the License.
android:padding="8dp">
<TextView
android:id="@+id/marker_detail_waypoint_name"
android:id="@+id/marker_detail_marker_name"
style="@style/TextMedium"
android:paddingTop="8dp" />
<TextView
android:id="@+id/marker_detail_waypoint_category"
android:id="@+id/marker_detail_marker_category"
style="@style/TextSmall" />
<TextView
android:id="@+id/marker_detail_waypoint_description"
android:id="@+id/marker_detail_marker_description"
style="@style/TextSmall" />
<TextView
android:id="@+id/marker_detail_waypoint_location"
android:id="@+id/marker_detail_marker_location"
style="@style/TextSmall" />
</LinearLayout>
</FrameLayout>
src/main/res/layout/marker_edit.xml
+5 -5
View File
@@ -37,7 +37,7 @@ limitations under the License.
<com.google.android.material.textfield.TextInputEditText
android:drawableStart="@drawable/ic_marker_orange_pushpin_with_shadow"
android:id="@+id/marker_edit_waypoint_name"
android:id="@+id/marker_edit_name"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
@@ -49,7 +49,7 @@ limitations under the License.
android:importantForAutofill="no">
<AutoCompleteTextView
android:id="@+id/marker_edit_waypoint_marker_type"
android:id="@+id/marker_edit_marker_type"
style="@style/EditCategory"
android:layout_width="match_parent"
android:hint="@string/marker_edit_marker_type"
@@ -64,7 +64,7 @@ limitations under the License.
android:importantForAutofill="no">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/marker_edit_waypoint_description"
android:id="@+id/marker_edit_description"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
@@ -75,7 +75,7 @@ limitations under the License.
android:layout_marginTop="16dp">
<ImageView
android:id="@+id/marker_edit_waypoint_photo"
android:id="@+id/marker_edit_photo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
@@ -87,7 +87,7 @@ limitations under the License.
android:scaleType="fitStart" />
<ImageView
android:id="@+id/marker_edit_waypoint_photo_delete"
android:id="@+id/marker_edit_photo_delete"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentTop="true"
src/main/res/values/do_not_translate.xml
+2 -2
View File
@@ -22,14 +22,14 @@ limitations under the License.
<a href="https://github.com/material-components/material-components-android">Material Components for Android</a> (Apache License, Version 2.0)
</string>
<string name="marker_waypoint_icon_url" translatable="false">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
<string name="marker_icon_url" translatable="false">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
<string name="sensor_unit_beats_per_minute" translatable="false">BPM</string>
<string name="sensor_unit_rounds_per_minute" translatable="false">RPM</string>
<string name="value_unknown" translatable="false">-</string>
<string-array name="waypoint_types">
<string-array name="marker_types">
<item>@string/waypoint_type_atm</item>
<item>@string/waypoint_type_bank</item>
<item>@string/waypoint_type_bar</item>