From 172305fc6af096f4864e6c7672172deeab47d6f2 Mon Sep 17 00:00:00 2001 From: Bram van de Kerkhof Date: Tue, 7 Jun 2016 20:14:36 +0200 Subject: [PATCH] Wrong card background fix + bump gradle version (#337) --- .../tachiyomi/ui/recently_read/RecentlyReadAdapter.kt | 2 +- .../tachiyomi/ui/recently_read/RecentlyReadFragment.kt | 6 +++--- .../tachiyomi/ui/recently_read/RecentlyReadHolder.kt | 4 ++-- app/src/main/res/layout/card_myanimelist_personal.xml | 4 +--- ...ragment_recent_manga.xml => fragment_recently_read.xml} | 2 +- .../{item_recent_manga.xml => item_recently_read.xml} | 2 -- app/src/main/res/values/attrs.xml | 1 + app/src/main/res/values/styles.xml | 7 ++++--- app/src/main/res/values/themes.xml | 2 ++ build.gradle | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) rename app/src/main/res/layout/{fragment_recent_manga.xml => fragment_recently_read.xml} (91%) rename app/src/main/res/layout/{item_recent_manga.xml => item_recently_read.xml} (97%) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadAdapter.kt index 565ac3b8ee..4c32691f1e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadAdapter.kt @@ -23,7 +23,7 @@ class RecentlyReadAdapter(val fragment: RecentlyReadFragment) * @param viewType int containing viewType */ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecentlyReadHolder { - val view = parent.inflate(R.layout.item_recent_manga) + val view = parent.inflate(R.layout.item_recently_read) return RecentlyReadHolder(view, this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadFragment.kt index fa0ac02ba8..1c7dc15205 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadFragment.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadFragment.kt @@ -14,12 +14,12 @@ import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.manga.MangaActivity import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.widget.NpaLinearLayoutManager -import kotlinx.android.synthetic.main.fragment_recent_manga.* +import kotlinx.android.synthetic.main.fragment_recently_read.* import nucleus.factory.RequiresPresenter /** * Fragment that shows recently read manga. - * Uses R.layout.fragment_recent_manga. + * Uses R.layout.fragment_recently_read. * UI related actions should be called from here. */ @RequiresPresenter(RecentlyReadPresenter::class) @@ -49,7 +49,7 @@ class RecentlyReadFragment : BaseRxFragment() { * @param savedState status of saved state */ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedState: Bundle?): View? { - return inflater.inflate(R.layout.fragment_recent_manga, container, false) + return inflater.inflate(R.layout.fragment_recently_read, container, false) } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadHolder.kt index d70fdfcd31..cdde7d3567 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadHolder.kt @@ -9,13 +9,13 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.MangaChapterHistory import eu.kanade.tachiyomi.data.source.SourceManager import kotlinx.android.synthetic.main.dialog_remove_recently.view.* -import kotlinx.android.synthetic.main.item_recent_manga.view.* +import kotlinx.android.synthetic.main.item_recently_read.view.* import java.text.DecimalFormat import java.text.DecimalFormatSymbols /** * Holder that contains recent manga item - * Uses R.layout.item_recent_manga. + * Uses R.layout.item_recently_read. * UI related actions should be called from here. * * @param view the inflated view for this holder. diff --git a/app/src/main/res/layout/card_myanimelist_personal.xml b/app/src/main/res/layout/card_myanimelist_personal.xml index 6a6141447b..45f5728392 100644 --- a/app/src/main/res/layout/card_myanimelist_personal.xml +++ b/app/src/main/res/layout/card_myanimelist_personal.xml @@ -3,9 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/cv_mal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/card_margin" + style="@style/Theme.Widget.CardView" > + tools:listitem="@layout/item_recently_read"> diff --git a/app/src/main/res/layout/item_recent_manga.xml b/app/src/main/res/layout/item_recently_read.xml similarity index 97% rename from app/src/main/res/layout/item_recent_manga.xml rename to app/src/main/res/layout/item_recently_read.xml index b8c3e1ed0a..ac0c1e0a2e 100644 --- a/app/src/main/res/layout/item_recent_manga.xml +++ b/app/src/main/res/layout/item_recently_read.xml @@ -3,8 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/cv_manga" style="@style/Theme.Widget.CardView" - android:layout_width="match_parent" - android:layout_height="wrap_content" > + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ec175c46c4..fdaf0405c5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -142,9 +142,10 @@