From fdec1e3ed8ae1e2a280b3efe65c4d3ffac33c3ae Mon Sep 17 00:00:00 2001
From: Bradlee Speice <bspeice.nc@gmail.com>
Date: Sun, 5 Apr 2015 20:55:55 -0400
Subject: [PATCH] Search results to CardView, API 22 support

---
 app/build.gradle                              | 15 ++++----
 app/src/main/play/en-US/whatsnew              |  2 +
 .../main/res/layout/view_search_result.xml    | 38 ++++++++++++-------
 app/src/main/res/values/dimens.xml            |  2 +
 4 files changed, 35 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/play/en-US/whatsnew

diff --git a/app/build.gradle b/app/build.gradle
index 7de2ab4..23c2d21 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,12 +13,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'play'
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 22
     buildToolsVersion '21.1.2'
     defaultConfig {
         applicationId 'org.bspeice.minimalbible'
         minSdkVersion 8
-        targetSdkVersion 21
+        targetSdkVersion 22
 
         def travis_code = System.getenv("TRAVIS_BUILD_NUMBER")
         if (travis_code)
@@ -68,15 +68,14 @@ dependencies {
     compile 'com.squareup.dagger:dagger:+'
     provided 'com.squareup.dagger:dagger-compiler:+'
 
-    // TODO: Figure out why I need to force 2.1.0 and can't just use +
-    compile 'de.devland.esperandro:esperandro-api:2.1.0'
-    provided 'de.devland.esperandro:esperandro:2.1.0'
-
+    compile 'de.devland.esperandro:esperandro-api:+'
+    provided 'de.devland.esperandro:esperandro:+'
     compile 'com.jakewharton:butterknife:+'
     compile 'com.readystatesoftware.systembartint:systembartint:+'
     compile 'com.netflix.rxjava:rxjava-android:+'
-    compile 'com.android.support:appcompat-v7:21.+'
-    compile 'com.android.support:recyclerview-v7:21.+'
+    compile 'com.android.support:appcompat-v7:+'
+    compile 'com.android.support:recyclerview-v7:+'
+    compile 'com.android.support:cardview-v7:+'
     compile 'org.apache.commons:commons-lang3:+'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
new file mode 100644
index 0000000..694e450
--- /dev/null
+++ b/app/src/main/play/en-US/whatsnew
@@ -0,0 +1,2 @@
+- Search results now are Material-compliant!
+- Android 5.1 devices now supported
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_search_result.xml b/app/src/main/res/layout/view_search_result.xml
index 9bd9950..dd864ea 100644
--- a/app/src/main/res/layout/view_search_result.xml
+++ b/app/src/main/res/layout/view_search_result.xml
@@ -1,19 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:orientation="vertical">
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_margin="@dimen/cardview_padding"
+    card_view:cardCornerRadius="4dp"
+    card_view:contentPadding="@dimen/cardview_padding">
 
-    <TextView
-        android:id="@+id/verseName"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/verseContent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-</LinearLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/verseName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:id="@+id/verseContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+    </LinearLayout>
+</android.support.v7.widget.CardView>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index db062fc..431f0b4 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -11,4 +11,6 @@
     <dimen name="toolbar_height">56dp</dimen>
 
     <dimen name="biblemenu_child_padding">8dp</dimen>
+
+    <dimen name="cardview_padding">4dp</dimen>
 </resources>