Merge to head

This commit is contained in:
Rodrigo Damazio
2011-12-06 16:34:48 -02:00
parent bb3a14aac0
commit ebe8cbc798
94 changed files with 2793 additions and 1892 deletions
+73 -123
View File
@@ -14,139 +14,89 @@ 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.
-->
<TableLayout
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:stretchColumns="2">
<TableRow>
<ImageView
android:layout_column="1"
android:src="@drawable/arrow_icon" />
<LinearLayout
android:layout_column="2"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content">
<TableLayout
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:paddingBottom="2dp"
android:stretchColumns="1">
<TableRow style="@style/AboutTableRow">
<ImageView
android:layout_column="0"
android:scaleType="center"
android:src="@drawable/arrow_icon"/>
<LinearLayout
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/my_tracks_app_name"
android:textSize="30sp" />
android:orientation="vertical">
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
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_notice"
android:textSize="15sp" />
</LinearLayout>
</TableRow>
<TableRow style="@style/AboutTableRow">
<TextView
android:text="@string/about_team"
style="@style/AboutTextView.Column0"/>
<LinearLayout
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_copyright_notice"
android:textSize="15sp" />
</LinearLayout>
</TableRow>
<View android:layout_height="2dip" />
<TableRow>
<TextView
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_team"
android:textSize="20sp" />
<LinearLayout
android:layout_column="2"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical">
android:orientation="vertical">
<TextView
android:text="@string/about_bart"
style="@style/AboutTextView"/>
<TextView
android:text="@string/about_dylan"
style="@style/AboutTextView"/>
<TextView
android:text="@string/about_jimmy"
style="@style/AboutTextView"/>
<TextView
android:text="@string/about_leif"
style="@style/AboutTextView"/>
<TextView
android:text="@string/about_rodrigo"
style="@style/AboutTextView"/>
<TextView
android:text="@string/about_sandor"
style="@style/AboutTextView"/>
</LinearLayout>
</TableRow>
<TableRow style="@style/AboutTableRow">
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_bart"
android:textSize="20sp" />
android:text="@string/about_version"
style="@style/AboutTextView.Column0"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_dylan"
android:textSize="20sp" />
android:id="@+id/about_version"
style="@style/AboutTextView"/>
</TableRow>
<TableRow style="@style/AboutTableRow">
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_jimmy"
android:textSize="20sp" />
android:text="@string/about_support"
style="@style/AboutTextView.Column0"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_leif"
android:textSize="20sp" />
android:text="@string/my_tracks_web_url"
style="@style/AboutTextView.Url"/>
</TableRow>
<TableRow style="@style/AboutTableRow">
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_rodrigo"
android:textSize="20sp" />
android:text="@string/about_privacy"
style="@style/AboutTextView.Column0"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_sandor"
android:textSize="20sp" />
</LinearLayout>
</TableRow>
<View android:layout_height="2dip" />
<TableRow>
<TextView
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_version"
android:textSize="20sp" />
<TextView
android:layout_height="wrap_content"
android:id="@+id/about_version_register"
android:layout_width="wrap_content"
android:text="@string/value_unknown"
android:textSize="20sp" />
</TableRow>
<View android:layout_height="2dip" />
<TableRow>
<TextView
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_support"
android:textSize="20sp" />
<TextView
android:autoLink="web"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/my_tracks_web_url"
android:textSize="18sp" />
</TableRow>
<View android:layout_height="2dip" />
<TableRow>
<TextView
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_privacy"
android:textSize="20sp" />
<TextView
android:autoLink="web"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/my_tracks_privacy_url"
android:textSize="18sp" />
</TableRow>
<View android:layout_height="4dip" />
</TableLayout>
android:text="@string/my_tracks_privacy_url"
style="@style/AboutTextView.Url"/>
</TableRow>
</TableLayout>
</ScrollView>
+68 -56
View File
@@ -15,108 +15,118 @@ 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:id="@+id/screen"
android:layout_width="200dip"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:minWidth="300dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="fill_parent"
android:background="@drawable/list_bar"
android:layout_height="wrap_content"
android:background="@drawable/list_bar">
android:layout_width="fill_parent">
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_width="fill_parent"
android:text="@string/menu_chart_view_chart_settings"
android:textSize="20dip"
android:textColor="#fff"
android:layout_marginLeft="10dip"/>
android:textSize="20sp"/>
</LinearLayout>
<ScrollView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent">
<TableLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:stretchColumns="1"
android:layout_marginTop="5dip"
android:layout_marginLeft="5dip">
android:layout_marginLeft="5dp"
android:layout_marginTop="5dp"
android:layout_width="fill_parent"
android:stretchColumns="1">
<TableRow>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="10dip">
android:layout_marginLeft="10dp"
android:layout_width="fill_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView android:src="@drawable/x_axis"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/chart_settings_x_axis"
android:textSize="20dip" />
</LinearLayout>
<RadioGroup android:id="@+id/chart_settings_x"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<RadioButton android:id="@+id/chart_settings_by_distance"
android:layout_width="fill_parent"
android:orientation="horizontal">
<ImageView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/x_axis"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/chart_settings_x_axis"
android:textSize="20sp"/>
</LinearLayout>
<RadioGroup
android:id="@+id/chart_settings_x"
android:layout_height="wrap_content"
android:layout_width="fill_parent">
<RadioButton
android:id="@+id/chart_settings_by_distance"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/chart_settings_by_distance"/>
<RadioButton android:id="@+id/chart_settings_by_time"
android:layout_width="fill_parent"
<RadioButton
android:id="@+id/chart_settings_by_time"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/chart_settings_by_time"/>
</RadioGroup>
</LinearLayout>
</TableRow>
<TableRow>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="10dip">
android:layout_marginLeft="10dp"
android:layout_width="fill_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal">
<ImageView android:src="@drawable/y_axis"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:layout_width="fill_parent"
<ImageView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/y_axis"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/chart_settings_y_axis"
android:textSize="20dip" />
android:textSize="20sp" />
</LinearLayout>
<CheckBox android:id="@+id/chart_settings_elevation"
<CheckBox
android:id="@+id/chart_settings_elevation"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/stat_elevation"/>
<CheckBox android:id="@+id/chart_settings_speed"
<CheckBox
android:id="@+id/chart_settings_speed"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/stat_speed"/>
<CheckBox android:id="@+id/chart_settings_power"
<CheckBox
android:id="@+id/chart_settings_power"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/sensor_state_power"/>
<CheckBox android:id="@+id/chart_settings_cadence"
<CheckBox
android:id="@+id/chart_settings_cadence"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/sensor_state_cadence"/>
<CheckBox android:id="@+id/chart_settings_heart_rate"
<CheckBox
android:id="@+id/chart_settings_heart_rate"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/sensor_state_heart_rate"/>
</LinearLayout>
</TableRow>
@@ -124,11 +134,13 @@ limitations under the License.
</ScrollView>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/chart_settings_ok"
<Button
android:id="@+id/chart_settings_ok"
android:layout_gravity="left"
android:text="@string/generic_ok"
style="@style/Button"/>
<Button android:id="@+id/chart_settings_cancel"
<Button
android:id="@+id/chart_settings_cancel"
android:layout_gravity="right"
android:text="@string/generic_cancel"
style="@style/Button"/>
+6 -6
View File
@@ -48,10 +48,10 @@ limitations under the License.
android:layout_width="fill_parent"
android:orientation="horizontal">
<TextView
style="@style/WidgetText.Register"
style="@style/WidgetTextView.Value"
android:id="@+id/appwidget_distance_text" />
<TextView
style="@style/WidgetText"
style="@style/WidgetTextView"
android:text="@string/stat_total_distance" />
</LinearLayout>
<ImageView
@@ -64,10 +64,10 @@ limitations under the License.
android:orientation="horizontal"
android:paddingBottom="2px">
<TextView
style="@style/WidgetText.Register"
style="@style/WidgetTextView.Value"
android:id="@+id/appwidget_time_text" />
<TextView
style="@style/WidgetText"
style="@style/WidgetTextView"
android:text="@string/stat_moving_time" />
</LinearLayout>
<ImageView
@@ -79,10 +79,10 @@ limitations under the License.
android:layout_width="fill_parent"
android:orientation="horizontal">
<TextView
style="@style/WidgetText.Register"
style="@style/WidgetTextView.Value"
android:id="@+id/appwidget_speed_text" />
<TextView
style="@style/WidgetText"
style="@style/WidgetTextView"
android:text="@string/stat_speed" />
</LinearLayout>
</LinearLayout>
+123 -8
View File
@@ -16,21 +16,136 @@ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="vertical">
<WebView
android:id="@+id/welcome_web"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1" />
<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: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_my_maps_sharing_question"
style="@style/WelcomeTextView.Question"/>
<TextView
android:text="@string/welcome_my_maps_sharing_answer"
style="@style/WelcomeTextView"/>
</LinearLayout>
</ScrollView>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/welcome_ok"
<Button
android:id="@+id/welcome_ok"
android:layout_gravity="left"
android:text="@string/generic_ok"
style="@style/Button"/>
<Button android:id="@+id/welcome_about"
<Button
android:id="@+id/welcome_about"
android:layout_gravity="right"
android:text="@string/welcome_about"
style="@style/Button"/>