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

Clean up Track Widget.

Browse Source 
- adjust margins
- display speed or pace
- display total time or total moving time
- use km intead of m when distance is greater than 1 km
- use mi instead ft when distance is greater than 1 mi
This commit is contained in:
Jimmy Shih
2012-06-02 14:24:14 -07:00
parent c890755411
commit 25c2cf66c2
10 changed files with 273 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/track_widget.xml
+62 -61
View File
@@ -14,71 +14,72 @@ 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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@drawable/app_widget_background"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp" >
<ImageButton
android:background="@android:color/transparent"
android:contentDescription="@string/my_tracks_app_name"
android:id="@+id/appwidget_button"
android:layout_height="fill_parent"
android:layout_width="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:src="@drawable/app_widget_button_disabled" />
android:padding="@dimen/widget_margin" >
<LinearLayout
android:clickable="true"
android:id="@+id/appwidget_track_statistics"
android:background="@drawable/app_widget_background"
android:layout_height="fill_parent"
android:layout_weight="1"
android:layout_width="0dp"
android:orientation="vertical"
android:paddingLeft="16dp" >
android:layout_width="fill_parent"
android:orientation="horizontal" >
<ImageButton
android:background="@android:color/transparent"
android:contentDescription="@string/my_tracks_app_name"
android:id="@+id/track_widget_button"
android:layout_height="fill_parent"
android:layout_width="wrap_content"
android:padding="8dp"
android:src="@drawable/app_widget_button_disabled" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/appwidget_distance_text"
style="@style/TrackWidgetValue" />
<TextView
android:text="@string/stats_total_distance"
style="@style/TextSmall" />
</LinearLayout>
<LinearLayout
android:background="@color/appwidget_hr"
android:layout_height="1dp"
android:layout_width="fill_parent" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/appwidget_time_text"
style="@style/TrackWidgetValue" />
<TextView
android:text="@string/stats_moving_time"
style="@style/TextSmall" />
</LinearLayout>
<LinearLayout
android:background="@color/appwidget_hr"
android:layout_height="1dp"
android:layout_width="fill_parent" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/appwidget_speed_text"
style="@style/TrackWidgetValue" />
<TextView
android:text="@string/stats_speed"
style="@style/TextSmall" />
android:clickable="true"
android:id="@+id/track_widget_statistics"
android:layout_height="fill_parent"
android:layout_weight="1"
android:layout_width="0dp"
android:orientation="vertical"
android:paddingLeft="8dp" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/track_widget_distance_value"
style="@style/TrackWidgetValue" />
<TextView
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" >
<TextView
android:id="@+id/track_widget_time_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_time_label"
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" >
<TextView
android:id="@+id/track_widget_speed_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_speed_label"
style="@style/TrackWidgetLabel" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</FrameLayout>
MyTracks/res/values-v14/dimens.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2012 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.
-->
<resources>
<dimen name="widget_margin">0dp</dimen>
</resources>
MyTracks/res/values/colors.xml
+2 -2
View File
@@ -49,8 +49,8 @@ limitations under the License.
<color name="power_border">#FF401465</color>
<color name="power_fill">#40401465</color>
<!-- app widget horizontal line -->
<color name="appwidget_hr">#99999999</color>
<!-- track widget line -->
<color name="track_widget_line">#99999999</color>
<!-- dynamic track slow path, green -->
<color name="slow_path">#F774DF00</color>
MyTracks/res/values/dimens.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2012 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.
-->
<resources>
<dimen name="widget_margin">8dp</dimen>
</resources>
MyTracks/res/values/styles.xml
+7 -2
View File
@@ -157,8 +157,13 @@ limitations under the License.
</style>
<!-- Theme selector -->
<style name="ThemeSelector" parent="android:Theme" />
<!-- The style for the track widget value -->
<style name="TrackWidgetValue" parent="@style/TextSmall">
<!-- The style for the track widget label -->
<style name="TrackWidgetLabel" parent="@style/TextSmall">
<item name="android:width">100dp</item>
</style>
<!-- The style for the track widget value -->
<style name="TrackWidgetValue" parent="@style/TextSmall">
<item name="android:layout_weight">1</item>
<item name="android:layout_width">0dp</item>
</style>
</resources>
MyTracks/res/xml/stats_settings.xml
+2 -2
View File
@@ -29,8 +29,8 @@ limitations under the License.
<CheckBoxPreference
android:defaultValue="true"
android:key="@string/stats_use_total_time_key"
android:summaryOff="@string/stats_total_time"
android:summaryOn="@string/stats_moving_time"
android:summaryOff="@string/stats_moving_time"
android:summaryOn="@string/stats_total_time"
android:title="@string/settings_stats_time_title" />
<PreferenceCategory android:title="@string/settings_show" >
<CheckBoxPreference
MyTracks/res/xml/track_widget_info.xml
+3 -4
View File
@@ -14,9 +14,8 @@ 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.
-->
<appwidget-provider
xmlns:android="http://schemas.android.com/apk/res/android"
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:initialLayout="@layout/track_widget"
android:minHeight="72dp"
android:minWidth="294dp"
android:minHeight="110dp"
android:minWidth="250dp"
android:updatePeriodMillis="0" />