From 06607d5f61297012454ec50216ae6cba83fc03c9 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 16 Sep 2016 06:09:26 +0100
Subject: [PATCH] Search cleanups

---
 app/app.iml                                   | 10 --------
 .../openlp/android2/common/StateHolder.java   | 15 ++++++++++++
 .../android2/fragments/SearchFragment.java    |  1 +
 app/src/main/res/drawable/searchlist.xml      | 11 +++++++++
 app/src/main/res/layout/fragment_search.xml   | 24 ++++++++++---------
 app/src/main/res/values/strings.xml           |  2 ++
 app/src/main/res/xml/pref_notification.xml    |  6 -----
 build.gradle                                  |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 ++--
 9 files changed, 45 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/java/org/openlp/android2/common/StateHolder.java
 create mode 100644 app/src/main/res/drawable/searchlist.xml

diff --git a/app/app.iml b/app/app.iml
index 8841e64..a8c8c7e 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -82,7 +82,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -90,21 +89,12 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/app/src/main/java/org/openlp/android2/common/StateHolder.java b/app/src/main/java/org/openlp/android2/common/StateHolder.java
new file mode 100644
index 0000000..0d4f8f6
--- /dev/null
+++ b/app/src/main/java/org/openlp/android2/common/StateHolder.java
@@ -0,0 +1,15 @@
+package org.openlp.android2.common;
+
+/**
+ * Created by tim on 14/08/16.
+ */
+public class StateHolder {
+    private static StateHolder ourInstance = new StateHolder();
+
+    public static StateHolder getInstance() {
+        return ourInstance;
+    }
+
+    private StateHolder() {
+    }
+}
diff --git a/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java b/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
index c8d9962..d712c8c 100644
--- a/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
@@ -237,6 +237,7 @@ public class SearchFragment extends Fragment {
         if (notInError) {
             try {
                 JSONArray items = new JSONObject(json).getJSONObject("results").getJSONArray("items");
+                Log.d(LOG_TAG,items.toString());
                 for (int i = 0; i < items.length(); ++i) {
                     JSONArray item = items.getJSONArray(i);
                     listitems.add(item);
diff --git a/app/src/main/res/drawable/searchlist.xml b/app/src/main/res/drawable/searchlist.xml
new file mode 100644
index 0000000..f613773
--- /dev/null
+++ b/app/src/main/res/drawable/searchlist.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <padding android:left="10dp"
+        android:right="10dp"
+        android:top="10dp"
+        android:bottom="10dp"/>
+    <solid android:color="#FFF"/>
+    <stroke android:width="2px" android:color="#ffffff"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 591aed8..c8c9c21 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -20,11 +20,11 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Select Plugin"
+                android:text="@string/select_plugin"
                 android:id="@+id/search_title"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:textSize="40px"
-                android:height="70px"
+                android:textSize="40sp"
+                android:height="70dp"
                 android:paddingLeft="30dp"
                 android:paddingRight="30dp"/>
 
@@ -46,9 +46,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="Search Text"
-                android:textSize="40px"
-                android:height="70px"
+                android:text="@string/search_text"
+                android:textSize="40sp"
+                android:height="70dp"
                 android:id="@+id/search_value_desc"
                 android:paddingLeft="30dp"
                 android:paddingRight="30dp"/>
@@ -61,8 +61,8 @@
                 style="@android:style/Animation.InputMethod"
                 android:layout_weight="0.87"
                 android:inputType="text"
-                android:textSize="40px"
-                android:height="70px"
+                android:textSize="40sp"
+                android:height="70dp"
                 />
         </LinearLayout>
 
@@ -81,9 +81,11 @@
                 android:paddingRight="30dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="20dp"
-                android:textSize="40px"
-                android:height="70px"
-                android:layout_weight="1"/>
+                android:textSize="40sp"
+                android:height="70dp"
+                android:layout_weight="1"
+                android:background="@drawable/searchlist"/>
+
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c4da2b5..b17bd88 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,6 +45,8 @@
     <string name="port">Port</string>
     <string name="previous">Previous</string>
     <string name="process">Process</string>
+    <string name="search_text">Search Text</string>
+    <string name="select_plugin">Select Plugin</string>
     <string name="service_list">Service List</string>
     <string name="searchResults">Search Results</string>
     <string name="searchSendLive">Send Live</string>
diff --git a/app/src/main/res/xml/pref_notification.xml b/app/src/main/res/xml/pref_notification.xml
index aac55fa..33606e5 100644
--- a/app/src/main/res/xml/pref_notification.xml
+++ b/app/src/main/res/xml/pref_notification.xml
@@ -33,12 +33,6 @@
             android:defaultValue="@string/port_default_value"
             android:inputType="number" />
 
-        <CheckBoxPreference
-            android:key="@string/key_ssl_use"
-            android:title="@string/connection_profile_ssl_use"
-            android:summary="@string/connection_profile_ssl_summary"
-            android:defaultValue="false" />
-
         <EditTextPreference
             android:key="@string/key_userid"
             android:title="@string/connection_userid"
diff --git a/build.gradle b/build.gradle
index e220f0b..d14039d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d81cbaa..a611e19 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat May 14 10:36:56 BST 2016
+#Fri Sep 16 06:02:15 BST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip