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

Removed split markers.

Browse Source
This commit is contained in:
Dennis Guse
2019-11-29 23:28:34 +01:00
parent c0672c41df
commit 8e2598e93b
23 changed files with 54 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/drawable-hdpi/ic_marker_yellow_pushpin.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

src/main/res/drawable-mdpi/ic_marker_yellow_pushpin.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 58 KiB

src/main/res/drawable-xhdpi/ic_marker_yellow_pushpin.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 62 KiB

src/main/res/layout/marker_detail_fragment.xml
-30
View File
@@ -18,7 +18,6 @@ limitations under the License.
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/marker_detail_waypoint"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -69,33 +68,4 @@ limitations under the License.
</LinearLayout>
</FrameLayout>
</FrameLayout>
<ScrollView
android:id="@+id/marker_detail_statistics"
style="@style/StatsScrollView">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">
<TextView
android:id="@+id/marker_detail_statistics_name"
style="@style/TextMedium"
android:paddingTop="8dp" />
<TextView
android:id="@+id/marker_detail_statistics_location"
style="@style/TextSmall" />
<TextView
style="@style/TextSmall"
android:paddingTop="4dp"
android:paddingBottom="6dp"
android:text="@string/marker_detail_statistics_title" />
<include layout="@layout/stats_content" />
</LinearLayout>
</ScrollView>
</FrameLayout>
src/main/res/layout/marker_edit.xml
+1 -1
View File
@@ -41,7 +41,7 @@ limitations under the License.
<EditText
android:id="@+id/marker_edit_statistics_name"
style="@style/EditNameMarker"
android:drawableLeft="@drawable/ic_marker_yellow_pushpin"
android:drawableLeft="@drawable/ic_marker_blue_pushpin"
android:hint="@string/generic_name"
android:imeOptions="actionDone"
android:importantForAutofill="no" />
src/main/res/values/settings.xml
-22
View File
@@ -114,28 +114,6 @@
<item>@string/auto_resume_track_timeout_always</item>
</string-array>
<string name="split_frequency_key" translatable="false">splitFrequency</string>
<string name="split_frequency_default" translatable="false">@string/frequency_off</string>
<string name="voice_frequency_key" translatable="false">voiceFrequency</string>
<string name="voice_frequency_default" translatable="false">@string/frequency_off</string>
<string name="frequency_off" translatable="false">0</string>
<string-array name="frequency_values">
<item>@string/frequency_off</item>
<item>1</item>
<item>2</item>
<item>5</item>
<item>10</item>
<item>15</item>
<item>30</item>
<item>60</item>
<item>-1</item>
<item>-5</item>
<item>-10</item>
<item>-25</item>
<item>-50</item>
<item>-100</item>
</string-array>
<string name="recording_distance_interval_key" translatable="false">recordingDistanceInterval</string>
<string name="recording_distance_interval_default" translatable="false">10</string>
<string-array name="recording_distance_interval_values">
src/main/res/values/settings_deprecated.xml
+22
View File
@@ -15,4 +15,26 @@
<item>@string/settings_chart_by_distance</item>
<item>@string/settings_chart_by_time</item>
</string-array>
<string name="split_frequency_key" translatable="false">splitFrequency</string>
<string name="split_frequency_default" translatable="false">@string/frequency_off</string>
<string name="voice_frequency_key" translatable="false">voiceFrequency</string>
<string name="voice_frequency_default" translatable="false">@string/frequency_off</string>
<string name="frequency_off" translatable="false">0</string>
<string-array name="frequency_values">
<item>@string/frequency_off</item>
<item>1</item>
<item>2</item>
<item>5</item>
<item>10</item>
<item>15</item>
<item>30</item>
<item>60</item>
<item>-1</item>
<item>-5</item>
<item>-10</item>
<item>-25</item>
<item>-50</item>
<item>-100</item>
</string-array>
</resources>
src/main/res/xml/settings.xml
-6
View File
@@ -80,12 +80,6 @@ limitations under the License.
android:key="@string/voice_frequency_key"
android:title="@string/menu_voice_frequency"
app:useSimpleSummaryProvider="true" />
<ListPreference
android:defaultValue="@string/split_frequency_default"
android:entryValues="@array/frequency_values"
android:key="@string/split_frequency_key"
android:title="@string/menu_split_frequency"
app:useSimpleSummaryProvider="true" />
<ListPreference
android:defaultValue="@string/track_name_default"
android:entries="@array/track_name_options"