fix(banner): 런타임 기본 이미지와 이전 요청을 비운다
This commit is contained in:
@@ -8,6 +8,7 @@ import android.view.ViewGroup
|
|||||||
import android.view.ViewOutlineProvider
|
import android.view.ViewOutlineProvider
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
|
import coil.dispose
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
|
|
||||||
class BannerAdapter(
|
class BannerAdapter(
|
||||||
@@ -91,7 +92,9 @@ class BannerAdapter(
|
|||||||
height = ViewGroup.LayoutParams.MATCH_PARENT
|
height = ViewGroup.LayoutParams.MATCH_PARENT
|
||||||
}
|
}
|
||||||
setRadiusClipping(imageView)
|
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)
|
onBindImage?.invoke(imageView, item)
|
||||||
itemView.setOnClickListener { onClickItem?.invoke(item) }
|
itemView.setOnClickListener { onClickItem?.invoke(item) }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ class BannerView @JvmOverloads constructor(
|
|||||||
val previewItemCount = typedArray.getInt(R.styleable.BannerView_bannerPreviewItemCount, 0)
|
val previewItemCount = typedArray.getInt(R.styleable.BannerView_bannerPreviewItemCount, 0)
|
||||||
val previewCurrentIndex = typedArray.getInt(R.styleable.BannerView_bannerPreviewCurrentIndex, 0)
|
val previewCurrentIndex = typedArray.getInt(R.styleable.BannerView_bannerPreviewCurrentIndex, 0)
|
||||||
val previewImageResId = typedArray.getResourceId(R.styleable.BannerView_bannerPreviewImage, 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) {
|
if (previewItemCount > 0) {
|
||||||
items = List(previewItemCount) { index ->
|
items = List(previewItemCount) { index ->
|
||||||
BannerItem(
|
BannerItem(
|
||||||
|
|||||||
@@ -1,14 +1,12 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:background="@drawable/bg_banner_preview_placeholder">
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/iv_banner"
|
android:id="@+id/iv_banner"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@drawable/bg_banner_preview_placeholder"
|
|
||||||
android:contentDescription="@null"
|
android:contentDescription="@null"
|
||||||
android:scaleType="centerCrop" />
|
android:scaleType="centerCrop" />
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ package kr.co.vividnext.sodalive.v2.widget.banner
|
|||||||
import android.app.Application
|
import android.app.Application
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.graphics.Rect
|
import android.graphics.Rect
|
||||||
|
import android.graphics.Color
|
||||||
|
import android.graphics.drawable.ColorDrawable
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.View.MeasureSpec
|
import android.view.View.MeasureSpec
|
||||||
import android.widget.FrameLayout
|
import android.widget.FrameLayout
|
||||||
@@ -12,9 +14,11 @@ import androidx.lifecycle.Lifecycle
|
|||||||
import androidx.lifecycle.LifecycleRegistry
|
import androidx.lifecycle.LifecycleRegistry
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import androidx.test.core.app.ApplicationProvider
|
import androidx.test.core.app.ApplicationProvider
|
||||||
|
import coil.load
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import org.junit.Assert.assertEquals
|
import org.junit.Assert.assertEquals
|
||||||
import org.junit.Assert.assertNotNull
|
import org.junit.Assert.assertNotNull
|
||||||
|
import org.junit.Assert.assertNull
|
||||||
import org.junit.Assert.assertSame
|
import org.junit.Assert.assertSame
|
||||||
import org.junit.Assert.assertTrue
|
import org.junit.Assert.assertTrue
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
@@ -208,7 +212,7 @@ class BannerViewTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `배너 view는 preview image 속성을 image view에 적용한다`() {
|
fun `배너 view는 runtime에서 preview image 속성을 이미지로 표시하지 않는다`() {
|
||||||
val context = ApplicationProvider.getApplicationContext<Context>()
|
val context = ApplicationProvider.getApplicationContext<Context>()
|
||||||
val attrs = Robolectric.buildAttributeSet()
|
val attrs = Robolectric.buildAttributeSet()
|
||||||
.addAttribute(R.attr.bannerPreviewItemCount, "1")
|
.addAttribute(R.attr.bannerPreviewItemCount, "1")
|
||||||
@@ -223,7 +227,51 @@ class BannerViewTest {
|
|||||||
?: recyclerView.adapter!!.onCreateViewHolder(recyclerView, 0).also { recyclerView.adapter!!.onBindViewHolder(it, 0) }
|
?: recyclerView.adapter!!.onCreateViewHolder(recyclerView, 0).also { recyclerView.adapter!!.onBindViewHolder(it, 0) }
|
||||||
val imageView = holder.itemView.findViewById<ImageView>(R.id.iv_banner)
|
val imageView = holder.itemView.findViewById<ImageView>(R.id.iv_banner)
|
||||||
|
|
||||||
assertNotNull(imageView.drawable)
|
assertNull(imageView.drawable)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `배너 runtime은 preview 사전 할당 없이 실제 이미지 바인더를 호출한다`() {
|
||||||
|
val context = ApplicationProvider.getApplicationContext<Context>()
|
||||||
|
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<ImageView>(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<Context>()
|
||||||
|
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
|
@Test
|
||||||
|
|||||||
Reference in New Issue
Block a user