diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativeAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativeAD.kt index d903b4aa1..dc8b7875b 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativeAD.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativeAD.kt @@ -7,7 +7,7 @@ import androidx.core.text.inSpans import androidx.lifecycle.LifecycleOwner import coil.ImageLoader import coil.request.ImageRequest -import coil.transform.CircleCropTransformation +import coil.transform.RoundedCornersTransformation import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding import org.koitharu.kotatsu.R import org.koitharu.kotatsu.core.model.getTitle @@ -75,7 +75,7 @@ fun alternativeAD( .fallback(R.drawable.ic_web) .error(R.drawable.ic_web) .source(item.manga.source) - .transformations(CircleCropTransformation()) + .transformations(RoundedCornersTransformation(context.resources.getDimension(R.dimen.chip_icon_corner))) .allowRgb565(true) .enqueueWith(coil) } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaDataRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaDataRepository.kt index ffec4f507..0388bdc59 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaDataRepository.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaDataRepository.kt @@ -46,6 +46,7 @@ class MangaDataRepository @Inject constructor( cfBrightness = colorFilter?.brightness ?: 0f, cfContrast = colorFilter?.contrast ?: 0f, cfInvert = colorFilter?.isInverted ?: false, + cfGrayscale = colorFilter?.isGrayscale ?: false, ), ) } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt index a68c5e9ae..b8e444a2d 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt @@ -41,7 +41,7 @@ abstract class FavouritesDao : MangaQueryBuilder.ConditionCallback { @Query("SELECT * FROM favourites WHERE deleted_at = 0 ORDER BY created_at DESC LIMIT :limit OFFSET :offset") abstract suspend fun findAllRaw(offset: Int, limit: Int): List - @Query("SELECT DISTINCT manga_id FROM favourites WHERE deleted_at = 0 AND category_id IN (SELECT category_id FROM favourite_categories WHERE track = 1)") + @Query("SELECT DISTINCT manga_id FROM favourites WHERE deleted_at = 0 AND category_id IN (SELECT category_id FROM favourite_categories WHERE track = 1 AND deleted_at = 0)") abstract suspend fun findIdsWithTrack(): LongArray @Transaction