From 7fa26518bc5336d25bb54cc264cee422a36d14cc Mon Sep 17 00:00:00 2001
From: kenstir <kenstir@gmail.com>
Date: Mon, 7 Dec 2015 22:12:07 -0500
Subject: [PATCH] hemlock_v12 (1.5)

---
 Open-ILS/src/Android/core/res/layout/activity_main.xml               | 5 -----
 Open-ILS/src/Android/core/res/menu/menu_main.xml                     | 1 +
 Open-ILS/src/Android/core/res/values/ou.xml                          | 2 ++
 Open-ILS/src/Android/core/res/values/strings.xml                     | 1 +
 .../src/Android/core/src/org/evergreen_ils/views/MainActivity.java   | 5 +++++
 Open-ILS/src/Android/cwmars_app/res/values/ou.xml                    | 1 +
 Open-ILS/src/Android/hemlock_app/AndroidManifest.xml                 | 2 +-
 Open-ILS/src/Android/hemlock_app/res/values/ou.xml                   | 1 +
 8 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Open-ILS/src/Android/core/res/layout/activity_main.xml b/Open-ILS/src/Android/core/res/layout/activity_main.xml
index 2eafd08632..e2e589619a 100644
--- a/Open-ILS/src/Android/core/res/layout/activity_main.xml
+++ b/Open-ILS/src/Android/core/res/layout/activity_main.xml
@@ -43,9 +43,4 @@
             android:onClick="onButtonClick"
             android:drawableLeft="@drawable/fines"/>
 
-    <TextView
-            android:layout_width="20px"
-            android:layout_height="12dp"
-            />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/core/res/menu/menu_main.xml b/Open-ILS/src/Android/core/res/menu/menu_main.xml
index 4115a76619..ad4dbc1438 100644
--- a/Open-ILS/src/Android/core/res/menu/menu_main.xml
+++ b/Open-ILS/src/Android/core/res/menu/menu_main.xml
@@ -4,6 +4,7 @@
         xmlns:yourapp="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/action_switch_account" android:title="@string/menu_switch_account"/>
     <item android:id="@+id/action_add_account" android:title="@string/menu_add_account"/>
+    <item android:id="@+id/action_feedback" android:title="@string/menu_feedback"/>
     <!--<item android:id="@+id/action_search"
           android:icon="@drawable/abc_ic_search"
           android:title="@string/title_search"
diff --git a/Open-ILS/src/Android/core/res/values/ou.xml b/Open-ILS/src/Android/core/res/values/ou.xml
index 80b0b0c929..70ae226df4 100644
--- a/Open-ILS/src/Android/core/res/values/ou.xml
+++ b/Open-ILS/src/Android/core/res/values/ou.xml
@@ -19,4 +19,6 @@
     <string name="ou_activity_subtitle">%1$s - %2$s</string>
     <!-- OPAC URL -->
     <string name="ou_library_url">https://demo.evergreencatalog.com</string>
+    <!-- URL of feedback form -->
+    <string name="ou_feedback_url"></string>
 </resources>
diff --git a/Open-ILS/src/Android/core/res/values/strings.xml b/Open-ILS/src/Android/core/res/values/strings.xml
index bb28b1ab30..a5d0f1d1a4 100644
--- a/Open-ILS/src/Android/core/res/values/strings.xml
+++ b/Open-ILS/src/Android/core/res/values/strings.xml
@@ -8,6 +8,7 @@
     <string name="menu_barcode_scan">barcode scan</string>
     <string name="menu_switch_account">Switch account</string>
     <string name="menu_add_account">Add account</string>
+    <string name="menu_feedback">Send feedback</string>
 
     <!-- Header portion -->
     <string name="my_account_button_text">My Account</string>
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/MainActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/MainActivity.java
index e5f6272043..dd1d1831d5 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/MainActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/MainActivity.java
@@ -1,6 +1,7 @@
 package org.evergreen_ils.views;
 
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
@@ -71,6 +72,10 @@ public class MainActivity extends ActionBarActivity {
             });
             Log.i(Const.AUTH_TAG, "after addAccount");
             return true;
+        } else if (id == R.id.action_feedback) {
+            Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.ou_feedback_url)));
+            startActivity(i);
+            return true;
         }
         return super.onOptionsItemSelected(item);
     }
diff --git a/Open-ILS/src/Android/cwmars_app/res/values/ou.xml b/Open-ILS/src/Android/cwmars_app/res/values/ou.xml
index 2d72fcf4d3..310c2bf21b 100644
--- a/Open-ILS/src/Android/cwmars_app/res/values/ou.xml
+++ b/Open-ILS/src/Android/cwmars_app/res/values/ou.xml
@@ -11,4 +11,5 @@
     <string name="ou_library_name">C/W MARS</string>
     <string name="ou_activity_subtitle">%2$s</string>
     <string name="ou_library_url">https://catalog.cwmars.org</string>
+    <string name="ou_feedback_url">https://docs.google.com/forms/d/1RbDW1IRD8-IV4U_HdWqGXCEQOJnl87Z7HH_uVGNWASY/viewform</string>
 </resources>
diff --git a/Open-ILS/src/Android/hemlock_app/AndroidManifest.xml b/Open-ILS/src/Android/hemlock_app/AndroidManifest.xml
index fd4ae9fb9e..8d10c7c056 100644
--- a/Open-ILS/src/Android/hemlock_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/hemlock_app/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="net.kenstir.apps.hemlock"
           android:installLocation="auto"
-          android:versionCode="11"
+          android:versionCode="12"
           android:versionName="1.5">
 
     <uses-sdk
diff --git a/Open-ILS/src/Android/hemlock_app/res/values/ou.xml b/Open-ILS/src/Android/hemlock_app/res/values/ou.xml
index 8d2a650725..e08fd1823c 100644
--- a/Open-ILS/src/Android/hemlock_app/res/values/ou.xml
+++ b/Open-ILS/src/Android/hemlock_app/res/values/ou.xml
@@ -10,4 +10,5 @@
     <string name="ou_app_label">Hemlock</string>
     <string name="ou_library_name"></string>
     <string name="ou_library_url"></string>
+    <string name="ou_feedback_url">https://docs.google.com/forms/d/1RbDW1IRD8-IV4U_HdWqGXCEQOJnl87Z7HH_uVGNWASY/viewform</string>
 </resources>
-- 
2.11.0