issue #275 - Move to other list from cache screen

and: choose list when storing

5 files changed, 81 insertions, 27 deletions

diff --git a/main/res/layout/cacheview_details.xml b/main/res/layout/cacheview_details.xml
index 62ee2af..be9219b 100644
--- a/main/res/layout/cacheview_details.xml
+++ b/main/res/layout/cacheview_details.xml
@@ -181,6 +181,47 @@
             </RelativeLayout>

         </LinearLayout>

         

+        <!-- list box -->

+

+        <LinearLayout

+            android:id="@+id/list_box"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:orientation="vertical" 

+            android:visibility="gone" >

+

+            <View

+                style="@style/separator_horizontal"

+                android:layout_marginBottom="9dp"

+                android:layout_marginTop="9dp" />

+

+            <RelativeLayout

+                android:layout_width="fill_parent"

+                android:layout_height="wrap_content" >

+

+                <TextView

+                    android:id="@+id/list_text"

+                    android:layout_width="fill_parent"

+                    android:layout_height="wrap_content"

+                    android:layout_alignParentLeft="true"

+                    android:layout_gravity="left"

+                    android:layout_centerVertical="true"

+                    android:layout_marginLeft="6dip"

+                    android:layout_marginRight="130dip"

+                    android:paddingRight="3dip"

+                    android:textColor="?text_color"

+                    android:textSize="14dip" />

+

+                <Button

+                    android:id="@+id/change_list"

+                    style="@style/button_small"

+                    android:layout_alignParentRight="true"

+                    android:text="@string/cache_list_change"

+                    android:visibility="visible" />

+

+            </RelativeLayout>

+        </LinearLayout>

+

         <!-- License Box -->

 

         <LinearLayout

diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index 6aaed9f..730e5b7 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -197,40 +197,43 @@
 					<CheckBox android:id="@+id/captcha"
 			            style="@style/checkbox_full"
 						android:text="@string/init_captcha" />
+                    <CheckBox android:id="@+id/livelist"
+                        style="@style/checkbox_full"
+                        android:text="@string/init_livelist" />
                     <CheckBox android:id="@+id/loaddirectionimg"
-			            style="@style/checkbox_full"
+                        style="@style/checkbox_full"
                         android:text="@string/init_loaddirectionimg" />
-					<CheckBox android:id="@+id/useenglish"
-			            style="@style/checkbox_full"
-						android:text="@string/init_useenglish" />
-					<CheckBox android:id="@+id/exclude"
-			            style="@style/checkbox_full"
-						android:text="@string/init_exclude" />
-					<CheckBox android:id="@+id/disabled"
-			            style="@style/checkbox_full"
-						android:text="@string/init_disabled" />
+                    <CheckBox android:id="@+id/useenglish"
+                        style="@style/checkbox_full"
+                        android:text="@string/init_useenglish" />
+                    <CheckBox android:id="@+id/units"
+                        style="@style/checkbox_full"
+                        android:text="@string/init_units" />
+                    <CheckBox android:id="@+id/exclude"
+                        style="@style/checkbox_full"
+                        android:text="@string/init_exclude" />
+                    <CheckBox android:id="@+id/disabled"
+                        style="@style/checkbox_full"
+                        android:text="@string/init_disabled" />
                     <CheckBox android:id="@+id/trackautovisit"
-			            style="@style/checkbox_full"
+                        style="@style/checkbox_full"
                         android:text="@string/init_trackautovisit" />
-					<CheckBox android:id="@+id/units"
-			            style="@style/checkbox_full"
-						android:text="@string/init_units" />
-					<CheckBox android:id="@+id/livelist"
-			            style="@style/checkbox_full"
-						android:text="@string/init_livelist" />
-					<CheckBox android:id="@+id/log_offline"
-			            style="@style/checkbox_full"
-						android:text="@string/init_log_offline" />
-					<CheckBox android:id="@+id/trail"
-			            style="@style/checkbox_full"
-						android:text="@string/init_maptrail" />
+                    <CheckBox android:id="@+id/log_offline"
+                        style="@style/checkbox_full"
+                        android:text="@string/init_log_offline" />
+                    <CheckBox android:id="@+id/choose_list"
+                        style="@style/checkbox_full"
+                        android:text="@string/init_choose_list" />
+                    <CheckBox android:id="@+id/trail"
+                        style="@style/checkbox_full"
+                        android:text="@string/init_maptrail" />
                     <CheckBox android:id="@+id/plain_logs"
