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

Merge heads

Browse Source
This commit is contained in:
youtaol
2013-02-21 14:32:04 +08:00
parent c88e67abe1
commit e0084f6652
41 changed files with 150 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/help.xml
+3 -113
View File
@@ -19,120 +19,10 @@ limitations under the License.
android:layout_width="match_parent"
android:orientation="vertical" >
<ScrollView style="@style/ScrollView.WithBottomButtons" >
<LinearLayout
<WebView
android:id="@+id/help_webview"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
android:padding="8dp" >
<ImageView
android:contentDescription="@string/my_tracks_app_name"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:scaleType="fitStart"
android:src="@drawable/my_tracks_icon" />
<TextView
android:text="@string/help_my_tracks_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_my_tracks_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_location_precision_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_location_precision_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_gps_signal_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_gps_signal_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_data_connection_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_data_connection_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_elevation_precision_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_elevation_precision_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_battery_life_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_battery_life_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_share_friends_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_share_friends_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_send_track_question"
style="@style/HelpQuestion" />
<TextView
android:id="@+id/help_send_track_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_maps_public_unlisted_question"
style="@style/HelpQuestion" />
<TextView
android:id="@+id/help_maps_public_unlisted_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_share_visibility_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_share_visibility_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_split_track_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_split_track_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_saved_files_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_saved_files_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_external_storage_access_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_external_storage_access_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_marker_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_marker_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_split_marker_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_split_marker_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_delete_tracks_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_delete_tracks_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_edit_tracks_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_edit_tracks_answer"
style="@style/HelpAnswer" />
</LinearLayout>
android:layout_width="match_parent" />
</ScrollView>
<LinearLayout style="@style/BottomButtonBar" >
<include layout="@layout/help_buttons" />
MyTracks/res/layout/list_item.xml
+43 -51
View File
@@ -14,81 +14,73 @@ 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:gravity="top"
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
android:paddingBottom="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingTop="8dp" >
<ImageView
android:contentDescription="@string/icon_track"
android:id="@+id/list_item_icon"
android:paddingTop="8dp"
android:shrinkColumns="1"
android:stretchColumns="1" >
<TableRow
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:paddingTop="4dp" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_width="match_parent"
android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent" >
<ImageView
android:contentDescription="@string/icon_track"
android:id="@+id/list_item_icon"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_width="wrap_content" />
<TableLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_width="0dp"
android:orientation="vertical" >
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/TextLarge" />
</LinearLayout>
<TextView
android:id="@+id/list_item_date"
android:layout_gravity="bottom"
android:paddingLeft="8dp"
android:singleLine="true"
android:textColor="@android:color/secondary_text_dark"
style="@style/TextSmall" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_width="0dp"
android:orientation="vertical" >
<TextView
android:id="@+id/list_item_date"
style="@style/ListItemDate" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/list_item_time_distance"
android:layout_gravity="bottom"
android:layout_width="fill_parent"
android:singleLine="true"
android:textColor="@android:color/primary_text_dark"
style="@style/TextSmall" />
</LinearLayout>
<TextView
android:id="@+id/list_item_time"
android:layout_gravity="bottom"
android:paddingLeft="8dp"
android:singleLine="true"
android:textColor="@android:color/secondary_text_dark"
style="@style/TextSmall" />
</LinearLayout>
<TextView
android:id="@+id/list_item_time"
style="@style/ListItemDate" />
</TableRow>
</TableLayout>
</TableRow>
<TableRow
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<TextView
android:id="@+id/list_item_recording"
android:layout_column="1"
android:singleLine="true"
style="@style/TextSmall" />
</TableRow>
<TableRow
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<TextView
android:id="@+id/list_item_description"
android:layout_column="1"
android:singleLine="false"
android:textColor="@android:color/secondary_text_dark"
style="@style/TextSmall" />
</LinearLayout>
</LinearLayout>
</TableRow>
</TableLayout>