From 2947b30cbd76a6534037b12d8d0cc7cbeed9b2e9 Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 28 Oct 2026 17:08:20 +0900 Subject: [PATCH] =?UTF-8?q?fix(banner):=20=EB=9F=B0=ED=83=80=EC=9E=84=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EC=9D=B4=EB=AF=B8=EC=A7=80=EC=99=80=20?= =?UTF-8?q?=EC=9D=B4=EC=A0=84=20=EC=9A=94=EC=B2=AD=EC=9D=84=20=EB=B9=84?= =?UTF-8?q?=EC=9A=B4=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2/widget/banner/BannerAdapter.kt | 5 +- .../sodalive/v2/widget/banner/BannerView.kt | 2 +- app/src/main/res/layout/item_banner.xml | 4 +- .../v2/widget/banner/BannerViewTest.kt | 52 ++++++++++++++++++- 4 files changed, 56 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/widget/banner/BannerAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/widget/banner/BannerAdapter.kt index 823c76f3..1712e722 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/widget/banner/BannerAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/widget/banner/BannerAdapter.kt @@ -8,6 +8,7 @@ import android.view.ViewGroup import android.view.ViewOutlineProvider import android.widget.ImageView import androidx.recyclerview.widget.RecyclerView +import coil.dispose import kr.co.vividnext.sodalive.R class BannerAdapter( @@ -91,7 +92,9 @@ class BannerAdapter( height = ViewGroup.LayoutParams.MATCH_PARENT } setRadiusClipping(imageView) - if (previewImageResId != 0) imageView.setImageResource(previewImageResId) + imageView.dispose() + imageView.setImageDrawable(null) + if (itemView.isInEditMode && previewImageResId != 0) imageView.setImageResource(previewImageResId) onBindImage?.invoke(imageView, item) itemView.setOnClickListener { onClickItem?.invoke(item) } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/widget/banner/BannerView.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/widget/banner/BannerView.kt index e11fd092..bca42672 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/widget/banner/BannerView.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/widget/banner/BannerView.kt @@ -143,7 +143,7 @@ class BannerView @JvmOverloads constructor( val previewItemCount = typedArray.getInt(R.styleable.BannerView_bannerPreviewItemCount, 0) val previewCurrentIndex = typedArray.getInt(R.styleable.BannerView_bannerPreviewCurrentIndex, 0) val previewImageResId = typedArray.getResourceId(R.styleable.BannerView_bannerPreviewImage, 0) - if (previewImageResId != 0) adapter.setPreviewImageResource(previewImageResId) + if (isInEditMode && previewImageResId != 0) adapter.setPreviewImageResource(previewImageResId) if (previewItemCount > 0) { items = List(previewItemCount) { index -> BannerItem( diff --git a/app/src/main/res/layout/item_banner.xml b/app/src/main/res/layout/item_banner.xml index 27f984a3..9e578d11 100644 --- a/app/src/main/res/layout/item_banner.xml +++ b/app/src/main/res/layout/item_banner.xml @@ -1,14 +1,12 @@ + android:layout_height="match_parent"> diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/widget/banner/BannerViewTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/widget/banner/BannerViewTest.kt index 352c81ec..9e4ef7e9 100644 --- a/app/src/test/java/kr/co/vividnext/sodalive/v2/widget/banner/BannerViewTest.kt +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/widget/banner/BannerViewTest.kt @@ -3,6 +3,8 @@ package kr.co.vividnext.sodalive.v2.widget.banner import android.app.Application import android.content.Context import android.graphics.Rect +import android.graphics.Color +import android.graphics.drawable.ColorDrawable import android.view.View import android.view.View.MeasureSpec import android.widget.FrameLayout @@ -12,9 +14,11 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleRegistry import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ApplicationProvider +import coil.load import kr.co.vividnext.sodalive.R import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Test @@ -208,7 +212,7 @@ class BannerViewTest { } @Test - fun `배너 view는 preview image 속성을 image view에 적용한다`() { + fun `배너 view는 runtime에서 preview image 속성을 이미지로 표시하지 않는다`() { val context = ApplicationProvider.getApplicationContext() val attrs = Robolectric.buildAttributeSet() .addAttribute(R.attr.bannerPreviewItemCount, "1") @@ -223,7 +227,51 @@ class BannerViewTest { ?: recyclerView.adapter!!.onCreateViewHolder(recyclerView, 0).also { recyclerView.adapter!!.onBindViewHolder(it, 0) } val imageView = holder.itemView.findViewById(R.id.iv_banner) - assertNotNull(imageView.drawable) + assertNull(imageView.drawable) + } + + @Test + fun `배너 runtime은 preview 사전 할당 없이 실제 이미지 바인더를 호출한다`() { + val context = ApplicationProvider.getApplicationContext() + val actualImage = ColorDrawable(Color.GREEN) + val item = sampleItem("actual") + var boundItem: BannerItem? = null + val adapter = BannerAdapter(onBindImage = { image, banner -> + assertNull(image.drawable) + image.setImageDrawable(actualImage) + boundItem = banner + }) + adapter.setPreviewImageResource(R.drawable.bg_banner_preview_placeholder) + adapter.submitItems(listOf(item)) + val holder = adapter.onCreateViewHolder(FrameLayout(context), 0) + + adapter.onBindViewHolder(holder, 0) + + assertSame(item, boundItem) + val image = holder.itemView.findViewById(R.id.iv_banner) + assertSame(actualImage, image.drawable) + val previous = image.load(ColorDrawable(Color.RED)) + adapter.setOnBindImage(null) + adapter.onBindViewHolder(holder, 0) + assertTrue(previous.isDisposed) + assertNull(image.drawable) + } + + @Test + fun `배너 editor 바인딩은 preview 리소스를 유지한다`() { + val context = ApplicationProvider.getApplicationContext() + val root = object : FrameLayout(context) { + override fun isInEditMode() = true + } + val image = ImageView(context).apply { id = R.id.iv_banner } + root.addView(image) + val adapter = BannerAdapter() + adapter.setPreviewImageResource(R.drawable.bg_banner_preview_placeholder) + adapter.submitItems(listOf(sampleItem("preview"))) + + adapter.onBindViewHolder(adapter.BannerViewHolder(root), 0) + + assertNotNull(image.drawable) } @Test