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

Merged to head

Browse Source
This commit is contained in:
Rodrigo Damazio
2011-11-14 23:27:04 -02:00
parent a4ae9e8fd5
commit c3cda97692
193 changed files with 8457 additions and 11274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/about.xml
+11 -6
View File
@@ -31,12 +31,12 @@ limitations under the License.
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/app_name"
android:text="@string/my_tracks_app_name"
android:textSize="30sp" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_copyright_message"
android:text="@string/about_copyright_notice"
android:textSize="15sp" />
</LinearLayout>
</TableRow>
@@ -67,6 +67,11 @@ limitations under the License.
android:layout_width="wrap_content"
android:text="@string/about_dylan"
android:textSize="20sp" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_jimmy"
android:textSize="20sp" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -75,7 +80,7 @@ limitations under the License.
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_rdamazio"
android:text="@string/about_rodrigo"
android:textSize="20sp" />
<TextView
android:layout_height="wrap_content"
@@ -100,7 +105,7 @@ limitations under the License.
android:layout_height="wrap_content"
android:id="@+id/about_version_register"
android:layout_width="wrap_content"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textSize="20sp" />
</TableRow>
@@ -119,7 +124,7 @@ limitations under the License.
android:autoLink="web"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_weburl"
android:text="@string/my_tracks_web_url"
android:textSize="18sp" />
</TableRow>
@@ -138,7 +143,7 @@ limitations under the License.
android:autoLink="web"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_privacy_weburl"
android:text="@string/my_tracks_privacy_url"
android:textSize="18sp" />
</TableRow>
MyTracks/res/layout/chart_settings.xml
+19 -30
View File
@@ -26,7 +26,7 @@ limitations under the License.
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/chart_settings"
android:text="@string/menu_chart_view_chart_settings"
android:textSize="20dip"
android:textColor="#fff"
android:layout_marginLeft="10dip"/>
@@ -57,7 +57,7 @@ limitations under the License.
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/x_axis"
android:text="@string/chart_settings_x_axis"
android:textSize="20dip" />
</LinearLayout>
<RadioGroup android:id="@+id/chart_settings_x"
@@ -66,11 +66,11 @@ limitations under the License.
<RadioButton android:id="@+id/chart_settings_by_distance"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/by_distance"/>
android:text="@string/chart_settings_by_distance"/>
<RadioButton android:id="@+id/chart_settings_by_time"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/by_time"/>
android:text="@string/chart_settings_by_time"/>
</RadioGroup>
</LinearLayout>
</TableRow>
@@ -90,59 +90,48 @@ limitations under the License.
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/y_axis"
android:text="@string/chart_settings_y_axis"
android:textSize="20dip" />
</LinearLayout>
<CheckBox android:id="@+id/chart_settings_elevation"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/elevation"/>
android:text="@string/stat_elevation"/>
<CheckBox android:id="@+id/chart_settings_speed"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/speed"/>
android:text="@string/stat_speed"/>
<CheckBox android:id="@+id/chart_settings_power"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/power"/>
android:text="@string/sensor_state_power"/>
<CheckBox android:id="@+id/chart_settings_cadence"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/cadence"/>
android:text="@string/sensor_state_cadence"/>
<CheckBox android:id="@+id/chart_settings_heart_rate"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/heart_rate"/>
android:text="@string/sensor_state_heart_rate"/>
</LinearLayout>
</TableRow>
</TableLayout>
</ScrollView>
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:padding="3dip">
<Button android:id="@+id/chart_settings_cancel"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_gravity="right"
android:text="@string/cancel"
android:textSize="14dip"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/chart_settings_ok"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_gravity="left"
android:text="@string/generic_ok"
style="@style/Button"/>
<Button android:id="@+id/chart_settings_cancel"
android:layout_gravity="right"
android:text="@string/ok"
android:textSize="14dip"/>
android:text="@string/generic_cancel"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/list.xml
+4 -4
View File
@@ -31,7 +31,7 @@ limitations under the License.
android:layout_height="wrap_content"
android:textSize="16dip"
android:textColor="#fff"
android:text="@string/select_map_message"
android:text="@string/my_maps_list_pick_map"
android:layout_weight="0"/>
</LinearLayout>
<ListView android:id="@+id/maplist"
@@ -47,7 +47,7 @@ limitations under the License.
android:textSize="16dip"
android:textColor="#c00"
android:textStyle="bold"
android:text="@string/mapslist_no_maps_available"
android:text="@string/my_maps_list_no_maps"
android:visibility="gone"/>
<TextView android:id="@+id/failed"
android:layout_width="fill_parent"
@@ -58,7 +58,7 @@ limitations under the License.
android:textSize="16dip"
android:textColor="#c00"
android:textStyle="bold"
android:text="@string/maps_list_failed"
android:text="@string/my_maps_list_error"
android:visibility="gone"/>
<LinearLayout
android:orientation="horizontal"
@@ -89,7 +89,7 @@ limitations under the License.
android:textSize="16dip"
android:textColor="#fff"
android:textStyle="bold"
android:text="@string/maps_list_loading"/>
android:text="@string/my_maps_list_loading"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
MyTracks/res/layout/mytracks_detail.xml
+18 -29
View File
@@ -20,7 +20,7 @@ limitations under the License.
android:layout_height="fill_parent"
android:paddingTop="10dip"
android:background="#c000">
<TextView android:text="@string/trackdetails_name"
<TextView android:text="@string/track_detail_track_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
<LinearLayout
@@ -41,19 +41,19 @@ limitations under the License.
android:autoText="true"
android:capitalize="words"
android:selectAllOnFocus="true"
android:hint="@string/trackdetails_name_hint"
android:hint="@string/track_detail_track_name"
android:imeOptions="actionNext"/>
</LinearLayout>
<TextView android:text="@string/trackdetails_category"
<TextView android:text="@string/track_detail_activity_type"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
<AutoCompleteTextView android:id="@+id/trackdetails_category"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:hint="@string/trackdetails_category_hint"
android:hint="@string/track_detail_activity_type_hint"
android:imeOptions="actionNext"/>
<TextView android:text="@string/trackdetails_description"
<TextView android:text="@string/track_detail_track_description"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
<EditText android:id="@+id/trackdetails_description"
@@ -66,29 +66,18 @@ limitations under the License.
android:maxLines="50"
android:gravity="top"
android:layout_weight="1"
android:hint="@string/trackdetails_description_hint"
android:hint="@string/track_detail_track_description"
android:imeOptions="actionDone"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:padding="3dip">
<Button android:id="@+id/trackdetails_cancel"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_gravity="right"
android:text="@string/cancel"
android:textSize="14dip"/>
<TextView
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<Button android:id="@+id/trackdetails_save"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_gravity="right"
android:text="@string/save"
android:textSize="14dip"/>
</LinearLayout>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/trackdetails_save"
android:layout_gravity="left"
android:text="@string/generic_save"
style="@style/Button"/>
<Button android:id="@+id/trackdetails_cancel"
android:layout_gravity="right"
android:text="@string/generic_cancel"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/mytracks_layout.xml
+1 -1
View File
@@ -41,7 +41,7 @@ limitations under the License.
android:layout_height="wrap_content"
android:textSize="16dip"
android:textColor="#fff"
android:text="@string/wait_for_fix"
android:text="@string/gps_wait_for_fix"
android:layout_weight="0"/>
</LinearLayout>
<LinearLayout android:id="@+id/busypane"
MyTracks/res/layout/mytracks_list.xml
+14 -28
View File
@@ -32,41 +32,27 @@ limitations under the License.
android:layout_height="wrap_content"
android:textSize="16dip"
android:textColor="#fff"
android:text="@string/tracklist_pick_one"
android:text="@string/track_list_pick_one"
android:layout_weight="0"/>
</LinearLayout>
<ListView android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:layout_weight="0"
android:padding="3dip">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/tracklist_btn_import_all"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_gravity="left|top"
android:text="@string/tracklist_btn_import_all"
android:textSize="14dip"/>
android:layout_gravity="left"
android:text="@string/track_list_import_all"
style="@style/Button"/>
<Button android:id="@+id/tracklist_btn_export_all"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_gravity="left|top"
android:text="@string/tracklist_btn_export_all"
android:textSize="14dip"/>
android:layout_gravity="center_horizontal"
android:text="@string/track_list_export_all"
style="@style/Button"/>
<Button android:id="@+id/tracklist_btn_delete_all"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_gravity="left|top"
android:text="@string/tracklist_btn_delete_all"
android:textSize="14dip"/>
</LinearLayout>
android:layout_gravity="right"
android:text="@string/track_list_delete_all"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/mytracks_send_to_google.xml
+15 -38
View File
@@ -26,7 +26,7 @@ limitations under the License.
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_title"
android:text="@string/send_google_title"
android:textSize="20dip"
android:textColor="#fff"
android:layout_marginLeft="10dip"/>
@@ -55,7 +55,7 @@ limitations under the License.
<CheckBox android:id="@+id/sendtogoogle_google_mymaps"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_google_mymaps"
android:text="@string/send_google_my_maps"
android:textSize="20dip"
android:checked="true"/>
<RadioGroup android:id="@+id/sendtogoogle_group_mymaps"
@@ -64,11 +64,11 @@ limitations under the License.
<RadioButton android:id="@+id/sendtogoogle_create_new_map"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_create_new_map"/>
android:text="@string/send_google_new_map"/>
<RadioButton android:id="@+id/sendtogoogle_pick_existing_map"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_pick_existing_map"/>
android:text="@string/send_google_existing_map"/>
</RadioGroup>
</LinearLayout>
</TableRow>
@@ -86,7 +86,7 @@ limitations under the License.
<CheckBox android:id="@+id/sendtogoogle_google_fusiontables"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_google_fusiontables"
android:text="@string/send_google_fusion_tables"
android:textSize="20dip"
android:checked="true"/>
</LinearLayout>
@@ -105,46 +105,23 @@ limitations under the License.
<CheckBox android:id="@+id/sendtogoogle_google_docs"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_google_docs"
android:text="@string/send_google_docs"
android:textSize="20dip"
android:checked="true"/>
<RadioGroup android:id="@+id/sendtogoogle_group_docs"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:visibility="gone">
<RadioButton android:id="@+id/sendtogoogle_send_stats"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_send_stats"/>
<RadioButton android:id="@+id/sendtogoogle_send_stats_and_points"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_send_stats_and_points"
android:enabled="false"/>
</RadioGroup>
</LinearLayout>
</TableRow>
</TableLayout>
</ScrollView>
<LinearLayout
android:background="@drawable/list_bar"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal"
android:paddingLeft="2dip"
android:paddingRight="2dip"
android:paddingTop="4dip">
<!-- left spacer -->
<LinearLayout style="@style/DialogButtonSpacer"/>
<Button android:id="@+id/sendtogoogle_cancel"
android:layout_gravity="left"
android:text="@string/cancel"
style="@style/DialogButton"/>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/sendtogoogle_send_now"
android:layout_gravity="left"
android:text="@string/send_google_send_now"
style="@style/Button"/>
<Button android:id="@+id/sendtogoogle_cancel"
android:layout_gravity="right"
android:text="@string/sendtogoogle_send_now"
style="@style/DialogButton"/>
<!-- right spacer -->
<LinearLayout style="@style/DialogButtonSpacer"/>
android:text="@string/generic_cancel"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/mytracks_waypoint_details.xml
+44 -57
View File
@@ -30,7 +30,7 @@ limitations under the License.
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<TextView android:text="@string/waypointdetails_name"
<TextView android:text="@string/marker_detail_marker_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
<LinearLayout
@@ -51,7 +51,7 @@ limitations under the License.
android:autoText="true"
android:capitalize="words"
android:selectAllOnFocus="true"
android:hint="@string/waypointdetails_name_hint"
android:hint="@string/marker_detail_marker_name"
android:imeOptions="actionNext"/>
</LinearLayout>
<LinearLayout android:id="@+id/waypointdetails_description_layout"
@@ -61,16 +61,16 @@ limitations under the License.
android:visibility="visible"
android:layout_weight="1">
<TextView android:id="@+id/waypointdetails_category_label"
android:text="@string/waypointdetails_category"
android:text="@string/marker_detail_marker_type"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
<AutoCompleteTextView android:id="@+id/waypointdetails_category"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:hint="@string/waypointdetails_category_hint"
android:hint="@string/marker_detail_marker_type_hint"
android:imeOptions="actionNext"/>
<TextView android:text="@string/waypointdetails_description"
<TextView android:text="@string/marker_detail_marker_description"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
<EditText android:id="@+id/waypointdetails_description"
@@ -84,7 +84,7 @@ limitations under the License.
android:maxLines="50"
android:gravity="top"
android:layout_weight="1"
android:hint="@string/waypointdetails_description_hint"
android:hint="@string/marker_detail_marker_description"
android:imeOptions="actionDone"/>
</LinearLayout>
@@ -101,12 +101,12 @@ limitations under the License.
android:id="@+id/total_distance_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/total_distance_label" />
android:text="@string/stat_total_distance" />
<TextView
android:id="@+id/max_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/max_speed_label" />
android:text="@string/stat_max_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -116,7 +116,7 @@ limitations under the License.
android:layout_column="1"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -125,7 +125,7 @@ limitations under the License.
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/mile"
android:text="@string/unit_mile"
android:textColor="@color/stat_label_text" />
<!-- TODO 4/08/2009
The following is a bad hack to get a spacer the same size as the
@@ -145,7 +145,7 @@ limitations under the License.
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<LinearLayout
@@ -183,12 +183,12 @@ limitations under the License.
android:id="@+id/track_time_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/total_time_label" />
android:text="@string/stat_total_time" />
<TextView
android:id="@+id/average_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/average_speed_label" />
android:text="@string/stat_average_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -201,7 +201,7 @@ limitations under the License.
android:layout_marginTop="-9dip"
android:layout_span="2"
android:layout_width="fill_parent"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -217,7 +217,7 @@ limitations under the License.
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<LinearLayout
@@ -255,12 +255,12 @@ limitations under the License.
android:id="@+id/moving_time_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/moving_time_label" />
android:text="@string/stat_moving_time" />
<TextView
android:id="@+id/average_moving_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/average_moving_speed_label" />
android:text="@string/stat_average_moving_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -273,7 +273,7 @@ limitations under the License.
android:layout_marginTop="-9dip"
android:layout_width="fill_parent"
android:layout_span="2"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -289,7 +289,7 @@ limitations under the License.
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<LinearLayout
@@ -327,12 +327,12 @@ limitations under the License.
android:id="@+id/elevation_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/elevation_label" />
android:text="@string/stat_elevation" />
<TextView
android:id="@+id/elevation_gain_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/elevation_gain_label" />
android:text="@string/stat_elevation_gain" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -342,7 +342,7 @@ limitations under the License.
android:layout_column="1"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -351,7 +351,7 @@ limitations under the License.
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/feet"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text"/>
<TextView
android:background="@color/black"
@@ -366,7 +366,7 @@ limitations under the License.
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -375,7 +375,7 @@ limitations under the License.
android:layout_column="5"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/feet"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
</TableRow>
@@ -385,12 +385,12 @@ limitations under the License.
android:id="@+id/min_elevation_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/min_elevation_label" />
android:text="@string/stat_min_elevation" />
<TextView
android:id="@+id/max_elevation_label"
android:layout_column="4"
android:layout_span="3"
android:text="@string/max_elevation_label" />
android:text="@string/stat_max_elevation" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -400,7 +400,7 @@ limitations under the License.
android:layout_column="1"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -409,7 +409,7 @@ limitations under the License.
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/feet"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
<TextView
android:background="@color/black"
@@ -424,7 +424,7 @@ limitations under the License.
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -433,7 +433,7 @@ limitations under the License.
android:layout_column="5"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/feet"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
</TableRow>
@@ -443,12 +443,12 @@ limitations under the License.
android:id="@+id/min_grade_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/min_grade_label" />
android:text="@string/stat_min_grade" />
<TextView
android:id="@+id/max_grade_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/max_grade_label" />
android:text="@string/stat_max_grade" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -461,7 +461,7 @@ limitations under the License.
android:layout_marginTop="-9dip"
android:layout_width="fill_parent"
android:layout_span="2"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -480,36 +480,23 @@ limitations under the License.
android:layout_marginTop="-9dip"
android:layout_width="fill_parent"
android:layout_span="2"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
</TableRow>
</TableLayout>
</LinearLayout>
</ScrollView>
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:padding="3dip">
<Button android:id="@+id/waypointdetails_cancel"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_gravity="right"
android:text="@string/cancel"
android:textSize="14dip"/>
<TextView
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/waypointdetails_save"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_gravity="left"
android:text="@string/generic_save"
style="@style/Button"/>
<Button android:id="@+id/waypointdetails_cancel"
android:layout_gravity="right"
android:text="@string/save"
android:textSize="14dip"/>
android:text="@string/generic_cancel"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/mytracks_waypoints_list.xml
+11 -23
View File
@@ -32,7 +32,7 @@ limitations under the License.
android:layout_height="wrap_content"
android:textSize="16dip"
android:textColor="#fff"
android:text="@string/waypointslist_pick_one"
android:text="@string/marker_list_pick_one"
android:layout_weight="0"/>
</LinearLayout>
@@ -40,28 +40,16 @@ limitations under the License.
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:layout_weight="0"
android:padding="3dip">
<TextView
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/waypointslist_btn_insert_statistics"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_gravity="left|top"
android:text="@string/waypointslist_btn_insert_statistics"
android:textSize="14dip"/>
android:layout_gravity="left"
android:text="@string/marker_list_insert_statistics"
style="@style/Button"/>
<Button android:id="@+id/waypointslist_btn_insert_waypoint"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_gravity="left|top"
android:text="@string/waypointslist_btn_insert_waypoint"
android:textSize="14dip"/>
</LinearLayout>
android:layout_gravity="right"
android:text="@string/marker_list_insert_waypoint"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/send_to_google_result.xml
+3 -3
View File
@@ -31,7 +31,7 @@ services.
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/status_track_upload_status"
android:text="@string/send_google_result_header"
style="?android:attr/textAppearanceLarge"/>
<TableLayout
android:layout_width="wrap_content"
@@ -52,14 +52,14 @@ services.
android:id="@+id/send_to_google_result_comment"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/status_mymap_info"
android:text="@string/send_google_success_footer"
android:visibility="gone"
style="?android:attr/textAppearanceSmall"/>
<TextView
android:id="@+id/send_to_google_result_error"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/error_please_try_again_later"
android:text="@string/send_google_error"
android:visibility="gone"
style="?android:attr/textAppearanceLarge"/>
</LinearLayout>
MyTracks/res/layout/sensor_state.xml
+8 -8
View File
@@ -37,7 +37,7 @@ limitations under the License.
<TableRow>
<TextView
android:layout_span="5"
android:text="@string/sensor_state" />
android:text="@string/menu_sensor_state" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -52,7 +52,7 @@ limitations under the License.
<TableRow>
<TextView
android:layout_span="5"
android:text="@string/sensor_data_time" />
android:text="@string/sensor_state_last_sensor_time" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -69,7 +69,7 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/power" />
android:text="@string/sensor_state_power" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -90,7 +90,7 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/cadence" />
android:text="@string/sensor_state_cadence" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -110,7 +110,7 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/heart_rate" />
android:text="@string/sensor_state_heart_rate" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -122,7 +122,7 @@ limitations under the License.
<TextView
style="@style/StatsUnitSolo"
android:layout_column="5"
android:text="@string/bpm" />
android:text="@string/unit_beat_per_minute" />
</TableRow>
<!-- Battery Level -->
@@ -131,7 +131,7 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/battery_level" />
android:text="@string/sensor_state_battery" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -143,7 +143,7 @@ limitations under the License.
<TextView
style="@style/StatsUnitSolo"
android:layout_column="5"
android:text="@string/percent" />
android:text="@string/unit_percent" />
</TableRow>
</TableLayout>
MyTracks/res/layout/stats.xml
+15 -15
View File
@@ -37,7 +37,7 @@ limitations under the License.
<TextView
android:id="@+id/speed_label"
android:layout_span="5"
android:text="@string/speed" />
android:text="@string/stat_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -73,12 +73,12 @@ limitations under the License.
android:id="@+id/total_distance_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/total_distance_label" />
android:text="@string/stat_total_distance" />
<TextView
android:id="@+id/max_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/max_speed_label" />
android:text="@string/stat_max_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -125,12 +125,12 @@ limitations under the License.
android:id="@+id/track_time_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/total_time_label" />
android:text="@string/stat_total_time" />
<TextView
android:id="@+id/average_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/average_speed_label" />
android:text="@string/stat_average_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -171,12 +171,12 @@ limitations under the License.
android:id="@+id/moving_time_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/moving_time_label" />
android:text="@string/stat_moving_time" />
<TextView
android:id="@+id/average_moving_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/average_moving_speed_label" />
android:text="@string/stat_average_moving_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -218,12 +218,12 @@ limitations under the License.
android:id="@+id/elevation_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/elevation_label" />
android:text="@string/stat_elevation" />
<TextView
android:id="@+id/elevation_gain_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/elevation_gain_label" />
android:text="@string/stat_elevation_gain" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -254,12 +254,12 @@ limitations under the License.
android:id="@+id/min_elevation_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/min_elevation_label" />
android:text="@string/stat_min_elevation" />
<TextView
android:id="@+id/max_elevation_label"
android:layout_column="4"
android:layout_span="3"
android:text="@string/max_elevation_label" />
android:text="@string/stat_max_elevation" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -290,12 +290,12 @@ limitations under the License.
android:id="@+id/min_grade_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/min_grade_label" />
android:text="@string/stat_min_grade" />
<TextView
android:id="@+id/max_grade_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/max_grade_label" />
android:text="@string/stat_max_grade" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -319,11 +319,11 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/latitude_label" />
android:text="@string/stat_latitude" />
<TextView
android:layout_column="4"
android:layout_span="2"
android:text="@string/longitude_label" />
android:text="@string/stat_longitude" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
MyTracks/res/layout/track_widget.xml
+3 -3
View File
@@ -52,7 +52,7 @@ limitations under the License.
android:id="@+id/appwidget_distance_text" />
<TextView
style="@style/WidgetText"
android:text="@string/total_distance_label" />
android:text="@string/stat_total_distance" />
</LinearLayout>
<ImageView
android:layout_width="fill_parent"
@@ -68,7 +68,7 @@ limitations under the License.
android:id="@+id/appwidget_time_text" />
<TextView
style="@style/WidgetText"
android:text="@string/moving_time_label" />
android:text="@string/stat_moving_time" />
</LinearLayout>
<ImageView
android:layout_width="fill_parent"
@@ -83,7 +83,7 @@ limitations under the License.
android:id="@+id/appwidget_speed_text" />
<TextView
style="@style/WidgetText"
android:text="@string/speed" />
android:text="@string/stat_speed" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/welcome.xml
+9 -23
View File
@@ -24,30 +24,16 @@ limitations under the License.
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:background="@drawable/list_bar"
android:padding="3dip">
<Button
android:id="@+id/welcome_about"
android:layout_width="wrap_content"
android:layout_height="48dip"
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/welcome_ok"
android:layout_gravity="left"
android:text="@string/welcome_about"
android:textSize="14dip" />
<TextView
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1" />
<Button
android:id="@+id/welcome_read_later"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:text="@string/generic_ok"
style="@style/Button"/>
<Button android:id="@+id/welcome_about"
android:layout_gravity="right"
android:text="@string/welcome_read_later"
android:textSize="14dip" />
android:text="@string/welcome_about"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>
</LinearLayout>