From dff17fd11f40f96abe610e0a488c371ad90825cd Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 6 Aug 2022 18:37:25 +0300 Subject: [PATCH] Change BaseSavedState to AbsSavedState --- .../kotatsu/base/ui/widgets/CheckableImageView.kt | 8 +++++--- .../kotatsu/settings/utils/SliderPreference.kt | 13 +++++++------ .../org/koitharu/kotatsu/utils/ext/ThrowableExt.kt | 8 +++++--- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableImageView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableImageView.kt index 5d601d67c..2d18292cc 100644 --- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableImageView.kt +++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableImageView.kt @@ -10,6 +10,7 @@ import android.widget.Checkable import androidx.annotation.AttrRes import androidx.appcompat.widget.AppCompatImageView import androidx.core.os.ParcelCompat +import androidx.customview.view.AbsSavedState class CheckableImageView @JvmOverloads constructor( context: Context, @@ -73,7 +74,7 @@ class CheckableImageView @JvmOverloads constructor( fun onCheckedChanged(view: CheckableImageView, isChecked: Boolean) } - private class SavedState : BaseSavedState { + private class SavedState : AbsSavedState { val isChecked: Boolean @@ -81,7 +82,7 @@ class CheckableImageView @JvmOverloads constructor( isChecked = checked } - constructor(source: Parcel) : super(source) { + constructor(source: Parcel, classLoader: ClassLoader?) : super(source, classLoader) { isChecked = ParcelCompat.readBoolean(source) } @@ -91,9 +92,10 @@ class CheckableImageView @JvmOverloads constructor( } companion object { + @Suppress("unused") @JvmField val CREATOR: Creator = object : Creator { - override fun createFromParcel(`in`: Parcel) = SavedState(`in`) + override fun createFromParcel(`in`: Parcel) = SavedState(`in`, SavedState::class.java.classLoader) override fun newArray(size: Int): Array = arrayOfNulls(size) } diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/utils/SliderPreference.kt b/app/src/main/java/org/koitharu/kotatsu/settings/utils/SliderPreference.kt index 0933fe1d0..c0a76a8ac 100644 --- a/app/src/main/java/org/koitharu/kotatsu/settings/utils/SliderPreference.kt +++ b/app/src/main/java/org/koitharu/kotatsu/settings/utils/SliderPreference.kt @@ -5,8 +5,8 @@ import android.content.res.TypedArray import android.os.Parcel import android.os.Parcelable import android.util.AttributeSet -import android.view.View import androidx.core.content.withStyledAttributes +import androidx.customview.view.AbsSavedState import androidx.preference.Preference import androidx.preference.PreferenceViewHolder import com.google.android.material.slider.Slider @@ -40,11 +40,11 @@ class SliderPreference @JvmOverloads constructor( attrs, R.styleable.SliderPreference, defStyleAttr, - defStyleRes + defStyleRes, ) { valueFrom = getFloat( R.styleable.SliderPreference_android_valueFrom, - valueFrom.toFloat() + valueFrom.toFloat(), ).toInt() valueTo = getFloat(R.styleable.SliderPreference_android_valueTo, valueTo.toFloat()).toInt() @@ -117,7 +117,7 @@ class SliderPreference @JvmOverloads constructor( } } - private class SavedState : View.BaseSavedState { + private class SavedState : AbsSavedState { val valueFrom: Int val valueTo: Int @@ -134,7 +134,7 @@ class SliderPreference @JvmOverloads constructor( this.currentValue = currentValue } - constructor(source: Parcel) : super(source) { + constructor(source: Parcel, classLoader: ClassLoader?) : super(source, classLoader) { valueFrom = source.readInt() valueTo = source.readInt() currentValue = source.readInt() @@ -148,9 +148,10 @@ class SliderPreference @JvmOverloads constructor( } companion object { + @Suppress("unused") @JvmField val CREATOR: Parcelable.Creator = object : Parcelable.Creator { - override fun createFromParcel(`in`: Parcel) = SavedState(`in`) + override fun createFromParcel(`in`: Parcel) = SavedState(`in`, SavedState::class.java.classLoader) override fun newArray(size: Int): Array = arrayOfNulls(size) } diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ThrowableExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ThrowableExt.kt index 88d60f45c..4597d7d6c 100644 --- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ThrowableExt.kt +++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ThrowableExt.kt @@ -2,6 +2,7 @@ package org.koitharu.kotatsu.utils.ext import android.content.ActivityNotFoundException import android.content.res.Resources +import java.net.SocketTimeoutException import okio.FileNotFoundException import org.acra.ktx.sendWithAcra import org.koitharu.kotatsu.R @@ -10,13 +11,13 @@ import org.koitharu.kotatsu.parsers.exception.AuthRequiredException import org.koitharu.kotatsu.parsers.exception.ContentUnavailableException import org.koitharu.kotatsu.parsers.exception.NotFoundException import org.koitharu.kotatsu.parsers.exception.ParseException -import java.net.SocketTimeoutException fun Throwable.getDisplayMessage(resources: Resources): String = when (this) { is AuthRequiredException -> resources.getString(R.string.auth_required) is CloudFlareProtectedException -> resources.getString(R.string.captcha_required) is ActivityNotFoundException, - is UnsupportedOperationException -> resources.getString(R.string.operation_not_supported) + is UnsupportedOperationException, + -> resources.getString(R.string.operation_not_supported) is UnsupportedFileException -> resources.getString(R.string.text_file_not_supported) is FileNotFoundException -> resources.getString(R.string.file_not_found) is EmptyHistoryException -> resources.getString(R.string.history_is_empty) @@ -37,5 +38,6 @@ fun Throwable.isReportable(): Boolean { } fun Throwable.report(message: String?) { - CaughtException(this, message).sendWithAcra() + val exception = CaughtException(this, message) + exception.sendWithAcra() } \ No newline at end of file