diff --git a/app/build.gradle b/app/build.gradle index b3059c47c..de54653ab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,16 +8,16 @@ plugins { } android { - compileSdk = 34 - buildToolsVersion = '34.0.0' + compileSdk = 35 + buildToolsVersion = '35.0.0' namespace = 'org.koitharu.kotatsu' defaultConfig { applicationId 'org.koitharu.kotatsu' minSdk = 21 targetSdk = 35 - versionCode = 664 - versionName = '7.5-a4' + versionCode = 665 + versionName = '7.5-b1' generatedDensities = [] testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner' ksp { @@ -137,7 +137,7 @@ dependencies { implementation 'io.coil-kt:coil-base:2.7.0' implementation 'io.coil-kt:coil-svg:2.7.0' - implementation 'com.github.KotatsuApp:subsampling-scale-image-view:882bc0620c' + implementation 'com.github.KotatsuApp:subsampling-scale-image-view:4ec7176962' implementation 'com.github.solkin:disk-lru-cache:1.4' implementation 'io.noties.markwon:core:4.6.2' diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt index 482cb5422..013a30a7a 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt @@ -29,7 +29,7 @@ import androidx.swiperefreshlayout.widget.CircularProgressDrawable import coil.ImageLoader import coil.request.ImageRequest import coil.request.SuccessResult -import coil.transform.CircleCropTransformation +import coil.transform.RoundedCornersTransformation import coil.util.CoilUtils import com.google.android.material.chip.Chip import com.google.android.material.snackbar.Snackbar @@ -72,6 +72,7 @@ import org.koitharu.kotatsu.core.util.ext.joinToStringWithLimit import org.koitharu.kotatsu.core.util.ext.observe import org.koitharu.kotatsu.core.util.ext.observeEvent import org.koitharu.kotatsu.core.util.ext.parentView +import org.koitharu.kotatsu.core.util.ext.resolveDp import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf import org.koitharu.kotatsu.core.util.ext.setNavigationBarTransparentCompat import org.koitharu.kotatsu.core.util.ext.setOnContextClickListenerCompat @@ -475,7 +476,7 @@ class DetailsActivity : .fallback(R.drawable.ic_web) .error(R.drawable.ic_web) .source(manga.source) - .transformations(CircleCropTransformation()) + .transformations(RoundedCornersTransformation(resources.getDimension(R.dimen.chip_icon_corner))) .allowRgb565(true) .enqueueWith(coil) } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt index 8e1c75ec5..f7b106afb 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt @@ -8,7 +8,6 @@ import android.util.AttributeSet import androidx.core.view.ancestors import androidx.recyclerview.widget.RecyclerView import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView -import org.koitharu.kotatsu.BuildConfig import org.koitharu.kotatsu.core.util.ext.resolveDp import kotlin.math.roundToInt @@ -24,7 +23,7 @@ class WebtoonImageView @JvmOverloads constructor( override fun onDraw(canvas: Canvas) { super.onDraw(canvas) - if (BuildConfig.DEBUG) { + if (isDebug) { drawDebug(canvas) } } @@ -99,8 +98,9 @@ class WebtoonImageView @JvmOverloads constructor( override fun onDownSamplingChanged() { super.onDownSamplingChanged() - post { + if (isReady) { adjustScale() + onImageEventListener.onReady() } } diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 3939fff2a..7c8ba9833 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -77,4 +77,6 @@ 200dp 12dp + + 3dp