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

Announcements: can be triggered by time and distance (instead of either).

Browse Source 
Fixes #921.
This commit is contained in:
Dennis Guse
2021-08-29 20:22:31 +02:00
parent 9cb3d8c1bb
commit 8f2d1722ad
65 changed files with 169 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/values/settings.xml
+20 -15
View File
@@ -211,24 +211,29 @@
<item>@string/settings_recording_track_name_number_option</item>
</string-array>
<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>
<string name="announcement_off" translatable="false">0</string>
<string name="voice_announcement_frequency_key" translatable="false">voiceFrequencyV2</string>
<string name="voice_announcement_frequency_default" translatable="false">@string/announcement_off</string>
<string-array name="voice_announcement_frequency_values"> <!-- seconds -->
<item>@string/voice_announcement_frequency_default</item>
<item>60</item>
<item>120</item>
<item>300</item>
<item>600</item>
<item>900</item>
<item>1800</item>
<item>3600</item>
</string-array>
<string name="voice_announcement_distance_key" translatable="false">voiceDistance</string>
<string name="voice_announcement_distance_default" translatable="false">@string/announcement_off</string>
<string-array name="voice_announcement_distance_values">
<item>@string/voice_announcement_distance_default</item> <!-- km/miles -->
<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>
<item>25</item>
<item>50</item>
<item>100</item>
</string-array>
<string name="voice_speed_rate_key" translatable="false">voiceSpeedRate</string>
<string name="voice_speed_rate_default" translatable="false">0.9</string>
src/main/res/values/settings_deprecated.xml
-1
View File
@@ -17,7 +17,6 @@
</string-array>
<string name="split_frequency_key" translatable="false" tools:keep="@string/split_frequency_key">splitFrequency</string>
<string name="split_frequency_default" translatable="false" tools:keep="@string/split_frequency_default">@string/frequency_off</string>
<string name="chart_show_cadence_key" translatable="false" tools:keep="@string/chart_show_cadence_key">chartShowCadence</string>
<bool name="chart_show_cadence_default" translatable="false" tools:keep="@bool/chart_show_cadence_default">
src/main/res/values/strings.xml
+4 -2
View File
@@ -302,7 +302,6 @@ limitations under the License.
<string name="menu_show_on_map">Show on map</string>
<string name="menu_start_gps">Start GPS</string>
<string name="menu_stop_gps">Stop GPS</string>
<string name="menu_voice_frequency">Voice frequency</string>
<string name="menu_voice_rate">Voice speed</string>
<string name="menu_resume_track">Resume track</string>
<!-- OpenTracks -->
@@ -361,7 +360,10 @@ limitations under the License.
<string name="settings_night_mode_option_day">Day</string>
<string name="settings_night_mode_option_night">Night</string>
<!-- Reset -->
<string name="settings_announcements">Announcements</string>
<string name="settings_announcements_totaltime_frequency">Time interval</string>
<string name="settings_announcements_distance_frequency">Distance interval</string>
<string name="settings_reset">Reset</string>
<!-- Custom Layout Reset -->
<string name="settings_layout_reset">Reset Custom Layout</string>