Implements #750, use preference activity

5 files changed, 155 insertions, 27 deletions

diff --git a/main/res/layout/log_signature_preference_dialog.xml b/main/res/layout/log_signature_preference_dialog.xml
new file mode 100644
index 0000000..a5048a4
--- /dev/null
+++ b/main/res/layout/log_signature_preference_dialog.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="8dp"
+    android:orientation="vertical" >
+
+    <TextView
+        android:text="@string/init_signature_help_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="8dp"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+    
+    <EditText
+        android:id="@+id/signature_dialog_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/init_signature"
+        android:inputType="textMultiLine|textCapSentences"
+        android:gravity="top|left"
+        android:minLines="3"
+        android:singleLine="false" />
+
+    <Button
+        android:id="@+id/signature_templates"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:layout_gravity="right"
+        android:text="@string/init_signature_template_button" />
+
+</LinearLayout>
diff --git a/main/res/layout/number_picker_preference.xml b/main/res/layout/number_picker_preference.xml
new file mode 100644
index 0000000..e630242
--- /dev/null
+++ b/main/res/layout/number_picker_preference.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="8dp"
+    android:orientation="vertical" >
+
+    <TextView 
+        android:id="@+id/number_picker_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="8dp"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <LinearLayout 
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/number_picker_minus"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:text="@string/button_minus"
+            android:width="48dp" />
+
+        <EditText
+            android:id="@+id/number_picker_input"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:width="64dp" 
+            android:gravity="center"
+            android:inputType="number">
+            <requestFocus />
+        </EditText>
+
+        <Button
+            android:id="@+id/number_picker_plus"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:text="@string/button_plus" 
+            android:width="48dp"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/main/res/layout/settings_activity.xml b/main/res/layout/settings_activity.xml
index ae70fa7..9d80e13 100644
--- a/main/res/layout/settings_activity.xml
+++ b/main/res/layout/settings_activity.xml
@@ -65,7 +65,7 @@
                 android:layout_marginRight="10dip"
                 android:linksClickable="true"
                 android:padding="3dip"
-                android:text="@string/legal_note"
+                android:text="@string/settings_gc_legal_note"
                 android:textColor="?text_color"
                 android:textColorLink="?text_color_link"
                 android:textSize="14sp" />
@@ -102,7 +102,7 @@
             <CheckBox
                 android:id="@+id/oc_option"
                 style="@style/checkbox_full"
-                android:text="@string/init_oc_activate" />
+                android:text="@string/settings_activate_oc" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -169,7 +169,7 @@
             <CheckBox
                 android:id="@+id/twitter_option"
                 style="@style/checkbox_full"
-                android:text="@string/init_twitter_publish" />
+                android:text="@string/settings_activate_twitter" />
 
             <RelativeLayout style="@style/separator_horizontal_layout" >
 
@@ -235,42 +235,42 @@
                 <CheckBox
                     android:id="@+id/autoload"
                     style="@style/checkbox_full"
-                    android:text="@string/init_autoload" />
+                    android:text="@string/init_summary_autoload" />
 
                 <CheckBox
                     android:id="@+id/ratingwanted"
                     style="@style/checkbox_full"
-                    android:text="@string/init_ratingwanted" />
+                    android:text="@string/init_summary_ratingwanted" />
 
                 <CheckBox
                     android:id="@+id/elevationwanted"
                     style="@style/checkbox_full"
-                    android:text="@string/init_elevationwanted" />
+                    android:text="@string/init_summary_elevationwanted" />
 
                 <CheckBox
                     android:id="@+id/friendlogswanted"
                     style="@style/checkbox_full"
-                    android:text="@string/init_friendlogswanted" />
+                    android:text="@string/init_summary_friendlogswanted" />
 
                 <CheckBox
                     android:id="@+id/openlastdetailspage"
                     style="@style/checkbox_full"
-                    android:text="@string/init_openlastdetailspage" />
+                    android:text="@string/init_summary_openlastdetailspage" />
 
                 <CheckBox
                     android:id="@+id/offline"
                     style="@style/checkbox_full"
-                    android:text="@string/init_offline" />
+                    android:text="@string/init_summary_offline" />
 
                 <CheckBox
                     android:id="@+id/offline_wp"
                     style="@style/checkbox_full"
-                    android:text="@string/init_offline_wp" />
+                    android:text="@string/init_summary_offline_wp" />
 
                 <CheckBox
                     android:id="@+id/save_log_img"
                     style="@style/checkbox_full"
-                    android:text="@string/init_save_log_img" />
+                    android:text="@string/init_summary_save_log_img" />
             </LinearLayout>
             <!-- ** -->
 
