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

Add support to show both moving time and total time.

Browse Source
This commit is contained in:
Jimmy Shih
2012-08-22 15:52:14 -07:00
parent b3ad974bbb
commit b0bb09db08
9 changed files with 192 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/stats_core.xml
+28 -4
View File
@@ -29,21 +29,32 @@ limitations under the License.
<!-- Total time/moving time -->
<TableRow>
<TextView
android:id="@+id/stats_total_time_label"
android:text="@string/stats_total_time"
style="@style/StatsLabel" />
<TextView
android:id="@+id/stats_moving_time_label"
android:layout_column="2"
android:text="@string/stats_moving_time"
style="@style/StatsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/stats_total_time_value"
style="@style/StatsValue" />
<TextView
android:id="@+id/stats_moving_time_spacer"
style="@style/StatsSpacer" />
<TextView
android:id="@+id/stats_moving_time_value"
style="@style/StatsValue" />
</TableRow>
<!-- Average speed/average moving speed and max speed (average pace/average moving pace and fastest pace) -->
<!-- Average speed/average moving speed (average pace/average moving pace) -->
<TableRow>
<TextView
android:id="@+id/stats_average_speed_label"
style="@style/StatsLabel" />
<TextView
android:id="@+id/stats_max_speed_label"
android:id="@+id/stats_average_moving_speed_label"
android:layout_column="2"
style="@style/StatsLabel" />
</TableRow>
@@ -51,7 +62,20 @@ limitations under the License.
<TextView
android:id="@+id/stats_average_speed_value"
style="@style/StatsValue" />
<TextView style="@style/StatsSpacer" />
<TextView
android:id="@+id/stats_average_moving_speed_spacer"
style="@style/StatsSpacer" />
<TextView
android:id="@+id/stats_average_moving_speed_value"
style="@style/StatsValue" />
</TableRow>
<!-- Max speed (fastest pace) -->
<TableRow>
<TextView
android:id="@+id/stats_max_speed_label"
style="@style/StatsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/stats_max_speed_value"
style="@style/StatsValue" />
MyTracks/res/layout/track_widget.xml
+33 -22
View File
@@ -39,10 +39,7 @@ limitations under the License.
android:layout_width="0dp"
android:orientation="vertical"
android:paddingLeft="8dp" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<LinearLayout style="@style/TrackWidgetStat" >
<TextView
android:id="@+id/track_widget_distance_value"
style="@style/TrackWidgetValue" />
@@ -50,34 +47,48 @@ limitations under the License.
android:text="@string/stats_total_distance"
style="@style/TrackWidgetLabel" />
</LinearLayout>
<LinearLayout
android:background="@color/track_widget_line"
android:layout_height="1dp"
android:layout_width="fill_parent" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<LinearLayout style="@style/TrackWidgetSeparator" />
<LinearLayout style="@style/TrackWidgetStat" >
<TextView
android:id="@+id/track_widget_time_value"
android:id="@+id/track_widget_total_time_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_time_label"
android:text="@string/stats_total_time"
style="@style/TrackWidgetLabel" />
</LinearLayout>
<LinearLayout style="@style/TrackWidgetSeparator" />
<LinearLayout style="@style/TrackWidgetStat" >
<TextView
android:id="@+id/track_widget_average_speed_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_average_speed_label"
style="@style/TrackWidgetLabel" />
</LinearLayout>
<LinearLayout
android:background="@color/track_widget_line"
android:layout_height="1dp"
android:layout_width="fill_parent" />
android:id="@+id/track_widget_moving_time_separator"
style="@style/TrackWidgetSeparator" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
android:id="@+id/track_widget_moving_time_stat"
style="@style/TrackWidgetStat" >
<TextView
android:id="@+id/track_widget_speed_value"
android:id="@+id/track_widget_moving_time_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_speed_label"
android:text="@string/stats_moving_time"
style="@style/TrackWidgetLabel" />
</LinearLayout>
<LinearLayout
android:id="@+id/track_widget_average_moving_speed_separator"
style="@style/TrackWidgetSeparator" />
<LinearLayout
android:id="@+id/track_widget_average_moving_speed_stat"
style="@style/TrackWidgetStat" >
<TextView
android:id="@+id/track_widget_average_moving_speed_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_average_moving_speed_label"
style="@style/TrackWidgetLabel" />
</LinearLayout>
<ImageButton