-			            style="@style/checkbox_full"
+                        style="@style/checkbox_full"
                         android:text="@string/init_plain_logs" />
                     <CheckBox android:id="@+id/use_native_ua"
-			            style="@style/checkbox_full"
+                        style="@style/checkbox_full"
                         android:text="@string/init_use_native_ua" />
-                			</LinearLayout>
+                </LinearLayout>
 <!-- ** -->
 			<RelativeLayout style="@style/separator_horizontal_layout" >
 				<View style="@style/separator_horizontal" />
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index bea85dc..fd14e0e 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -389,6 +389,7 @@
   <string name="init_save_log_img">Logbilder abspeichern</string>
   <string name="init_units">Imperiale Einheiten (Meilen/Fuß)</string>
   <string name="init_log_offline">Offline loggen (Dialog für Online-Log nicht anzeigen)</string>
+  <string name="init_choose_list">Beim Speichern von Caches nach Liste fragen</string>
   <string name="init_livelist">Richtung zum Cache in der Cache-Liste anzeigen</string>
   <string name="init_altitude">Höhenkorrektur</string>
   <string name="init_altitude_description">Falls das GPS eine falsche Höhe ermittelt, kann dies durch Angabe eines positiven oder negativen Wertes in Metern korrigiert werden.</string>
@@ -506,8 +507,10 @@
   <string name="cache_favpoint_not_on">Dieser Cache ist kein Favorit.</string>
   <string name="cache_favpoint_add">Hinzufügen</string>
   <string name="cache_favpoint_remove">Entfernen</string>
+  <string name="cache_list_text">Liste:</string>
+  <string name="cache_list_change">Verschieben</string>
+  <string name="cache_list_unknown">In keiner Liste</string>
   <string name="cache_images">Bilder</string>
-  <string name="cache_images_loading">Lade Bilder…</string>
   <string name="cache_waypoints">Wegpunkte</string>
   <plurals name="waypoints">
       <item quantity="one">1 Wegpunkt</item>
@@ -590,6 +593,7 @@
   <string name="cache_coordinates_original">Ursprüngliche Koordinaten</string>
   <string name="cache_spoiler_images_title">Hinweisbilder</string>
   <string name="cache_spoiler_images_loading">Lade Hinweisbilder…</string>
+  <string name="cache_images_loading">Lade Bilder…</string>
   <string name="cache_log_types">Logs</string>
   <string name="cache_coordinates_no">Dieser Cache hat keine Koordinaten.</string>
   <string name="cache_clear_history">Verlauf leeren</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 991b0a2..cc47681 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -392,6 +392,7 @@
   <string name="init_save_log_img">Save Images from Logs</string>
   <string name="init_units">Use Imperial Units instead of Metric Units</string>
   <string name="init_log_offline">Enable Offline Logging\n(Don\'t show online Log screen when logging, don\'t send the Log online)</string>
+  <string name="init_choose_list">Ask for list when storing caches</string>
   <string name="init_livelist">Show Direction to caches in the list</string>
   <string name="init_altitude">Altitude Correction</string>
   <string name="init_altitude_description">If your GPS is calculating a wrong altitude, you can correct it with a positive or negative number. The correction always has to be given in meters.</string>
@@ -511,6 +512,9 @@
   <string name="cache_favpoint_not_on">This cache is not one of your favorites.</string>
   <string name="cache_favpoint_add">Add</string>
   <string name="cache_favpoint_remove">Remove</string>
+  <string name="cache_list_text">List:</string>
+  <string name="cache_list_change">Move</string>
+  <string name="cache_list_unknown">Not in a list</string>
   <string name="cache_images">Images</string>
   
   <string name="cache_waypoints">Waypoints</string>
diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml
index a13b9b1..1853fac 100644
--- a/main/res/values/strings_not_translatable.xml
+++ b/main/res/values/strings_not_translatable.xml
@@ -87,6 +87,8 @@
     · Inverse sorting of cache lists (hit the same menu again)\n

     · View pager in trackable activity\n

     · Menu item to delete past events\n

+    · Settings: Option to ask for list to store caches in\n

+    · Change list in cache details\n

     · Ability to select \"All\" list from main screen\n

     · Default log type for event caches will be \"Attended\" if \"Will attend\" was logged before\n

     · Improved and extended cache type detection on live map\n