@@ -293,77 +293,77 @@
                 <CheckBox
                     android:id="@+id/skin"
                     style="@style/checkbox_full"
-                    android:text="@string/init_skin" />
+                    android:text="@string/init_summary_skin" />
 
                 <CheckBox
                     android:id="@+id/address"
                     style="@style/checkbox_full"
-                    android:text="@string/init_address" />
+                    android:text="@string/init_summary_address" />
 
                 <CheckBox
                     android:id="@+id/captcha"
                     style="@style/checkbox_full"
-                    android:text="@string/init_captcha" />
+                    android:text="@string/init_summary_captcha" />
 
                 <CheckBox
                     android:id="@+id/livelist"
                     style="@style/checkbox_full"
-                    android:text="@string/init_livelist" />
+                    android:text="@string/init_summary_livelist" />
 
                 <CheckBox
                     android:id="@+id/loaddirectionimg"
                     style="@style/checkbox_full"
-                    android:text="@string/init_loaddirectionimg" />
+                    android:text="@string/init_summary_loaddirectionimg" />
 
                 <CheckBox
                     android:id="@+id/useenglish"
                     style="@style/checkbox_full"
-                    android:text="@string/init_useenglish" />
+                    android:text="@string/init_summary_useenglish" />
 
                 <CheckBox
                     android:id="@+id/units"
                     style="@style/checkbox_full"
-                    android:text="@string/init_units" />
+                    android:text="@string/init_summary_units" />
 
                 <CheckBox
                     android:id="@+id/exclude"
                     style="@style/checkbox_full"
-                    android:text="@string/init_exclude" />
+                    android:text="@string/init_summary_exclude" />
 
                 <CheckBox
                     android:id="@+id/disabled"
                     style="@style/checkbox_full"
-                    android:text="@string/init_disabled" />
+                    android:text="@string/init_summary_disabled" />
 
                 <CheckBox
                     android:id="@+id/trackautovisit"
                     style="@style/checkbox_full"
-                    android:text="@string/init_trackautovisit" />
+                    android:text="@string/init_summary_trackautovisit" />
 
                 <CheckBox
                     android:id="@+id/log_offline"
                     style="@style/checkbox_full"
-                    android:text="@string/init_log_offline" />
+                    android:text="@string/init_summary_log_offline" />
 
                 <CheckBox
                     android:id="@+id/choose_list"
                     style="@style/checkbox_full"
-                    android:text="@string/init_choose_list" />
+                    android:text="@string/init_summary_choose_list" />
 
                 <CheckBox
                     android:id="@+id/trail"
                     style="@style/checkbox_full"
-                    android:text="@string/init_maptrail" />
+                    android:text="@string/init_summary_maptrail" />
 
                 <CheckBox
                     android:id="@+id/plain_logs"
                     style="@style/checkbox_full"
-                    android:text="@string/init_plain_logs" />
+                    android:text="@string/init_summary_plain_logs" />
 
                 <CheckBox
                     android:id="@+id/use_native_ua"
                     style="@style/checkbox_full"
-                    android:text="@string/init_use_native_ua" />
+                    android:text="@string/init_summary_use_native_ua" />
             </LinearLayout>
             <!-- ** -->
 
@@ -418,7 +418,7 @@
                 android:autoLink="web"
                 android:linksClickable="true"
                 android:padding="3dip"
-                android:text="@string/init_mapsources_description"
+                android:text="@string/settings_info_offline_maps"
                 android:textColor="?text_color"
                 android:textColorLink="?text_color_link"
                 android:textSize="14sp" />
diff --git a/main/res/layout/text_preference.xml b/main/res/layout/text_preference.xml
new file mode 100644
index 0000000..818b2f3
--- /dev/null
+++ b/main/res/layout/text_preference.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:orientation="vertical" >
+
+    <TextView 
+        android:id="@+id/textPreferenceText"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+    <TextView 
+        android:id="@+id/textPreferenceSummary"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:visibility="gone"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+</LinearLayout>
diff --git a/main/res/layout/wp_threshold_preference.xml b/main/res/layout/wp_threshold_preference.xml
new file mode 100644
index 0000000..22ffe9a
--- /dev/null
+++ b/main/res/layout/wp_threshold_preference.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingTop="8dp" >
+    
+    <SeekBar
+        android:id="@+id/wp_threshold_seekbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:paddingRight="8dp"
+        android:layout_weight="1" />
+
+    <TextView
+        android:id="@+id/wp_threshold_value_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:layout_weight="5" />
+
+</LinearLayout>