Update stats view layout

MyTracks/res/values/keys.xml

@@ -53,9 +53,7 @@ limitations under the License.
   <string name="share_track_key">shareTrack</string>
   <string name="split_frequency_key">splitFrequency</string>
   <string name="stats_show_coordinate_key">statsShowCoordinate</string>
-  <string name="stats_show_elevation_key">statsShowElevation</string>
-  <string name="stats_show_grade_key">statsShowGrade</string>
-  <string name="stats_show_moving_time_key">statsShowMovingTime</string>
+  <string name="stats_show_grade_elevation_key">statsShowGradeElevation</string>
   <string name="track_color_mode_medium_key">trackColorModeMedium</string>
   <string name="track_color_mode_percentage_key">trackColorModePercentage</string>
   <string name="track_color_mode_slow_key">trackColorModeSlow</string>

MyTracks/res/values/strings.xml

@@ -2089,12 +2089,12 @@ limitations under the License.
       Character limit: ~23 (1 line)">
     Latitude/Longitude
   </string>
-  <string name="settings_stats_grade"
-    translation_description="In the 'Stats settings, the option to show grade. Grade is the amount
-      of inclination to the horizontal, also known as slope or incline.
+  <string name="settings_stats_grade_elevation"
+    translation_description="In the 'Stats settings, the option to show grade and elevation. Grade
+      is the amount of inclination to the horizontal, also known as slope or incline.
 
       Character limit: ~23 (1 line)">
-    Grade
+    Grade/Elevation
   </string>
   <string name="settings_stats_rate_title"
     translation_description="In the 'Stats' settings, the option to change the preferred rate,
@@ -2209,14 +2209,19 @@ limitations under the License.
       Character limit: ~23 (1 line)">
     Elevation
   </string>
-  <string name="stats_elevation_gain"
-    translation_description="In the 'Stats' page, the elevation gain.">
-    Elevation gain
-  </string>
   <string name="stats_fastest_pace"
     translation_description="In the 'Stats' page, the fastest pace.">
     Fastest pace
   </string>
+  <string name="stats_gain"
+    translation_description="In the 'Stats' page, the gain of a value. E.g, gain in elevation.">
+    Gain
+  </string>
+  <string name="stats_grade"
+    translation_description="In the 'Stats' page, the grade. Grade is the amount of inclination to
+      the horizontal, also known as slope or incline.">
+    Grade
+  </string>  
   <string name="stats_latitude"
     translation_description="In the 'Stats' page, the latitude.">
     Latitude
@@ -2225,25 +2230,17 @@ limitations under the License.
     translation_description="In the 'Stats' page, the longitude.">
     Longitude
   </string>
-  <string name="stats_max_elevation"
-    translation_description="In the 'Stats' page, the maximum elevation.">
-    Max elevation
-  </string>
-  <string name="stats_max_grade"
-    translation_description="In the 'Stats' page, the maximum grade.">
-    Max grade
+  <string name="stats_max"
+    translation_description="In the 'Stats' page, the maximum of a value.">
+    Max
   </string>
   <string name="stats_max_speed"
     translation_description="In the 'Stats' page, the maximum speed.">
     Max speed
   </string>
-  <string name="stats_min_elevation"
-    translation_description="In the 'Stats' page, the minimum elevation.">
-    Min elevation
-  </string>
-  <string name="stats_min_grade"
-    translation_description="In the 'Stats' page, the minimum grade.">
-    Min grade
+  <string name="stats_min"
+    translation_description="In the 'Stats' page, the minimum of a value.">
+    Min
   </string>
   <string name="stats_moving_time"
     translation_description="In the 'Stats' page, the moving time.">
@@ -2464,13 +2461,6 @@ limitations under the License.
     translation_description="In a setting picker, the value to always enable the option.">
     Always
   </string>
-  <string name="value_coordinate_degree"
-    translation_description="To display a latitude or longitude coordinate in degree. E.g.,
-      '2.2 \u00B0'. \u00B0 is the unicode value for the degree symbol.
-
-      %1$s: a string value of the coordinate. E.g., '2.2'.">
-    %1$s \u00B0
-  </string>
   <string name="value_float_feet"
     translation_description="Display a float value in feet (ft).
 
@@ -2483,12 +2473,6 @@ limitations under the License.
       %1$.2f: a float number. E.g., '2.22'.">
     %1$.2f km
   </string>
-  <string name="value_float_kilometer_hour"
-    translation_description="Display a float value in kilometers per hour (km/h).
-
-      %1$.2f: a float number. E.g., '2.22'.">
-    %1$.2f km/h
-  </string>
   <string name="value_float_meter"
     translation_description="Display a float value in meters (m).
 
@@ -2501,12 +2485,6 @@ limitations under the License.
       %1$.2f: a float number. E.g., '2.22'.">
     %1$.2f mi
   </string>
-  <string name="value_float_mile_hour"
-    translation_description="Display a float value in miles per hour (mi/h).
-
-      %1$.2f: a float number. E.g., '2.22'.">
-    %1$.2f mi/h
-  </string>
   <string name="value_float_mile_poor_gps"
     translation_description="In a setting picker, the string format to display a float value in
       miles (mi), recommended when having poor GPS signal.
