From b2a3416289fa73b2a768a1eeea2a459c71c04506 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Tue, 25 Jul 2023 19:25:14 -0600 Subject: [PATCH] image: simplify coverview internals Remove the setting responsiveness from CoverView, given that it really doesn't need to that anymore. --- .../java/org/oxycblt/auxio/image/CoverView.kt | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt b/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt index de00d7c9e..f57d35968 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt @@ -76,7 +76,7 @@ import org.oxycblt.auxio.util.getInteger class CoverView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr: Int = 0) : - FrameLayout(context, attrs, defStyleAttr), ImageSettings.Listener, UISettings.Listener { + FrameLayout(context, attrs, defStyleAttr) { @Inject lateinit var imageLoader: ImageLoader @Inject lateinit var uiSettings: UISettings @Inject lateinit var imageSettings: ImageSettings @@ -154,9 +154,6 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr } else { null } - - imageSettings.registerListener(this) - uiSettings.registerListener(this) } override fun onFinishInflate() { @@ -187,23 +184,6 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr } } - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - imageSettings.unregisterListener(this) - } - - override fun onImageSettingsChanged() { - val cover = currentCover ?: return - bind(cover.songs, cover.desc, cover.errorRes) - } - - override fun onRoundModeChanged() { - cornerRadiusRes = getCornerRadiusRes() - applyBackgroundsToChildren() - val cover = currentCover ?: return - bind(cover.songs, cover.desc, cover.errorRes) - } - override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { super.onMeasure(widthMeasureSpec, heightMeasureSpec)