From fbc75936daaa3ea5e2596c0aa71593cbe9f33614 Mon Sep 17 00:00:00 2001
From: Marco Jacob <mjacob@union06.de>
Date: Sat, 15 Jun 2013 16:23:55 +0200
Subject: make personalNote multiline again, upload button, merge on refresh

---
 main/res/layout/cachedetail_description_page.xml | 4 ++++
 main/res/layout/fragment_edit_note.xml           | 4 ++--
 main/res/values-de/strings.xml                   | 4 ++++
 main/res/values/strings.xml                      | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'main/res')

diff --git a/main/res/layout/cachedetail_description_page.xml b/main/res/layout/cachedetail_description_page.xml
index 5c05c20..8325798 100644
--- a/main/res/layout/cachedetail_description_page.xml
+++ b/main/res/layout/cachedetail_description_page.xml
@@ -134,6 +134,10 @@
                 android:id="@+id/edit_personalnote"
                 style="@style/button_small"
                 android:text="@string/cache_personal_note_edit" />
+            <Button
+                android:id="@+id/upload_personalnote"
+                style="@style/button_small"
+                android:text="@string/cache_personal_note_upload" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/main/res/layout/fragment_edit_note.xml b/main/res/layout/fragment_edit_note.xml
index 1ed5e84..1e9fbf9 100644
--- a/main/res/layout/fragment_edit_note.xml
+++ b/main/res/layout/fragment_edit_note.xml
@@ -9,7 +9,7 @@
         android:id="@+id/note"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:imeOptions="actionDone"
-        android:inputType="text" />
+        android:inputType="textMultiLine"
+        android:lines="8" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 238b203..726e281 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -533,6 +533,10 @@
     <string name="cache_log_image_default_title">Bild</string>
     <string name="cache_personal_note">Persönliche Notiz</string>
     <string name="cache_personal_note_edit">Bearbeiten</string>
+    <string name="cache_personal_note_upload">Hochladen</string>
+    <string name="cache_personal_note_uploading">Persönliche Notizen werden gesendet</string>
+    <string name="cache_personal_note_upload_done">Persönliche Notizen wurden hochgeladen</string>
+    <string name="cache_personal_note_upload_cancelled">Hochladen der Notizen abgebrochen</string>
     <string name="cache_personal_note_unstored">Cache noch nicht gespeichert</string>
     <string name="cache_personal_note_store">Der Cache wird zunächst gespeichert, damit persönliche Notizen möglich sind.</string>
     <string name="cache_description">Beschreibung</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index e82b44c..c80f250 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -534,6 +534,10 @@
     <string name="cache_log_image_default_title">Photo</string>
     <string name="cache_personal_note">Personal note</string>
     <string name="cache_personal_note_edit">Edit</string>
+    <string name="cache_personal_note_upload">Upload</string>
+    <string name="cache_personal_note_uploading">Uploading personal note</string>
+    <string name="cache_personal_note_upload_done">Personal note uploaded</string>
+    <string name="cache_personal_note_upload_cancelled">Personal note upload cancelled</string>
     <string name="cache_personal_note_unstored">Cache not stored</string>
     <string name="cache_personal_note_store">The cache will be stored first to enable personal notes.</string>
     <string name="cache_description">Description</string>
-- 
cgit v1.1