aboutsummaryrefslogtreecommitdiffstats
path: root/main/res/layout/init.xml
diff options
context:
space:
mode:
Diffstat (limited to 'main/res/layout/init.xml')
-rw-r--r--main/res/layout/init.xml95
1 files changed, 52 insertions, 43 deletions
diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index 26137fc..e784b21 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -5,23 +5,7 @@
android:background="?background_color"
android:orientation="vertical" >
- <LinearLayout style="@style/action_bar" >
-
- <ImageView
- style="@style/action_bar_action"
- android:onClick="goHome" />
-
- <View style="@style/action_bar_separator" />
-
- <TextView style="@style/action_bar_title" />
-
- <View style="@style/action_bar_separator" />
-
- <ImageView
- style="@style/action_bar_action"
- android:onClick="goManual"
- android:src="@drawable/actionbar_manual" />
- </LinearLayout>
+ <include layout="@layout/actionbar" />
<ScrollView
android:layout_width="fill_parent"
@@ -44,7 +28,32 @@
style="@style/separator_horizontal_headline"
android:text="@string/init_geocaching" />
</RelativeLayout>
-
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="3dip"
+ android:orientation="horizontal"
+ android:padding="3dip" >
+
+ <CheckBox android:id="@+id/gc_option"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="left"
+ android:padding="1dip"
+ android:gravity="center" />
+
+ <TextView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:gravity="left"
+ android:paddingRight="3dip"
+ android:textSize="14sp"
+ android:textColor="?text_color"
+ android:text="@string/init_gc_activate" />
+ </LinearLayout>
+
<TextView
android:id="@+id/legal_note"
android:layout_width="wrap_content"
@@ -58,7 +67,7 @@
android:text="@string/legal_note"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<EditText
android:id="@+id/username"
@@ -101,14 +110,14 @@
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:padding="3dip"
- android:text="@string/init_oc_username_description"
+ android:text="@string/init_oc_de_description"
android:textColor="?text_color"
android:textSize="14sp" />
- <EditText
- android:id="@+id/oc_username"
- style="@style/edittext_full"
- android:hint="@string/init_oc_username" />
+ <Button
+ android:id="@+id/register_oc_de"
+ style="@style/button_full"
+ android:text="@string/init_register_oc_de" />
<!-- ** -->
<RelativeLayout style="@style/separator_horizontal_layout" >
@@ -149,7 +158,7 @@
android:text="@string/about_twitter"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<Button
android:id="@+id/authorize_twitter"
@@ -190,7 +199,7 @@
android:layout_width="wrap_content"
android:layout_weight="2"
android:text="@string/init_signature_template_button"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<Button
android:id="@+id/signature_help"
@@ -198,7 +207,7 @@
android:layout_width="wrap_content"
android:layout_weight="1"
android:text="@string/init_signature_help_button"
- android:textSize="14dip" />
+ android:textSize="14sp" />
</LinearLayout>
<CheckBox
@@ -386,7 +395,7 @@
android:text="@string/init_showwaypoint_description"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<!-- maps -->
<RelativeLayout style="@style/separator_horizontal_layout" >
@@ -411,7 +420,7 @@
android:text="@string/init_mapsources_description"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<Spinner
android:id="@+id/mapsource"
@@ -432,7 +441,7 @@
android:text="@string/init_map_directory_description"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<LinearLayout
android:id="@+id/init_mapdir_group"
@@ -466,7 +475,7 @@
android:padding="3dip"
android:text="@string/init_rendertheme_folder"
android:textColor="?text_color"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<LinearLayout
android:id="@+id/init_themefilegroup"
@@ -513,7 +522,7 @@
android:text="@string/init_gpx_exportdir_description"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<LinearLayout
android:id="@+id/init_gpx_export_group"
@@ -559,7 +568,7 @@
android:text="@string/init_gpx_importdir_description"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<LinearLayout
android:id="@+id/init_gpx_import_group"
@@ -612,7 +621,7 @@
android:text="@string/init_altitude_description"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<!-- ** -->
<RelativeLayout style="@style/separator_horizontal_layout" >
@@ -636,7 +645,7 @@
android:text="@string/init_default_navigation_tool_description"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<Spinner
android:id="@+id/default_navigation_tool"
@@ -656,7 +665,7 @@
android:text="@string/init_default_navigation_tool_2_description"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<Spinner
android:id="@+id/default_navigation_tool_2"
@@ -686,7 +695,7 @@
android:text="@string/init_sendToCgeo_name"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<EditText
android:id="@+id/webDeviceName"
@@ -710,7 +719,7 @@
android:text="@string/init_sendToCgeo_description"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<Button
android:id="@+id/sendToCgeo_register"
@@ -740,7 +749,7 @@
android:text="@null"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<LinearLayout
android:layout_width="fill_parent"
@@ -778,7 +787,7 @@
android:text="@string/init_backup_note"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<!-- ** -->
<RelativeLayout style="@style/separator_horizontal_layout" >
@@ -802,7 +811,7 @@
android:text="@string/init_dbonsdcard_note"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<CheckBox
android:id="@+id/dbonsdcard"
@@ -831,7 +840,7 @@
android:text="@string/init_debug_note"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<CheckBox
android:id="@+id/debug"
@@ -840,4 +849,4 @@
</LinearLayout>
</ScrollView>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>