From b174adbab0ddbb1b9f14205e349040dc25f593f1 Mon Sep 17 00:00:00 2001 From: inorichi Date: Sun, 24 Jan 2016 23:41:21 +0100 Subject: [PATCH] Use a gradient at the bottom of the cover. Remove external repositories from gradle --- app/build.gradle | 3 +- .../ui/library/LibraryCategoryAdapter.java | 2 +- .../tachiyomi/ui/library/LibraryHolder.java | 4 +- app/src/main/res/drawable/gradient_shape.xml | 12 ++++ .../main/res/layout/item_catalogue_grid.xml | 71 ++++++++++--------- build.gradle | 2 - libs/SubsamplingScaleImageView/build.gradle | 6 +- 7 files changed, 60 insertions(+), 40 deletions(-) create mode 100644 app/src/main/res/drawable/gradient_shape.xml diff --git a/app/build.gradle b/app/build.gradle index f09668799..27fcad83d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,6 +93,7 @@ dependencies { compile "com.android.support:design:$SUPPORT_LIBRARY_VERSION" compile "com.android.support:recyclerview-v7:$SUPPORT_LIBRARY_VERSION" compile "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION" + compile "com.android.support:percent:$SUPPORT_LIBRARY_VERSION" compile 'com.squareup.okhttp:okhttp-urlconnection:2.7.2' compile 'com.squareup.okhttp:okhttp:2.7.2' compile 'com.squareup.okio:okio:1.6.0' @@ -116,7 +117,7 @@ dependencies { compile 'com.github.dmytrodanylyk.android-process-button:library:1.0.4' compile 'eu.davidea:flexible-adapter:4.2.0' compile 'com.nononsenseapps:filepicker:2.5.1' - compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' + compile 'com.github.amulyakhare:TextDrawable:558677e' compile 'com.github.pwittchen:reactivenetwork:0.1.5' compile "com.google.dagger:dagger:$DAGGER_VERSION" diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.java index 5f3a0ff7c..d4cbfd4ee 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.java @@ -67,7 +67,7 @@ public class LibraryCategoryAdapter extends FlexibleAdapter + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_catalogue_grid.xml b/app/src/main/res/layout/item_catalogue_grid.xml index a4197e5aa..9836b21f7 100644 --- a/app/src/main/res/layout/item_catalogue_grid.xml +++ b/app/src/main/res/layout/item_catalogue_grid.xml @@ -12,13 +12,27 @@ android:layout_height="wrap_content" android:background="@drawable/card_background"> - + android:id="@+id/image_container"> + + + + + + - - - - - + android:layout_gravity="center_vertical" + app:typeface="ptsansNarrowBold" + android:lineSpacingExtra="-4dp" + android:ellipsize="end" + android:maxLines="2" + android:padding="8dp" + android:textColor="@color/white" + android:textSize="14sp" + android:shadowDx="0" + android:shadowDy="0" + android:shadowColor="@color/primary_text" + android:shadowRadius="4" + android:layout_alignBottom="@+id/image_container" + tools:text="Sample name"/> diff --git a/build.gradle b/build.gradle index 150d00534..0bbade591 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,5 @@ allprojects { jcenter() maven { url "https://clojars.org/repo/" } maven { url "https://jitpack.io" } - maven { url 'http://dl.bintray.com/amulyakhare/maven' } - maven { url 'https://github.com/suckgamony/RapidDecoder/raw/master/repository' } } } diff --git a/libs/SubsamplingScaleImageView/build.gradle b/libs/SubsamplingScaleImageView/build.gradle index abdacff13..971dbea64 100644 --- a/libs/SubsamplingScaleImageView/build.gradle +++ b/libs/SubsamplingScaleImageView/build.gradle @@ -6,9 +6,9 @@ version = '3.4.1' dependencies { compile fileTree(dir: 'libs', include: '*.jar') compile "com.android.support:support-annotations:23.1.1" - compile 'rapid.decoder:library:0.3.0' - compile 'rapid.decoder:jpeg-decoder:0.3.0' - compile 'rapid.decoder:png-decoder:0.3.0' + compile 'com.github.suckgamony.RapidDecoder:library:7cdfca4' + compile 'com.github.suckgamony.RapidDecoder:jpeg-decoder:7cdfca4' + compile 'com.github.suckgamony.RapidDecoder:png-decoder:7cdfca4' } android {