@@ -2514,18 +2492,6 @@ limitations under the License.
       %1$.1f: a float number. E.g., '2.2'.">
     %1$.1f mi (poor GPS)
   </string>
-  <string name="value_float_minute_kilometer"
-    translation_description="Display a float value in minutes per kilometer (min/km).
-
-      %1$.2f: a float number. E.g., '2.22'.">
-    %1$.2f min/km
-  </string>
-  <string name="value_float_minute_mile"
-    translation_description="Display a float value in minutes per mile (min/mi).
-
-      %1$.2f: a float number. E.g., '2.22'.">
-    %1$.2f min/mi
-  </string>
   <string name="value_integer_feet"
     translation_description="In a setting picker, the string format to display an integer value in
       feet (ft).

MyTracks/res/values/styles.xml

@@ -130,24 +130,82 @@ limitations under the License.
     <item name="android:paddingRight">8dp</item>
     <item name="android:textColor">@android:color/primary_text_light</item>
   </style>
-  <!-- stats label -->
-  <style name="StatsLabel" parent="@style/TextMedium">
-    <item name="android:layout_weight">1</item>
-    <item name="android:layout_width">0dp</item>
+  <!-- stats horizontal line -->
+  <style name="StatsHorizontalLine">
+    <item name="android:background">@color/stats_separator</item>
+    <item name="android:layout_height">1dp</item>
+    <item name="android:layout_width">match_parent</item>
   </style>
-  <!-- stats spacer -->
-  <style name="StatsSpacer">
-    <item name="android:layout_height">match_parent</item>
-    <item name="android:layout_width">8dp</item>
-  </style>
-  <!-- stats value -->
-  <style name="StatsValue" parent="@style/TextLarge">
-    <item name="android:background">@android:color/background_light</item>
-    <item name="android:gravity">right</item>
-    <item name="android:layout_weight">1</item>
+  <!-- stats large item container -->
+  <style name="StatsLargeItemContainer">
+    <item name="android:layout_gravity">top</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_weight">10</item>
     <item name="android:layout_width">0dp</item>
+    <item name="android:orientation">vertical</item>
+    <item name="android:paddingBottom">6dp</item>
+    <item name="android:paddingLeft">8dp</item>
     <item name="android:paddingRight">8dp</item>
-    <item name="android:textColor">@android:color/primary_text_light</item>
+    <item name="android:paddingTop">6dp</item>
+  </style>
+  <!-- stats large label -->
+  <style name="StatsLargeLabel" parent="@style/TextSmall">
+    <item name="android:gravity">right</item>
+    <item name="android:layout_gravity">right</item>
+    <item name="android:singleLine">false</item>
+    <item name="android:textColor">@color/stats_large_label</item>
+    <item name="android:textStyle">bold</item>
+  </style>
+  <!-- stats large value -->
+  <style name="StatsLargeValue">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:singleLine">true</item>
+    <item name="android:textColor">@android:color/white</item>
+    <item name="android:textSize">32sp</item>
+    <item name="android:textStyle">bold</item>
+  </style>
+  <!-- stats large value container -->
+  <style name="StatsLargeValueContainer">
+    <item name="android:layout_gravity">right</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_marginTop">-4dp</item>
+    <item name="android:layout_width">wrap_content</item>
+  </style>
+  <!-- stats scroll view -->
+  <style name="StatsScrollView" parent="@style/ScrollView">
+    <item name="android:scrollbarStyle">outsideOverlay</item>
+  </style>  
+  <!-- stats small item container -->
+  <style name="StatsSmallItemContainer" parent="@style/StatsLargeItemContainer">
+    <item name="android:paddingTop">12dp</item>
+  </style>
+  <!-- stats small label -->
+  <style name="StatsSmallLabel" parent="@style/TextSmall">
+    <item name="android:gravity">right</item>
+    <item name="android:layout_gravity">right</item>
+    <item name="android:singleLine">false</item>
+    <item name="android:textStyle">bold</item>
+  </style>
+  <!-- stats small value -->
+  <style name="StatsSmallValue" parent="@style/TextLarge">
+    <item name="android:singleLine">true</item>
+    <item name="android:textColor">@android:color/white</item>
+  </style>
+  <!-- stats small value container -->
+  <style name="StatsSmallValueContainer" parent="@style/StatsLargeValueContainer">
+    <item name="android:layout_marginTop">-2dp</item>
+  </style>
+  <!-- stats unit -->
+  <style name="StatsUnit" parent="@style/TextSmall">
+    <item name="android:paddingLeft">4dp</item>
+    <item name="android:singleLine">true</item>
+  </style>
+  <!-- stats vertical spacer -->
+  <style name="StatsVerticalSpacer">
+    <item name="android:layout_height">match_parent</item>
+    <item name="android:layout_weight">1</item>
+    <item name="android:layout_width">0dp</item>
   </style>
   <!-- text choose activity -->
   <style name="TextChooseActivity">
@@ -342,7 +400,7 @@ limitations under the License.
     <item name="android:textSize">18dp</item>
   </style>
   <!-- track widget value -->
-  <style name="TrackWidgetValue">    
+  <style name="TrackWidgetValue">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_weight">2</item>
     <item name="android:layout_width">0dp</item>