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

Merge heads

Browse Source
This commit is contained in:
youtaol
2013-08-15 09:46:14 +08:00
parent 4d8c44782e
commit d64b6a4d93
30 changed files with 785 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/drawable-hdpi/ic_menu_insert_photo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

MyTracks/res/drawable-mdpi/ic_menu_insert_photo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

MyTracks/res/drawable-xhdpi/ic_menu_insert_photo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

MyTracks/res/layout/list_item.xml
+62 -34
View File
@@ -24,9 +24,9 @@ limitations under the License.
android:shrinkColumns="1"
android:stretchColumns="1"
style="@style/ListItem" >
<TableRow
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<!-- First row -->
<TableRow>
<!-- First column -->
<ImageView
android:contentDescription="@string/icon_track"
android:id="@+id/list_item_icon"
@@ -35,39 +35,67 @@ limitations under the License.
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_width="wrap_content" />
<TableLayout
<!-- Second column -->
<LinearLayout
android:baselineAligned="false"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:shrinkColumns="0"
android:stretchColumns="0" >
<TableRow>
<TextView
android:id="@+id/list_item_name"
android:layout_gravity="bottom"
android:layout_width="fill_parent"
android:singleLine="true"
style="@style/TextMedium" />
<TextView
android:id="@+id/list_item_date"
style="@style/ListItemDate" />
</TableRow>
<TableRow>
<!-- Need to match the style set in ListItemUtils.setListItem -->
<TextView
android:id="@+id/list_item_time_distance"
android:layout_gravity="bottom"
android:layout_width="fill_parent"
android:singleLine="true"
style="@style/TextSmall" />
<TextView
android:id="@+id/list_item_time"
style="@style/ListItemDate" />
</TableRow>
</TableLayout>
android:layout_width="match_parent" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_weight="3"
android:layout_width="0dp" >
<TableLayout
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_width="0dp"
android:shrinkColumns="*"
android:stretchColumns="*" >
<TableRow>
<TextView
android:ellipsize="end"
android:id="@+id/list_item_name"
android:singleLine="true"
style="@style/TextMedium" />
</TableRow>
<TableRow>
<!-- Need to match the style set in ListItemUtils.setListItem -->
<TextView
android:ellipsize="end"
android:id="@+id/list_item_time_distance"
android:singleLine="true"
style="@style/TextSmall" />
</TableRow>
</TableLayout>
<ImageView
android:id="@+id/list_item_photo"
android:layout_gravity="center"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_weight="1"
android:layout_width="0dp"
android:scaleType="centerCrop" />
</LinearLayout>
<TableLayout
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_width="0dp"
android:shrinkColumns="*"
android:stretchColumns="*" >
<TableRow>
<TextView
android:id="@+id/list_item_date"
style="@style/ListItemDate" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/list_item_time"
style="@style/ListItemDate" />
</TableRow>
</TableLayout>
</LinearLayout>
</TableRow>
<TableRow
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<!-- Second row -->
<TableRow>
<TextView
android:id="@+id/list_item_description"
android:layout_column="1"
MyTracks/res/layout/marker_detail_activity.xml
+24
View File
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2013 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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent" >
<android.support.v4.view.ViewPager
android:id="@+id/maker_detail_activity_view_pager"
android:layout_height="match_parent"
android:layout_width="match_parent" />
</LinearLayout>
MyTracks/res/layout/marker_detail.xml → MyTracks/res/layout/marker_detail_fragment.xml
+11 -3
View File
@@ -21,14 +21,19 @@ limitations under the License.
android:layout_width="match_parent"
android:orientation="vertical"
android:padding="8dp" >
<TextView
android:id="@+id/marker_detail_name"
style="@style/TextLarge" />
<LinearLayout
android:id="@+id/marker_detail_waypoint_section"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical" >
<ImageView
android:id="@+id/marker_detail_waypoint_photo"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:scaleType="centerInside" />
<TextView
android:id="@+id/marker_detail_waypoint_name"
style="@style/TextLarge.WithTopMargin" />
<TextView
android:id="@+id/marker_detail_waypoint_marker_type"
style="@style/TextLarge.WithTopMargin" />
@@ -41,6 +46,9 @@ limitations under the License.
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical" >
<TextView
android:id="@+id/marker_detail_statistics_name"
style="@style/TextLarge" />
<TextView
android:text="@string/marker_detail_statistics_title"
style="@style/TextLarge.WithTopMargin" />
MyTracks/res/menu/map.xml
+1 -1
View File
@@ -17,7 +17,7 @@ limitations under the License.
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:icon="@drawable/ic_menu_map_layer"
android:orderInCategory="5"
android:orderInCategory="6"
android:showAsAction="ifRoom"
android:title="@string/menu_map_layer">
<menu>
MyTracks/res/menu/track_detail.xml
+19 -13
View File
@@ -21,68 +21,74 @@ limitations under the License.
android:orderInCategory="1"
android:showAsAction="ifRoom"
android:title="@string/menu_insert_marker"/>
<item
android:icon="@drawable/ic_menu_insert_photo"
android:id="@+id/track_detail_insert_photo"
android:orderInCategory="2"
android:showAsAction="ifRoom"
android:title="@string/menu_insert_photo"/>
<item
android:icon="@drawable/ic_menu_play"
android:id="@+id/track_detail_play"
android:orderInCategory="2"
android:orderInCategory="3"
android:showAsAction="ifRoom"
android:title="@string/menu_play"/>
<item
android:icon="@drawable/ic_menu_share"
android:id="@+id/track_detail_share"
android:orderInCategory="3"
android:orderInCategory="4"
android:showAsAction="ifRoom"
android:title="@string/menu_share"/>
<item
android:icon="@drawable/ic_menu_markers"
android:id="@+id/track_detail_markers"
android:orderInCategory="4"
android:orderInCategory="5"
android:showAsAction="ifRoom"
android:title="@string/menu_markers"/>
<!-- android:orderInCategory="5" is in map.xml -->
<!-- android:orderInCategory="6" is in map.xml -->
<item
android:icon="@drawable/ic_menu_export"
android:id="@+id/track_detail_export"
android:orderInCategory="6"
android:orderInCategory="7"
android:title="@string/menu_export"/>
<item
android:icon="@drawable/ic_menu_edit"
android:id="@+id/track_detail_edit"
android:orderInCategory="7"
android:orderInCategory="8"
android:title="@string/menu_edit"/>
<item
android:icon="@drawable/ic_menu_delete"
android:id="@+id/track_detail_delete"
android:orderInCategory="8"
android:orderInCategory="9"
android:title="@string/menu_delete"/>
<item
android:icon="@drawable/ic_menu_voice_frequency"
android:id="@+id/track_detail_voice_frequency"
android:orderInCategory="9"
android:orderInCategory="10"
android:title="@string/menu_voice_frequency"/>
<item
android:icon="@drawable/ic_menu_split_frequency"
android:id="@+id/track_detail_split_frequency"
android:orderInCategory="10"
android:orderInCategory="11"
android:title="@string/menu_split_frequency"/>
<item
android:icon="@drawable/ic_menu_sensor_state"
android:id="@+id/track_detail_sensor_state"
android:orderInCategory="11"
android:orderInCategory="12"
android:title="@string/menu_sensor_state"/>
<item
android:icon="@drawable/ic_menu_settings"
android:id="@+id/track_detail_settings"
android:orderInCategory="12"
android:orderInCategory="13"
android:title="@string/menu_settings"/>
<item
android:icon="@drawable/ic_menu_feedback"
android:id="@+id/track_detail_feedback"
android:orderInCategory="13"
android:orderInCategory="14"
android:title="@string/menu_feedback"/>
<item
android:icon="@drawable/ic_menu_help"
android:id="@+id/track_detail_help"
android:orderInCategory="14"
android:orderInCategory="15"
android:title="@string/menu_help"/>
</menu>
MyTracks/res/values/strings.xml
+10
View File
@@ -1005,6 +1005,10 @@ limitations under the License.
translation_description="When deleting multiple markers, the confirmation message.">
All markers for this track will be permanently deleted from the device.
</string>
<string name="marker_insert_photo_error"
translation_description="The error message when unable to insert a photo marker.">
Unable to insert a photo marker. Try again.
</string>
<string name="marker_label_end"
translation_description="When inserting a marker to indicate the end of a track, the marker's
name. E.g., 'track_name (End)'.
@@ -1124,6 +1128,12 @@ limitations under the License.
Character limit: ~20 (1 line)">
Insert marker
</string>
<string name="menu_insert_photo"
translation_description="In the menu, to insert a photo.
Character limit: ~20 (1 line)">
Insert photo
</string>
<string name="menu_map"
translation_description="In the menu, under the map layer option, the submenu to display normal
map.