From deef3bd8b5cf188af9d5ec52301fe0f19c501dd4 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Mon, 8 Aug 2022 16:22:07 +0300 Subject: [PATCH] Revert "Fix coil cropping cached images" This reverts commit 678cef0a4529cd6c9a0730eaace641888957aefe. --- .../kotatsu/list/ui/adapter/MangaGridItemAD.kt | 4 ---- .../kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt | 4 ---- app/src/main/res/drawable/ic_error_placeholder.xml | 10 +++++----- app/src/main/res/drawable/ic_placeholder.xml | 10 +++++----- app/src/main/res/layout/item_manga_grid.xml | 1 - app/src/main/res/layout/item_manga_list_details.xml | 3 +-- 6 files changed, 11 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt index ed844c3e2..cc6191860 100644 --- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt +++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt @@ -2,8 +2,6 @@ package org.koitharu.kotatsu.list.ui.adapter import androidx.lifecycle.LifecycleOwner import coil.ImageLoader -import coil.size.Scale -import coil.size.Size import com.google.android.material.badge.BadgeDrawable import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding import org.koitharu.kotatsu.R @@ -45,8 +43,6 @@ fun mangaGridItemAD( placeholder(R.drawable.ic_placeholder) fallback(R.drawable.ic_placeholder) error(R.drawable.ic_error_placeholder) - size(Size.ORIGINAL) - scale(Scale.FILL) allowRgb565(true) lifecycle(lifecycleOwner) enqueueWith(coil) diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt index 6380e9b82..15b8dd6ba 100644 --- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt +++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt @@ -2,8 +2,6 @@ package org.koitharu.kotatsu.list.ui.adapter import androidx.lifecycle.LifecycleOwner import coil.ImageLoader -import coil.size.Scale -import coil.size.Size import com.google.android.material.badge.BadgeDrawable import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding import org.koitharu.kotatsu.R @@ -40,8 +38,6 @@ fun mangaListDetailedItemAD( placeholder(R.drawable.ic_placeholder) fallback(R.drawable.ic_placeholder) error(R.drawable.ic_error_placeholder) - size(Size.ORIGINAL) - scale(Scale.FILL) allowRgb565(true) lifecycle(lifecycleOwner) enqueueWith(coil) diff --git a/app/src/main/res/drawable/ic_error_placeholder.xml b/app/src/main/res/drawable/ic_error_placeholder.xml index 5e9e6b91c..5900c0e9e 100644 --- a/app/src/main/res/drawable/ic_error_placeholder.xml +++ b/app/src/main/res/drawable/ic_error_placeholder.xml @@ -1,11 +1,11 @@ + android:viewportWidth="60" + android:viewportHeight="60"> + android:pathData="M21.7,40c-0.4,0 -0.8,-0.2 -1.2,-0.5c-0.3,-0.3 -0.5,-0.7 -0.5,-1.2V21.7c0,-0.4 0.2,-0.8 0.5,-1.2s0.7,-0.5 1.2,-0.5h16.7c0.4,0 0.8,0.2 1.2,0.5s0.5,0.7 0.5,1.2v16.7c0,0.4 -0.2,0.8 -0.5,1.2c-0.3,0.3 -0.7,0.5 -1.2,0.5H21.7zM22.9,31.3l4.8,-4.8l4.7,4.7l4.8,-4.8l1.2,1.2v-6H21.7v8.4L22.9,31.3zM21.7,38.4h16.7v-8.3l-1.2,-1.2l-4.8,4.8l-4.7,-4.7l-4.8,4.8l-1.2,-1.2V38.4zM21.7,38.4v-8.3v1.7V21.7V38.4z" /> diff --git a/app/src/main/res/drawable/ic_placeholder.xml b/app/src/main/res/drawable/ic_placeholder.xml index a23afd982..ba8dd489f 100644 --- a/app/src/main/res/drawable/ic_placeholder.xml +++ b/app/src/main/res/drawable/ic_placeholder.xml @@ -1,11 +1,11 @@ + android:viewportWidth="60" + android:viewportHeight="60"> + android:pathData="M21.7,40c-0.4,0 -0.8,-0.2 -1.2,-0.5c-0.3,-0.3 -0.5,-0.7 -0.5,-1.2V21.7c0,-0.4 0.2,-0.8 0.5,-1.2s0.7,-0.5 1.2,-0.5h16.7c0.4,0 0.8,0.2 1.2,0.5s0.5,0.7 0.5,1.2v16.7c0,0.4 -0.2,0.8 -0.5,1.2c-0.3,0.3 -0.7,0.5 -1.2,0.5H21.7zM21.7,38.4h16.7V21.7H21.7V38.4zM23.2,35.7h13.6l-4.1,-5.5L29.1,35l-2.6,-3.5C26.5,31.4 23.2,35.7 23.2,35.7z" /> diff --git a/app/src/main/res/layout/item_manga_grid.xml b/app/src/main/res/layout/item_manga_grid.xml index e7023a042..23dd30c10 100644 --- a/app/src/main/res/layout/item_manga_grid.xml +++ b/app/src/main/res/layout/item_manga_grid.xml @@ -25,7 +25,6 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:adjustViewBounds="true" - android:scaleType="fitXY" app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover" tools:ignore="ContentDescription" tools:src="@sample/covers[5]" /> diff --git a/app/src/main/res/layout/item_manga_list_details.xml b/app/src/main/res/layout/item_manga_list_details.xml index c6ecb766e..b23b6e245 100644 --- a/app/src/main/res/layout/item_manga_list_details.xml +++ b/app/src/main/res/layout/item_manga_list_details.xml @@ -18,8 +18,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="vertical" - android:adjustViewBounds="true" - android:scaleType="fitXY" + android:scaleType="centerCrop" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"