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

Rename elevation to altitude (without translations).

Browse Source 
Fixes #678.
This commit is contained in:
Dennis Guse
2021-04-02 18:29:05 +02:00
parent e09b04308c
commit bc1b4e3cd2
101 changed files with 893 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/layout/interval_list_view.xml
+2 -2
View File
@@ -44,9 +44,9 @@
tools:text="Speed" />
<TextView
android:id="@+id/interval_elevation"
android:id="@+id/interval_altitude"
style="@style/IntervalLabel"
android:text="@string/stats_elevation" />
android:text="@string/stats_altitude" />
</LinearLayout>
src/main/res/layout/statistics_recorded.xml
+23 -23
View File
@@ -261,81 +261,81 @@
<!-- Horizontal line -->
<View
android:id="@+id/stats_elevation_horizontal_line"
android:id="@+id/stats_altitude_horizontal_line"
style="@style/StatsHorizontalLine"
android:layout_marginBottom="8dp"
app:layout_constraintStart_toEndOf="@id/guideline"
app:layout_constraintEnd_toStartOf="@id/guideline3"
app:layout_constraintTop_toBottomOf="@id/stats_speed_barrier" />
<!-- Elevation gain and loss -->
<!-- Altitude gain and loss -->
<androidx.constraintlayout.widget.Group
android:id="@+id/stats_elevation_group"
android:id="@+id/stats_altitude_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="stats_elevation_horizontal_line,stats_elevation_gain_label,stats_elevation_gain_value,stats_elevation_gain_unit,stats_elevation_loss_label,stats_elevation_loss_value,stats_elevation_loss_unit" />
app:constraint_referenced_ids="stats_altitude_horizontal_line,stats_altitude_gain_label,@+id/stats_altitude_gain_value,@+id/stats_altitude_gain_unit,stats_altitude_loss_label,@+id/stats_altitude_loss_value,@+id/stats_altitude_loss_unit" />
<TextView
android:id="@+id/stats_elevation_gain_label"
android:id="@+id/stats_altitude_gain_label"
style="@style/StatsLargeLabel"
android:text="@string/stats_gain"
app:layout_constrainedWidth="true"
app:layout_constraintStart_toEndOf="@id/guideline"
app:layout_constraintEnd_toStartOf="@id/guideline2"
app:layout_constraintTop_toBottomOf="@id/stats_elevation_horizontal_line" />
app:layout_constraintTop_toBottomOf="@id/stats_altitude_horizontal_line" />
<TextView
android:id="@+id/stats_elevation_gain_value"
android:id="@+id/stats_altitude_gain_value"
style="@style/StatsLargeValue"
android:value="@string/value_unknown"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/guideline"
app:layout_constraintEnd_toStartOf="@id/stats_elevation_gain_unit"
app:layout_constraintTop_toBottomOf="@id/stats_elevation_gain_label"
app:layout_constraintEnd_toStartOf="@id/stats_altitude_gain_unit"
app:layout_constraintTop_toBottomOf="@id/stats_altitude_gain_label"
tools:text="100" />
<TextView
android:id="@+id/stats_elevation_gain_unit"
android:id="@+id/stats_altitude_gain_unit"
style="@style/StatsUnit"
app:layout_constraintBottom_toBottomOf="@id/stats_elevation_gain_value"
app:layout_constraintStart_toEndOf="@id/stats_elevation_gain_value"
app:layout_constraintBottom_toBottomOf="@id/stats_altitude_gain_value"
app:layout_constraintStart_toEndOf="@id/stats_altitude_gain_value"
app:layout_constraintEnd_toStartOf="@id/guideline2"
tools:text="m" />
<TextView
android:id="@+id/stats_elevation_loss_label"
android:id="@+id/stats_altitude_loss_label"
style="@style/StatsLargeLabel"
android:text="@string/stats_loss"
app:layout_constrainedWidth="true"
app:layout_constraintStart_toEndOf="@id/guideline2"
app:layout_constraintEnd_toStartOf="@id/guideline3"
app:layout_constraintTop_toBottomOf="@id/stats_elevation_horizontal_line" />
app:layout_constraintTop_toBottomOf="@id/stats_altitude_horizontal_line" />
<TextView
android:id="@+id/stats_elevation_loss_value"
android:id="@+id/stats_altitude_loss_value"
style="@style/StatsLargeValue"
android:value="@string/value_unknown"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/guideline2"
app:layout_constraintEnd_toStartOf="@id/stats_elevation_loss_unit"
app:layout_constraintTop_toBottomOf="@id/stats_elevation_loss_label"
app:layout_constraintEnd_toStartOf="@id/stats_altitude_loss_unit"
app:layout_constraintTop_toBottomOf="@id/stats_altitude_loss_label"
tools:text="100" />
<TextView
android:id="@+id/stats_elevation_loss_unit"
android:id="@+id/stats_altitude_loss_unit"
style="@style/StatsUnit"
app:layout_constraintBottom_toBottomOf="@id/stats_elevation_loss_value"
app:layout_constraintStart_toEndOf="@id/stats_elevation_loss_value"
app:layout_constraintBottom_toBottomOf="@id/stats_altitude_loss_value"
app:layout_constraintStart_toEndOf="@id/stats_altitude_loss_value"
app:layout_constraintEnd_toStartOf="@id/guideline3"
tools:text="m" />
<!-- Barrier -->
<androidx.constraintlayout.widget.Barrier
android:id="@+id/stats_elevation_barrier"
android:id="@+id/stats_altitude_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="stats_elevation_gain_value,stats_elevation_loss_value" />
app:constraint_referenced_ids="stats_altitude_gain_value,stats_altitude_loss_value" />
<!-- Horizontal line -->
<View
@@ -344,7 +344,7 @@
android:layout_marginBottom="8dp"
app:layout_constraintStart_toEndOf="@id/guideline"
app:layout_constraintEnd_toStartOf="@id/guideline3"
app:layout_constraintTop_toBottomOf="@id/stats_elevation_barrier" />
app:layout_constraintTop_toBottomOf="@id/stats_altitude_barrier" />
<!-- Sensors data -->
<androidx.recyclerview.widget.RecyclerView
src/main/res/layout/statistics_recording.xml
+35 -35
View File
@@ -257,102 +257,102 @@
<!-- Horizontal line -->
<View
android:id="@+id/stats_elevation_horizontal_line"
android:id="@+id/stats_altitude_horizontal_line"
style="@style/StatsHorizontalLine"
android:layout_marginBottom="8dp"
app:layout_constraintEnd_toStartOf="@id/guideline3"
app:layout_constraintStart_toEndOf="@id/guideline"
app:layout_constraintTop_toBottomOf="@id/stats_speed_barrier" />
<!-- Elevation -->
<!-- altitude -->
<androidx.constraintlayout.widget.Group
android:id="@+id/stats_elevation_group"
android:id="@+id/stats_altitude_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="stats_elevation_horizontal_line,stats_elevation_current_label,stats_elevation_current_value,stats_elevation_current_unit,stats_elevation_gain_label,stats_elevation_gain_value,stats_elevation_gain_unit,stats_elevation_loss_label,stats_elevation_loss_value,stats_elevation_loss_unit" />
app:constraint_referenced_ids="stats_altitude_horizontal_line,stats_altitude_current_label,stats_altitude_current_value,stats_altitude_current_unit,stats_altitude_gain_label,stats_altitude_gain_value,stats_altitude_gain_unit,stats_altitude_loss_label,stats_altitude_loss_value,stats_altitude_loss_unit" />
<!-- Elevation -->
<!-- altitude -->
<TextView
android:id="@+id/stats_elevation_current_label"
android:id="@+id/stats_altitude_current_label"
style="@style/StatsSmallLabel"
android:text="@string/stats_elevation"
android:text="@string/stats_altitude"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toStartOf="@id/guideline2"
app:layout_constraintStart_toEndOf="@id/guideline"
app:layout_constraintTop_toBottomOf="@id/stats_elevation_horizontal_line" />
app:layout_constraintTop_toBottomOf="@id/stats_altitude_horizontal_line" />
<TextView
android:id="@+id/stats_elevation_current_value"
android:id="@+id/stats_altitude_current_value"
style="@style/StatsSmallValue"
android:value="@string/value_unknown"
app:layout_constraintEnd_toStartOf="@id/stats_elevation_current_unit"
app:layout_constraintEnd_toStartOf="@id/stats_altitude_current_unit"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/guideline"
app:layout_constraintTop_toBottomOf="@id/stats_elevation_current_label"
app:layout_constraintTop_toBottomOf="@id/stats_altitude_current_label"
tools:text="100" />
<TextView
android:id="@+id/stats_elevation_current_unit"
android:id="@+id/stats_altitude_current_unit"
style="@style/StatsUnit"
app:layout_constraintBottom_toBottomOf="@id/stats_elevation_current_value"
app:layout_constraintBottom_toBottomOf="@id/stats_altitude_current_value"
app:layout_constraintEnd_toStartOf="@id/guideline2"
app:layout_constraintStart_toEndOf="@id/stats_elevation_current_value"
app:layout_constraintStart_toEndOf="@id/stats_altitude_current_value"
tools:text="m" />
<!-- Elevation gain -->
<!-- Altitude gain -->
<TextView
android:id="@+id/stats_elevation_gain_label"
android:id="@+id/stats_altitude_gain_label"
style="@style/StatsSmallLabel"
android:text="@string/stats_gain"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toStartOf="@id/guideline3"
app:layout_constraintStart_toEndOf="@id/guideline2"
app:layout_constraintTop_toBottomOf="@id/stats_elevation_horizontal_line" />
app:layout_constraintTop_toBottomOf="@id/stats_altitude_horizontal_line" />
<TextView
android:id="@+id/stats_elevation_gain_value"
android:id="@+id/stats_altitude_gain_value"
style="@style/StatsSmallValue"
android:value="@string/value_unknown"
app:layout_constraintEnd_toStartOf="@id/stats_elevation_gain_unit"
app:layout_constraintEnd_toStartOf="@id/stats_altitude_gain_unit"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/guideline2"
app:layout_constraintTop_toBottomOf="@id/stats_elevation_gain_label"
app:layout_constraintTop_toBottomOf="@id/stats_altitude_gain_label"
tools:text="100" />
<TextView
android:id="@+id/stats_elevation_gain_unit"
android:id="@+id/stats_altitude_gain_unit"
style="@style/StatsUnit"
app:layout_constraintBottom_toBottomOf="@id/stats_elevation_gain_value"
app:layout_constraintBottom_toBottomOf="@id/stats_altitude_gain_value"
app:layout_constraintEnd_toStartOf="@id/guideline3"
app:layout_constraintStart_toEndOf="@id/stats_elevation_gain_value"
app:layout_constraintStart_toEndOf="@id/stats_altitude_gain_value"
tools:text="m" />
<!-- Elevation loss -->
<!-- Altitude loss -->
<TextView
android:id="@+id/stats_elevation_loss_label"
android:id="@+id/stats_altitude_loss_label"
style="@style/StatsSmallLabel"
android:text="@string/stats_loss"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toStartOf="@id/guideline3"
app:layout_constraintStart_toEndOf="@id/guideline2"
app:layout_constraintTop_toBottomOf="@id/stats_elevation_gain_value" />
app:layout_constraintTop_toBottomOf="@id/stats_altitude_gain_value" />
<TextView
android:id="@+id/stats_elevation_loss_value"
android:id="@+id/stats_altitude_loss_value"
style="@style/StatsSmallValue"
android:value="@string/value_unknown"
app:layout_constraintEnd_toStartOf="@id/stats_elevation_loss_unit"
app:layout_constraintEnd_toStartOf="@id/stats_altitude_loss_unit"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/guideline2"
app:layout_constraintTop_toBottomOf="@id/stats_elevation_loss_label"
app:layout_constraintTop_toBottomOf="@id/stats_altitude_loss_label"
tools:text="100" />
<TextView
android:id="@+id/stats_elevation_loss_unit"
android:id="@+id/stats_altitude_loss_unit"
style="@style/StatsUnit"
app:layout_constraintBottom_toBottomOf="@id/stats_elevation_loss_value"
app:layout_constraintBottom_toBottomOf="@id/stats_altitude_loss_value"
app:layout_constraintEnd_toStartOf="@id/guideline3"
app:layout_constraintStart_toEndOf="@id/stats_elevation_loss_value"
app:layout_constraintStart_toEndOf="@id/stats_altitude_loss_value"
tools:text="m" />
<!-- Coordinate group -->
@@ -364,11 +364,11 @@
<!-- Barrier -->
<androidx.constraintlayout.widget.Barrier
android:id="@+id/stats_elevation_barrier"
android:id="@+id/stats_altitude_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="stats_elevation_current_value,stats_elevation_gain_value,stats_elevation_loss_value" />
app:constraint_referenced_ids="stats_altitude_current_value,stats_altitude_gain_value,stats_altitude_loss_value" />
<!-- Horizontal line -->
<View
@@ -377,7 +377,7 @@
android:layout_marginBottom="8dp"
app:layout_constraintEnd_toStartOf="@id/guideline3"
app:layout_constraintStart_toEndOf="@id/guideline"
app:layout_constraintTop_toBottomOf="@id/stats_elevation_barrier" />
app:layout_constraintTop_toBottomOf="@id/stats_altitude_barrier" />
<!-- Latitude -->
<TextView