From 678cef0a4529cd6c9a0730eaace641888957aefe Mon Sep 17 00:00:00 2001 From: Zakhar Timoshenko Date: Sun, 7 Aug 2022 21:54:26 +0300 Subject: [PATCH] Fix coil cropping cached images --- .../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, 21 insertions(+), 11 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 cc6191860..ed844c3e2 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,6 +2,8 @@ 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 @@ -43,6 +45,8 @@ 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 15b8dd6ba..6380e9b82 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,6 +2,8 @@ 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 @@ -38,6 +40,8 @@ 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 5900c0e9e..5e9e6b91c 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="52" + android:viewportHeight="72"> + android:pathData="M17.7,46c-0.4,0 -0.8,-0.2 -1.2,-0.5c-0.3,-0.3 -0.5,-0.7 -0.5,-1.2V27.6c0,-0.4 0.2,-0.8 0.5,-1.2c0.3,-0.3 0.7,-0.5 1.2,-0.5h16.8c0.4,0 0.8,0.2 1.2,0.5c0.3,0.3 0.5,0.7 0.5,1.2v16.8c0,0.4 -0.2,0.8 -0.5,1.2S34.9,46 34.5,46H17.7zM18.9,37.3l4.8,-4.8l4.8,4.8l4.8,-4.8l1.2,1.2v-6.1H17.7v8.5L18.9,37.3zM17.7,44.4h16.8V36l-1.2,-1.2l-4.8,4.8l-4.8,-4.8l-4.8,4.8l-1.2,-1.2V44.4zM17.7,44.4V36v1.7V27.6V44.4z" /> diff --git a/app/src/main/res/drawable/ic_placeholder.xml b/app/src/main/res/drawable/ic_placeholder.xml index ba8dd489f..a23afd982 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="52" + android:viewportHeight="72"> + android:pathData="M17.7,46c-0.4,0 -0.8,-0.2 -1.2,-0.5c-0.3,-0.3 -0.5,-0.7 -0.5,-1.2V27.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.5H17.7zM17.7,44.4h16.7V27.7H17.7V44.4zM19.2,41.7h13.6l-4.1,-5.5L25.1,41l-2.6,-3.5C22.5,37.4 19.2,41.7 19.2,41.7z" /> diff --git a/app/src/main/res/layout/item_manga_grid.xml b/app/src/main/res/layout/item_manga_grid.xml index 23dd30c10..e7023a042 100644 --- a/app/src/main/res/layout/item_manga_grid.xml +++ b/app/src/main/res/layout/item_manga_grid.xml @@ -25,6 +25,7 @@ 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 b23b6e245..c6ecb766e 100644 --- a/app/src/main/res/layout/item_manga_list_details.xml +++ b/app/src/main/res/layout/item_manga_list_details.xml @@ -18,7 +18,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="vertical" - android:scaleType="centerCrop" + android:adjustViewBounds="true" + android:scaleType="fitXY" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"