Skip to content

Commit 196aa8a

Browse files
committed
Using AnimatedVectorDrawableCompat in all places
No idea why I trusted google with this
1 parent 5b40f10 commit 196aa8a

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package eu.kanade.tachiyomi.ui.library.filter
22

33
import android.content.Context
4-
import android.graphics.drawable.AnimatedVectorDrawable
54
import android.os.Parcelable
65
import android.util.AttributeSet
76
import android.view.View
87
import android.widget.ImageView
98
import android.widget.LinearLayout
109
import androidx.annotation.StringRes
1110
import androidx.core.view.isVisible
11+
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
1212
import com.google.android.material.bottomsheet.BottomSheetBehavior
1313
import eu.kanade.tachiyomi.R
1414
import eu.kanade.tachiyomi.data.database.DatabaseHelper
@@ -233,14 +233,15 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri
233233
}
234234
)
235235
if (animated) {
236-
binding.expandCategories.setIconResource(
236+
binding.expandCategories.icon = AnimatedVectorDrawableCompat.create(
237+
binding.expandCategories.context,
237238
if (!allExpanded) {
238239
R.drawable.anim_expand_less_to_more
239240
} else {
240241
R.drawable.anim_expand_more_to_less
241242
}
242243
)
243-
(binding.expandCategories.icon as? AnimatedVectorDrawable)?.start()
244+
(binding.expandCategories.icon as? AnimatedVectorDrawableCompat)?.start()
244245
} else {
245246
binding.expandCategories.setIconResource(
246247
if (!allExpanded) {

app/src/main/java/eu/kanade/tachiyomi/ui/main/OverflowDialog.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package eu.kanade.tachiyomi.ui.main
22

33
import android.app.Dialog
44
import android.graphics.Color
5-
import android.graphics.drawable.AnimatedVectorDrawable
65
import android.view.View
76
import android.view.ViewGroup
7+
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
88
import eu.kanade.tachiyomi.BuildConfig
99
import eu.kanade.tachiyomi.R
1010
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@@ -49,11 +49,13 @@ class OverflowDialog(activity: MainActivity) : Dialog(activity, R.style.Overflow
4949
incogText
5050
)
5151
text = newTitle.withSubtitle(context, subtitleText)
52-
setIcon(
52+
val drawable = AnimatedVectorDrawableCompat.create(
53+
context,
5354
if (incog) R.drawable.anim_read_to_incog
5455
else R.drawable.anim_incog_to_read
5556
)
56-
(getIcon() as? AnimatedVectorDrawable)?.start()
57+
setIcon(drawable)
58+
(getIcon() as? AnimatedVectorDrawableCompat)?.start()
5759
}
5860
}
5961
binding.settingsItem.setOnClickListener {

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import android.content.res.ColorStateList
99
import android.content.res.Configuration
1010
import android.graphics.Bitmap
1111
import android.graphics.Color
12-
import android.graphics.drawable.AnimatedVectorDrawable
1312
import android.graphics.drawable.LayerDrawable
1413
import android.os.Build
1514
import android.os.Bundle
@@ -33,6 +32,7 @@ import androidx.core.view.isVisible
3332
import androidx.core.view.GestureDetectorCompat
3433
import androidx.core.view.ViewCompat
3534
import androidx.core.view.forEach
35+
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
3636
import com.afollestad.materialdialogs.MaterialDialog
3737
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
3838
import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -419,9 +419,9 @@ class ReaderActivity :
419419
R.drawable.anim_crop_to_free
420420
}
421421
if (lastCropRes != drawableRes) {
422-
setImageResource(drawableRes)
423-
val animDrawable = drawable as AnimatedVectorDrawable
424-
animDrawable.start()
422+
val drawable = AnimatedVectorDrawableCompat.create(context, drawableRes)
423+
setImageDrawable(drawable)
424+
drawable?.start()
425425
lastCropRes = drawableRes
426426
}
427427
compatToolTipText =

0 commit comments

Comments
 (0)