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

Added barriers in stats recorded layout and stats recording layout.

Browse Source
This commit is contained in:
Román
2020-09-06 14:08:31 +02:00
parent 5099118dd7
commit 6e1aba6fa0
2 changed files with 66 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/layout/statistics_recorded.xml
+30 -15
View File
@@ -116,6 +116,14 @@
app:layout_constraintTop_toBottomOf="@+id/stats_moving_time_label" app:layout_constraintTop_toBottomOf="@+id/stats_moving_time_label"
tools:text="00:00:00" /> tools:text="00:00:00" />
<!-- Barrier -->
<androidx.constraintlayout.widget.Barrier
android:id="@+id/stats_time_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="stats_total_time_value,stats_moving_time_value" />
<!-- Horizontal line --> <!-- Horizontal line -->
<View <View
android:id="@+id/stats_speed_horizontal_line" android:id="@+id/stats_speed_horizontal_line"
@@ -123,7 +131,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintLeft_toRightOf="@+id/guideline" app:layout_constraintLeft_toRightOf="@+id/guideline"
app:layout_constraintRight_toLeftOf="@+id/guideline3" app:layout_constraintRight_toLeftOf="@+id/guideline3"
app:layout_constraintTop_toBottomOf="@+id/stats_moving_time_value" /> app:layout_constraintTop_toBottomOf="@+id/stats_time_barrier" />
<!-- Average speed/pace --> <!-- Average speed/pace -->
<TextView <TextView
@@ -209,15 +217,24 @@
app:layout_constraintRight_toLeftOf="@+id/guideline3" app:layout_constraintRight_toLeftOf="@+id/guideline3"
tools:text="km/h" /> tools:text="km/h" />
<!-- Elevation gain --> <!-- Barrier -->
<androidx.constraintlayout.widget.Barrier
android:id="@+id/stats_speed_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="stats_moving_speed_value,stats_max_speed_value" />
<!-- Horizontal line -->
<View <View
android:id="@+id/stats_elevation_horizontal_line" android:id="@+id/stats_elevation_horizontal_line"
style="@style/StatsHorizontalLine" style="@style/StatsHorizontalLine"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintLeft_toRightOf="@+id/guideline" app:layout_constraintLeft_toRightOf="@+id/guideline"
app:layout_constraintRight_toLeftOf="@+id/guideline3" app:layout_constraintRight_toLeftOf="@+id/guideline3"
app:layout_constraintTop_toBottomOf="@+id/stats_moving_speed_value" /> app:layout_constraintTop_toBottomOf="@+id/stats_speed_barrier" />
<!-- Elevation gain -->
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group
android:id="@+id/stats_elevation_group" android:id="@+id/stats_elevation_group"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -251,24 +268,22 @@
app:layout_constraintRight_toLeftOf="@+id/guideline3" app:layout_constraintRight_toLeftOf="@+id/guideline3"
tools:text="m" /> tools:text="m" />
<!-- Barrier -->
<androidx.constraintlayout.widget.Barrier
android:id="@+id/stats_elevation_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="stats_elevation_gain_value" />
<!-- Horizontal line --> <!-- Horizontal line -->
<View <View
android:id="@+id/stats_speed_horizontal_end_line" android:id="@+id/stats_end_horizontal_line"
style="@style/StatsHorizontalLine" style="@style/StatsHorizontalLine"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintLeft_toRightOf="@+id/guideline" app:layout_constraintLeft_toRightOf="@+id/guideline"
app:layout_constraintRight_toLeftOf="@+id/guideline3" app:layout_constraintRight_toLeftOf="@+id/guideline3"
app:layout_constraintTop_toBottomOf="@+id/stats_max_speed_value" /> app:layout_constraintTop_toBottomOf="@+id/stats_elevation_barrier" />
<LinearLayout
android:id="@+id/linear_layout_extra"
android:orientation="vertical"
android:layout_marginBottom="16dp"
app:layout_constraintLeft_toRightOf="@+id/guideline"
app:layout_constraintRight_toLeftOf="@+id/guideline3"
app:layout_constraintTop_toBottomOf="@+id/stats_speed_horizontal_end_line"
android:layout_width="0dp"
android:layout_height="wrap_content" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView> </ScrollView>
src/main/res/layout/statistics_recording.xml
+36 -5
View File
@@ -116,6 +116,14 @@
app:layout_constraintTop_toBottomOf="@+id/stats_moving_time_label" app:layout_constraintTop_toBottomOf="@+id/stats_moving_time_label"
tools:text="00:00:00" /> tools:text="00:00:00" />
<!-- Barrier -->
<androidx.constraintlayout.widget.Barrier
android:id="@+id/stats_time_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="stats_total_time_value,stats_moving_time_value" />
<!-- Horizontal line --> <!-- Horizontal line -->
<View <View
android:id="@+id/stats_speed_horizontal_line" android:id="@+id/stats_speed_horizontal_line"
@@ -123,7 +131,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintLeft_toRightOf="@+id/guideline" app:layout_constraintLeft_toRightOf="@+id/guideline"
app:layout_constraintRight_toLeftOf="@+id/guideline3" app:layout_constraintRight_toLeftOf="@+id/guideline3"
app:layout_constraintTop_toBottomOf="@+id/stats_moving_time_value" /> app:layout_constraintTop_toBottomOf="@+id/stats_time_barrier" />
<!-- Speed/pace --> <!-- Speed/pace -->
<TextView <TextView
@@ -237,6 +245,14 @@
app:layout_constraintRight_toLeftOf="@+id/guideline3" app:layout_constraintRight_toLeftOf="@+id/guideline3"
tools:text="km/h" /> tools:text="km/h" />
<!-- Barrier -->
<androidx.constraintlayout.widget.Barrier
android:id="@+id/stats_speed_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="stats_max_speed_value,stats_moving_speed_value" />
<!-- Horizontal line --> <!-- Horizontal line -->
<View <View
android:id="@+id/stats_elevation_horizontal_line" android:id="@+id/stats_elevation_horizontal_line"
@@ -244,7 +260,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintLeft_toRightOf="@+id/guideline" app:layout_constraintLeft_toRightOf="@+id/guideline"
app:layout_constraintRight_toLeftOf="@+id/guideline3" app:layout_constraintRight_toLeftOf="@+id/guideline3"
app:layout_constraintTop_toBottomOf="@+id/stats_moving_speed_value" /> app:layout_constraintTop_toBottomOf="@+id/stats_speed_barrier" />
<!-- Elevation --> <!-- Elevation -->
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group
@@ -282,7 +298,6 @@
tools:text="m" /> tools:text="m" />
<!-- Current elevation --> <!-- Current elevation -->
<TextView <TextView
android:id="@+id/stats_elevation_gain_label" android:id="@+id/stats_elevation_gain_label"
style="@style/StatsSmallLabel" style="@style/StatsSmallLabel"
@@ -317,6 +332,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:constraint_referenced_ids="stats_latitude_label,stats_latitude_value,stats_longitude_label,stats_longitude_value,stats_coordinate_horizontal_line" /> app:constraint_referenced_ids="stats_latitude_label,stats_latitude_value,stats_longitude_label,stats_longitude_value,stats_coordinate_horizontal_line" />
<!-- Barrier -->
<androidx.constraintlayout.widget.Barrier
android:id="@+id/stats_elevation_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" />
<!-- Horizontal line --> <!-- Horizontal line -->
<View <View
android:id="@+id/stats_coordinate_horizontal_line" android:id="@+id/stats_coordinate_horizontal_line"
@@ -324,7 +347,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintLeft_toRightOf="@+id/guideline" app:layout_constraintLeft_toRightOf="@+id/guideline"
app:layout_constraintRight_toLeftOf="@+id/guideline3" app:layout_constraintRight_toLeftOf="@+id/guideline3"
app:layout_constraintTop_toBottomOf="@+id/stats_elevation_current_value" /> app:layout_constraintTop_toBottomOf="@+id/stats_elevation_barrier" />
<!-- Latitude --> <!-- Latitude -->
<TextView <TextView
@@ -363,6 +386,14 @@
app:layout_constraintTop_toBottomOf="@+id/stats_longitude_label" app:layout_constraintTop_toBottomOf="@+id/stats_longitude_label"
tools:text="0.834937848" /> tools:text="0.834937848" />
<!-- Barrier -->
<androidx.constraintlayout.widget.Barrier
android:id="@+id/stats_location_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="stats_latitude_value,stats_longitude_value" />
<!-- Horizontal line --> <!-- Horizontal line -->
<View <View
android:id="@+id/stats_sensor_horizontal_line" android:id="@+id/stats_sensor_horizontal_line"
@@ -370,7 +401,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintLeft_toRightOf="@+id/guideline" app:layout_constraintLeft_toRightOf="@+id/guideline"
app:layout_constraintRight_toLeftOf="@+id/guideline3" app:layout_constraintRight_toLeftOf="@+id/guideline3"
app:layout_constraintTop_toBottomOf="@+id/stats_latitude_value" /> app:layout_constraintTop_toBottomOf="@+id/stats_location_barrier" />
<!-- Heart rate --> <!-- Heart rate -->
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group