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

Use a dialog for the welcome page. Thus the startup sequence

Browse Source 
consists of three dialogs.
Rename to HelpActivity.
Fix activity button styles.
Reuse EulaDialogFragment when invoked from the AboutDialogFragment.
Only hide the title bar on the TrackDetailPage.
This commit is contained in:
Jimmy Shih
2012-04-07 15:52:28 -07:00
parent 54bfe5d4b4
commit adfa66505e
23 changed files with 679 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/help.xml
+30
View File
@@ -0,0 +1,30 @@
<?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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="vertical" >
<ScrollView
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent" >
<include layout="@layout/welcome" />
</ScrollView>
<LinearLayout style="@style/BottomBar" >
<include layout="@layout/help_buttons" />
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/help_buttons.xml
+26
View File
@@ -0,0 +1,26 @@
<?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.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<Button
android:id="@+id/help_ok"
android:text="@string/generic_ok"
style="@style/BottomButton" />
<Button
android:id="@+id/help_about"
android:text="@string/help_about"
style="@style/BottomButton" />
</merge>
MyTracks/res/layout/help_content.xml
+114
View File
@@ -0,0 +1,114 @@
<?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.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_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/arrow_icon" />
<TextView
android:text="@string/help_my_tracks_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_my_tracks_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_location_precision_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_location_precision_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_gps_fix_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_gps_fix_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_data_connection_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_data_connection_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_elevation_precision_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_elevation_precision_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_battery_life_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_battery_life_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_share_friends_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_share_friends_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_share_visibility_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_share_visibility_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_split_track_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_split_track_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_saved_files_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_saved_files_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_waypoint_marker_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_waypoint_marker_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_statistics_marker_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_statistics_marker_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_delete_tracks_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_delete_tracks_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_edit_tracks_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_edit_tracks_answer"
style="@style/WelcomeAnswerTextView" />
</LinearLayout>
</merge>
MyTracks/res/layout/mytracks_waypoint_details.xml
+7 -9
View File
@@ -486,16 +486,14 @@ limitations under the License.
</TableLayout>
</LinearLayout>
</ScrollView>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/waypointdetails_save"
android:layout_gravity="left"
<LinearLayout style="@style/BottomBar" >
<Button
android:id="@+id/waypointdetails_save"
android:text="@string/generic_save"
style="@style/Button"/>
<Button android:id="@+id/waypointdetails_cancel"
android:layout_gravity="right"
style="@style/BottomButton" />
<Button
android:id="@+id/waypointdetails_cancel"
android:text="@string/generic_cancel"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
style="@style/BottomButton" />
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/mytracks_waypoints_list.xml
+7 -10
View File
@@ -35,21 +35,18 @@ limitations under the License.
android:text="@string/marker_list_pick_one"
android:layout_weight="1"/>
</LinearLayout>
<ListView android:id="@android:id/list"
android:layout_width="fill_parent"
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_gravity="left"
<LinearLayout style="@style/BottomBar" >
<Button
android:id="@+id/waypointslist_btn_insert_statistics"
android:text="@string/marker_list_insert_statistics"
style="@style/Button"/>
<Button android:id="@+id/waypointslist_btn_insert_waypoint"
android:layout_gravity="right"
style="@style/BottomButton" />
<Button
android:id="@+id/waypointslist_btn_insert_waypoint"
android:text="@string/marker_list_insert_waypoint"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
style="@style/BottomButton" />
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/track_edit.xml
+3 -9
View File
@@ -92,20 +92,14 @@ limitations under the License.
/>
</LinearLayout>
</ScrollView>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<LinearLayout style="@style/BottomBar" >
<Button
android:id="@+id/track_edit_save"
android:layout_gravity="left"
android:text="@string/generic_save"
style="@style/Button"
/>
style="@style/BottomButton" />
<Button
android:id="@+id/track_edit_cancel"
android:layout_gravity="right"
android:text="@string/generic_cancel"
style="@style/Button"
/>
<LinearLayout style="@style/ButtonSpacer"/>
style="@style/BottomButton" />
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/welcome.xml
+4 -138
View File
@@ -14,142 +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.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="vertical">
<ScrollView
android:background="@color/white"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent">
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical">
<ImageView
android:contentDescription="@string/my_tracks_app_name"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:scaleType="fitStart"
android:src="@drawable/arrow_icon"/>
<TextView
android:text="@string/welcome_my_tracks_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_my_tracks_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_app_navigation_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_app_navigation_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_add_graph_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_add_graph_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_gps_fix_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_gps_fix_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_send_google_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_send_google_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_share_friends_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_share_friends_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_waypoint_marker_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_waypoint_marker_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_statistics_marker_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_statistics_marker_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_data_connection_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_data_connection_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_battery_life_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_battery_life_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_share_file_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_share_file_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_location_precision_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_location_precision_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_elevation_precision_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_elevation_precision_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_edit_accuracy_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_edit_accuracy_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_split_track_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_split_track_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_delete_all_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_delete_all_answer"
style="@style/WelcomeTextView"/>
<TextView
android:text="@string/welcome_maps_sharing_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_maps_sharing_answer"
style="@style/WelcomeTextView"/>
</LinearLayout>
</ScrollView>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button
android:id="@+id/welcome_ok"
android:layout_gravity="left"
android:text="@string/generic_ok"
style="@style/Button"/>
<Button
android:id="@+id/welcome_about"
android:layout_gravity="right"
android:text="@string/welcome_about"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>
</LinearLayout>
android:layout_width="fill_parent" >
<include layout="@layout/help_content"/>
</ScrollView>