mirror of
https://github.com/MinimalBible/MinimalBible
synced 2024-11-05 07:38:20 -05:00
Search results to CardView, API 22 support
This commit is contained in:
parent
1a5f7222cb
commit
fdec1e3ed8
@ -13,12 +13,12 @@ apply plugin: 'kotlin-android'
|
|||||||
apply plugin: 'play'
|
apply plugin: 'play'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 21
|
compileSdkVersion 22
|
||||||
buildToolsVersion '21.1.2'
|
buildToolsVersion '21.1.2'
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId 'org.bspeice.minimalbible'
|
applicationId 'org.bspeice.minimalbible'
|
||||||
minSdkVersion 8
|
minSdkVersion 8
|
||||||
targetSdkVersion 21
|
targetSdkVersion 22
|
||||||
|
|
||||||
def travis_code = System.getenv("TRAVIS_BUILD_NUMBER")
|
def travis_code = System.getenv("TRAVIS_BUILD_NUMBER")
|
||||||
if (travis_code)
|
if (travis_code)
|
||||||
@ -68,15 +68,14 @@ dependencies {
|
|||||||
compile 'com.squareup.dagger:dagger:+'
|
compile 'com.squareup.dagger:dagger:+'
|
||||||
provided 'com.squareup.dagger:dagger-compiler:+'
|
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:+'
|
||||||
compile 'de.devland.esperandro:esperandro-api:2.1.0'
|
provided 'de.devland.esperandro:esperandro:+'
|
||||||
provided 'de.devland.esperandro:esperandro:2.1.0'
|
|
||||||
|
|
||||||
compile 'com.jakewharton:butterknife:+'
|
compile 'com.jakewharton:butterknife:+'
|
||||||
compile 'com.readystatesoftware.systembartint:systembartint:+'
|
compile 'com.readystatesoftware.systembartint:systembartint:+'
|
||||||
compile 'com.netflix.rxjava:rxjava-android:+'
|
compile 'com.netflix.rxjava:rxjava-android:+'
|
||||||
compile 'com.android.support:appcompat-v7:21.+'
|
compile 'com.android.support:appcompat-v7:+'
|
||||||
compile 'com.android.support:recyclerview-v7:21.+'
|
compile 'com.android.support:recyclerview-v7:+'
|
||||||
|
compile 'com.android.support:cardview-v7:+'
|
||||||
compile 'org.apache.commons:commons-lang3:+'
|
compile 'org.apache.commons:commons-lang3:+'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
|
||||||
|
2
app/src/main/play/en-US/whatsnew
Normal file
2
app/src/main/play/en-US/whatsnew
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
- Search results now are Material-compliant!
|
||||||
|
- Android 5.1 devices now supported
|
@ -1,19 +1,29 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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_width="match_parent"
|
||||||
android:layout_height="?android:attr/listPreferredItemHeight"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:layout_gravity="center"
|
||||||
|
android:layout_margin="@dimen/cardview_padding"
|
||||||
|
card_view:cardCornerRadius="4dp"
|
||||||
|
card_view:contentPadding="@dimen/cardview_padding">
|
||||||
|
|
||||||
<TextView
|
<LinearLayout
|
||||||
android:id="@+id/verseName"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
android:orientation="vertical">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/verseContent"
|
android:id="@+id/verseName"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:ellipsize="end"
|
android:textAppearance="?android:attr/textAppearanceMedium" />
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
|
||||||
</LinearLayout>
|
<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>
|
||||||
|
@ -11,4 +11,6 @@
|
|||||||
<dimen name="toolbar_height">56dp</dimen>
|
<dimen name="toolbar_height">56dp</dimen>
|
||||||
|
|
||||||
<dimen name="biblemenu_child_padding">8dp</dimen>
|
<dimen name="biblemenu_child_padding">8dp</dimen>
|
||||||
|
|
||||||
|
<dimen name="cardview_padding">4dp</dimen>
|
||||||
</resources>
|
</resources>
|
||||||
|
Loading…
Reference in New Issue
Block a user