Split detail and record to simplify the code. Fixes #171.

src/main/res/layout/statistics_recorded.xml

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/StatsScrollView">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <!-- Horizontal line -->
+        <View style="@style/StatsHorizontalLine" />
+
+        <!-- Distance and activity type -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <!-- Distance -->
+            <LinearLayout style="@style/StatsLargeItemContainer">
+
+                <TextView
+                    style="@style/StatsLargeLabel"
+                    android:text="@string/stats_distance" />
+
+                <LinearLayout style="@style/StatsLargeValueContainer">
+
+                    <TextView
+                        android:id="@+id/stats_distance_value"
+                        style="@style/StatsLargeValue"
+                        android:value="@string/value_unknown" />
+
+                    <TextView
+                        android:id="@+id/stats_distance_unit"
+                        style="@style/StatsUnit" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <!-- Activity type -->
+            <include
+                android:id="@+id/stats_activity_type"
+                layout="@layout/stats_activity_type" />
+        </LinearLayout>
+
+        <!-- Total time and moving time -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Total time -->
+            <LinearLayout style="@style/StatsLargeItemContainer">
+
+                <TextView
+                    style="@style/StatsLargeLabel"
+                    android:text="@string/stats_total_time" />
+
+                <TextView
+                    android:id="@+id/stats_total_time_value"
+                    style="@style/StatsLargeValue" />
+
+            </LinearLayout>
+
+            <!-- Moving time -->
+            <LinearLayout style="@style/StatsLargeItemContainer">
+
+                <TextView
+                    style="@style/StatsLargeLabel"
+                    android:text="@string/stats_moving_time" />
+
+                <TextView
+                    android:id="@+id/stats_moving_time_value"
+                    style="@style/StatsLargeValue"
+                    android:value="@string/value_unknown" />
+
+            </LinearLayout>
+        </LinearLayout>
+
+        <!-- Horizontal line -->
+        <View style="@style/StatsHorizontalLine" />
+
+        <!-- Speed/pace and average -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Left empty -->
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <!-- Average -->
+            <LinearLayout style="@style/StatsSmallItemContainer">
+
+                <TextView
+                    android:id="@+id/stats_average_speed_label"
+                    style="@style/StatsSmallLabel" />
+
+                <LinearLayout style="@style/StatsSmallValueContainer">
+
+                    <TextView
+                        android:id="@+id/stats_average_speed_value"
+                        style="@style/StatsSmallValue"
+                        android:value="@string/value_unknown" />
+
+                    <TextView
+                        android:id="@+id/stats_average_speed_unit"
+                        style="@style/StatsUnit" />
+
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+        <!-- Speed max and moving -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Speed max -->
+            <LinearLayout style="@style/StatsSmallItemContainer">
+
+                <TextView
+                    android:id="@+id/stats_max_speed_label"
+                    style="@style/StatsSmallLabel" />
+
+                <LinearLayout style="@style/StatsSmallValueContainer">
+
+                    <TextView
+                        android:id="@+id/stats_max_speed_value"
+                        style="@style/StatsSmallValue"
+                        android:value="@string/value_unknown" />
+
+                    <TextView
+                        android:id="@+id/stats_max_speed_unit"
+                        style="@style/StatsUnit" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!-- Speed moving -->
+            <LinearLayout style="@style/StatsSmallItemContainer">
+
+                <TextView
+                    android:id="@+id/stats_moving_speed_label"
+                    style="@style/StatsSmallLabel" />
+
+                <LinearLayout style="@style/StatsSmallValueContainer">
+
+                    <TextView
+                        android:id="@+id/stats_moving_speed_value"
+                        style="@style/StatsSmallValue"
+                        android:value="@string/value_unknown" />
+
+                    <TextView
+                        android:id="@+id/stats_moving_speed_unit"
+                        style="@style/StatsUnit" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+        <View
+            android:id="@+id/stats_sensor_separator"
+            style="@style/StatsHorizontalLine" />
+    </LinearLayout>
+</ScrollView>

src/main/res/layout/statistics_recording.xml

@@ -1,18 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/StatsScrollView">
 

src/main/res/layout/track_detail.xml

@@ -32,6 +32,4 @@ limitations under the License.
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1" />
-
-    <include layout="@layout/track_controller" />
 </LinearLayout>

src/main/res/layout/track_record.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/toolbar" />
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/track_detail_activity_tablayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:tabIndicatorColor="@color/holo_orange_dark" />
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/track_detail_activity_view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <include layout="@layout/track_controller" />
+</LinearLayout>