From 663bf6f55e13c3f6f5a9bf642134bd2d905389e0 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 21 Nov 2015 15:32:03 +0000
Subject: [PATCH] More styling

---
 app/app.iml                                   | 11 ++-------
 .../android2/fragments/SearchFragment.java    |  6 ++---
 app/src/main/res/layout/fragment_search.xml   | 24 ++++++++++++-------
 .../main/res/layout/spinner_dropdown_item.xml | 11 +++++++++
 app/src/main/res/layout/spinner_list_item.xml | 11 +++++++++
 5 files changed, 43 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/res/layout/spinner_dropdown_item.xml
 create mode 100644 app/src/main/res/layout/spinner_list_item.xml

diff --git a/app/app.iml b/app/app.iml
index 5e29317..f941dc1 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -65,27 +65,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
       <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/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <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/fragments/SearchFragment.java b/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
index 1c50103..8db1bb7 100644
--- a/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
@@ -2,6 +2,7 @@ package org.openlp.android2.fragments;
 
 import android.app.Fragment;
 import android.content.Context;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.text.Html;
@@ -111,10 +112,9 @@ public class SearchFragment extends Fragment {
             e.printStackTrace();
         }
         ArrayAdapter<String> LTRadapter = new ArrayAdapter<String>(getActivity(),
-                android.R.layout.simple_spinner_item, categories);
-        LTRadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+                R.layout.spinner_list_item, categories);
+        LTRadapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
         spinner.setAdapter(LTRadapter);
-
         Log.i(LOG_TAG, "populatePluginList - exit");
     }
 
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index e1324d3..843ea79 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -7,7 +7,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_horizontal|top"
-    android:weightSum="1">
+    android:weightSum="1"
+    android:paddingLeft="15dp">
 
     <LinearLayout
         android:orientation="horizontal"
@@ -21,19 +22,24 @@
             android:layout_height="wrap_content"
             android:text="Select Plugin"
             android:id="@+id/search_title"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:paddingLeft="30dp"
+            android:paddingRight="30dp"/>
 
         <Spinner
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:id="@+id/search_spinner"
-            android:layout_weight="0.58" />
+            android:layout_weight="0.4"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
 
-        <SearchView
+        <Button
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="45dp"
+            android:text="Search"
             android:id="@+id/searchView"
-            android:layout_gravity="center_horizontal" />
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="0.07" />
 
     </LinearLayout>
 
@@ -47,9 +53,11 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textAppearance="?android:attr/textAppearanceLarge"
             android:text="Search Text"
-            android:id="@+id/search_value_desc" />
+            android:id="@+id/search_value_desc"
+            android:paddingLeft="30dp"
+            android:paddingRight="30dp"/>
 
         <EditText
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/spinner_dropdown_item.xml b/app/src/main/res/layout/spinner_dropdown_item.xml
new file mode 100644
index 0000000..42fcee9
--- /dev/null
+++ b/app/src/main/res/layout/spinner_dropdown_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    style="?android:attr/spinnerDropDownItemStyle"
+    android:singleLine="true"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:ellipsize="marquee"
+    android:textColor="#000"
+    android:textStyle="bold|italic"
+    android:textAppearance="?android:attr/textAppearanceLarge"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/spinner_list_item.xml b/app/src/main/res/layout/spinner_list_item.xml
new file mode 100644
index 0000000..d76b839
--- /dev/null
+++ b/app/src/main/res/layout/spinner_list_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    style="?android:attr/spinnerItemStyle"
+    android:singleLine="true"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textColor="#000"
+    android:textAppearance="?android:attr/textAppearanceLarge"
+    android:ellipsize="marquee"
+    android:textStyle="bold|italic" />
\ No newline at end of file