fix(creator): 채널의 기본 프로필 이미지를 제거한다
This commit is contained in:
+1
-4
@@ -299,10 +299,7 @@ class CreatorChannelActivity :
|
||||
R.string.creator_channel_follower_count,
|
||||
header.followerCount.moneyFormat()
|
||||
)
|
||||
binding.ivHeaderImage.loadUrl(header.profileImageUrl) {
|
||||
placeholder(R.drawable.ic_placeholder_profile)
|
||||
error(R.drawable.ic_placeholder_profile)
|
||||
}
|
||||
binding.ivHeaderImage.loadUrl(header.profileImageUrl)
|
||||
updateActionButtonLayout(
|
||||
isChatVisible = !header.isOwner && header.isAiChatAvailable && header.characterId != null,
|
||||
isDmVisible = header.isOwner || header.isDmAvailable,
|
||||
|
||||
-2
@@ -169,7 +169,6 @@ class CreatorChannelCommunityDetailActivity : BaseActivity<ActivityCreatorChanne
|
||||
val post = content.post
|
||||
ivCreatorChannelCommunityDetailProfile.loadUrl(post.creatorProfileUrl) {
|
||||
crossfade(true)
|
||||
placeholder(R.drawable.bg_placeholder)
|
||||
transformations(CircleCropTransformation())
|
||||
}
|
||||
tvCreatorChannelCommunityDetailNickname.text = post.creatorNickname
|
||||
@@ -207,7 +206,6 @@ class CreatorChannelCommunityDetailActivity : BaseActivity<ActivityCreatorChanne
|
||||
if (post.imageUrl != null) {
|
||||
Glide.with(ivCreatorChannelCommunityDetailImage)
|
||||
.load(post.imageUrl)
|
||||
.placeholder(R.drawable.ic_place_holder)
|
||||
.listener(object : RequestListener<Drawable> {
|
||||
override fun onLoadFailed(
|
||||
e: GlideException?,
|
||||
|
||||
-2
@@ -6,7 +6,6 @@ import android.view.ViewGroup
|
||||
import androidx.core.view.isVisible
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import coil.transform.CircleCropTransformation
|
||||
import kr.co.vividnext.sodalive.R
|
||||
import kr.co.vividnext.sodalive.common.formatUtcRelativeTimeText
|
||||
import kr.co.vividnext.sodalive.databinding.ItemCreatorChannelCommunityReplyBinding
|
||||
import kr.co.vividnext.sodalive.extensions.loadUrl
|
||||
@@ -48,7 +47,6 @@ class CreatorChannelCommunityReplyAdapter(
|
||||
fun bind(item: CreatorChannelCommunityReplyUiModel) = with(binding) {
|
||||
ivCreatorChannelCommunityReplyItemProfile.loadUrl(item.memberProfileUrl) {
|
||||
crossfade(true)
|
||||
placeholder(R.drawable.bg_placeholder)
|
||||
transformations(CircleCropTransformation())
|
||||
}
|
||||
tvCreatorChannelCommunityReplyItemNickname.text = item.memberNickname
|
||||
|
||||
-2
@@ -6,7 +6,6 @@ import android.view.ViewGroup
|
||||
import androidx.core.view.isVisible
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import coil.transform.CircleCropTransformation
|
||||
import kr.co.vividnext.sodalive.R
|
||||
import kr.co.vividnext.sodalive.common.formatUtcRelativeTimeText
|
||||
import kr.co.vividnext.sodalive.databinding.ItemCreatorChannelCommunityCommentBinding
|
||||
import kr.co.vividnext.sodalive.extensions.loadUrl
|
||||
@@ -67,7 +66,6 @@ class CreatorChannelCommunityCommentAdapter(
|
||||
) = with(binding) {
|
||||
ivCreatorChannelCommunityCommentProfile.loadUrl(item.memberProfileUrl) {
|
||||
crossfade(true)
|
||||
placeholder(R.drawable.bg_placeholder)
|
||||
transformations(CircleCropTransformation())
|
||||
}
|
||||
tvCreatorChannelCommunityCommentNickname.text = item.memberNickname
|
||||
|
||||
-2
@@ -7,7 +7,6 @@ import androidx.recyclerview.widget.RecyclerView
|
||||
import com.bumptech.glide.Glide
|
||||
import com.bumptech.glide.load.resource.bitmap.CenterCrop
|
||||
import com.bumptech.glide.request.RequestOptions
|
||||
import kr.co.vividnext.sodalive.R
|
||||
import kr.co.vividnext.sodalive.databinding.ItemCreatorChannelCommunityGridBinding
|
||||
import kr.co.vividnext.sodalive.extensions.moneyFormat
|
||||
import kr.co.vividnext.sodalive.v2.creator.channel.community.model.CreatorChannelCommunityImageMode
|
||||
@@ -65,7 +64,6 @@ class CreatorChannelCommunityGridAdapter(
|
||||
Glide.with(ivCreatorChannelCommunityGridImage)
|
||||
.asBitmap()
|
||||
.load(visibleImageUrl)
|
||||
.placeholder(R.drawable.ic_place_holder)
|
||||
.apply(communityImageRequestOptions())
|
||||
.into(ivCreatorChannelCommunityGridImage)
|
||||
} else {
|
||||
|
||||
-3
@@ -14,7 +14,6 @@ import com.bumptech.glide.load.DataSource
|
||||
import com.bumptech.glide.load.engine.GlideException
|
||||
import com.bumptech.glide.request.RequestListener
|
||||
import com.bumptech.glide.request.target.Target
|
||||
import kr.co.vividnext.sodalive.R
|
||||
import kr.co.vividnext.sodalive.common.formatUtcRelativeTimeText
|
||||
import kr.co.vividnext.sodalive.databinding.ItemCreatorChannelCommunityListBinding
|
||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||
@@ -65,7 +64,6 @@ class CreatorChannelCommunityListAdapter(
|
||||
root.setOnClickListener { onPostClick(item) }
|
||||
ivCreatorChannelCommunityListProfile.loadUrl(item.creatorProfileUrl) {
|
||||
crossfade(true)
|
||||
placeholder(R.drawable.bg_placeholder)
|
||||
transformations(CircleCropTransformation())
|
||||
}
|
||||
tvCreatorChannelCommunityListNickname.text = item.creatorNickname
|
||||
@@ -89,7 +87,6 @@ class CreatorChannelCommunityListAdapter(
|
||||
if (visibleImageUrl != null) {
|
||||
Glide.with(ivCreatorChannelCommunityListImage)
|
||||
.load(visibleImageUrl)
|
||||
.placeholder(R.drawable.ic_place_holder)
|
||||
.listener(object : RequestListener<Drawable> {
|
||||
override fun onLoadFailed(
|
||||
e: GlideException?,
|
||||
|
||||
-3
@@ -4,7 +4,6 @@ import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import coil.transform.CircleCropTransformation
|
||||
import kr.co.vividnext.sodalive.R
|
||||
import kr.co.vividnext.sodalive.databinding.ItemCreatorChannelDonationRankingMemberBinding
|
||||
import kr.co.vividnext.sodalive.extensions.loadUrl
|
||||
import kr.co.vividnext.sodalive.v2.creator.channel.donation.model.CreatorChannelDonationRankingUiModel
|
||||
@@ -37,8 +36,6 @@ class CreatorChannelDonationRankingAdapter : RecyclerView.Adapter<CreatorChannel
|
||||
fun bind(item: CreatorChannelDonationRankingUiModel) = with(binding) {
|
||||
ivCreatorChannelDonationRankingProfile.loadUrl(item.profileImageUrl) {
|
||||
crossfade(true)
|
||||
placeholder(R.drawable.ic_placeholder_profile)
|
||||
error(R.drawable.ic_placeholder_profile)
|
||||
transformations(CircleCropTransformation())
|
||||
}
|
||||
tvCreatorChannelDonationRankingRank.text = item.rank.toString()
|
||||
|
||||
-2
@@ -222,8 +222,6 @@ class CreatorChannelFanTalkDetailActivity : BaseActivity<ActivityCreatorChannelF
|
||||
private fun ImageView.loadProfile(url: String) {
|
||||
loadUrl(url) {
|
||||
crossfade(true)
|
||||
placeholder(R.drawable.ic_placeholder_profile)
|
||||
error(R.drawable.ic_placeholder_profile)
|
||||
transformations(CircleCropTransformation())
|
||||
}
|
||||
}
|
||||
|
||||
-2
@@ -95,8 +95,6 @@ class CreatorChannelFanTalkAdapter(
|
||||
private fun android.widget.ImageView.loadProfile(url: String) {
|
||||
loadUrl(url) {
|
||||
crossfade(true)
|
||||
placeholder(R.drawable.ic_placeholder_profile)
|
||||
error(R.drawable.ic_placeholder_profile)
|
||||
transformations(CircleCropTransformation())
|
||||
}
|
||||
}
|
||||
|
||||
-2
@@ -27,8 +27,6 @@ internal fun bindCreatorChannelDonationCard(
|
||||
headerView.setBackgroundColor(context.getColor(headerColorResId))
|
||||
profileView.loadUrl(profileImageUrl) {
|
||||
crossfade(true)
|
||||
placeholder(R.drawable.ic_placeholder_profile)
|
||||
error(R.drawable.ic_placeholder_profile)
|
||||
transformations(CircleCropTransformation())
|
||||
}
|
||||
nicknameView.text = nickname
|
||||
|
||||
+3
-4
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.widget.ImageView
|
||||
import coil.dispose
|
||||
import android.widget.LinearLayout
|
||||
import android.widget.TextView
|
||||
import androidx.annotation.ColorRes
|
||||
@@ -242,7 +243,6 @@ class CreatorChannelHomeSectionAdapter(
|
||||
marginEnd = if (index == visibleNotices.lastIndex) 0 else 4.dp()
|
||||
}
|
||||
row.findViewById<ImageView>(R.id.iv_notice_profile).loadUrl(notice.creatorProfileUrl) {
|
||||
placeholder(R.drawable.ic_placeholder_profile)
|
||||
transformations(CircleCropTransformation())
|
||||
}
|
||||
row.findViewById<TextView>(R.id.tv_notice_creator_name).text = notice.creatorNickname
|
||||
@@ -420,19 +420,18 @@ class CreatorChannelHomeSectionAdapter(
|
||||
if (fanTalk != null) {
|
||||
fanTalkContent?.text = fanTalk.content
|
||||
fanTalkProfile?.loadUrl(fanTalk.profileImageUrl) {
|
||||
placeholder(R.drawable.ic_placeholder_profile)
|
||||
transformations(CircleCropTransformation())
|
||||
}
|
||||
} else {
|
||||
fanTalkContent?.text = ""
|
||||
fanTalkProfile?.setImageResource(R.drawable.ic_placeholder_profile)
|
||||
fanTalkProfile?.dispose()
|
||||
fanTalkProfile?.setImageDrawable(null)
|
||||
}
|
||||
}
|
||||
|
||||
private fun bindCommunityImages(row: View, community: CreatorChannelCommunityPostResponse) {
|
||||
val communityRow = row as FeedCommunityView
|
||||
communityRow.profileImageView().loadUrl(community.creatorProfileUrl) {
|
||||
placeholder(R.drawable.ic_placeholder_profile)
|
||||
transformations(CircleCropTransformation())
|
||||
}
|
||||
val isCommunityLocked = community.price > 0 && !community.existOrdered
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
android:layout_height="42dp"
|
||||
android:contentDescription="@null"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_placeholder_profile"
|
||||
tools:src="@drawable/ic_placeholder_profile" />
|
||||
|
||||
<LinearLayout
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
android:layout_height="0dp"
|
||||
android:contentDescription="@null"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_placeholder_profile"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
android:layout_height="42dp"
|
||||
android:contentDescription="@null"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_placeholder_profile"
|
||||
tools:src="@drawable/ic_placeholder_profile" />
|
||||
|
||||
<LinearLayout
|
||||
|
||||
@@ -60,8 +60,7 @@
|
||||
android:layout_width="28dp"
|
||||
android:layout_height="28dp"
|
||||
android:contentDescription="@null"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_placeholder_profile" />
|
||||
android:scaleType="centerCrop" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_fantalk_content"
|
||||
|
||||
@@ -45,7 +45,6 @@
|
||||
android:layout_height="42dp"
|
||||
android:contentDescription="@null"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_placeholder_profile"
|
||||
tools:src="@drawable/ic_placeholder_profile" />
|
||||
|
||||
<LinearLayout
|
||||
|
||||
+2
-1
@@ -2192,7 +2192,8 @@ class CreatorChannelActivitySourceTest {
|
||||
assertTrue(adapter.contains("fanTalkContent?.text = fanTalk.content"))
|
||||
assertTrue(adapter.contains("fanTalkProfile?.loadUrl(fanTalk.profileImageUrl)"))
|
||||
assertTrue(adapter.contains("fanTalkContent?.text = \"\""))
|
||||
assertTrue(adapter.contains("fanTalkProfile?.setImageResource(R.drawable.ic_placeholder_profile)"))
|
||||
assertTrue(adapter.contains("fanTalkProfile?.dispose()"))
|
||||
assertTrue(adapter.contains("fanTalkProfile?.setImageDrawable(null)"))
|
||||
assertFalse(adapter.contains("private fun addCommentCard"))
|
||||
assertFalse(adapter.contains("addCommentCard("))
|
||||
}
|
||||
|
||||
+3
-1
@@ -156,7 +156,9 @@ class CreatorChannelFanTalkFragmentLayoutTest {
|
||||
assertTrue(adapter.contains("fun submitItems(items: List<CreatorChannelFanTalkUiModel>)"))
|
||||
assertTrue(adapter.contains("notifyDataSetChanged()"))
|
||||
assertTrue(adapter.contains("CircleCropTransformation()"))
|
||||
assertTrue(adapter.contains("R.drawable.ic_placeholder_profile"))
|
||||
assertTrue(adapter.contains("loadUrl(url)"))
|
||||
assertFalse(adapter.contains("placeholder("))
|
||||
assertFalse(adapter.contains("error(R.drawable"))
|
||||
assertTrue(adapter.contains("CreatorChannelFanTalkRightAction.Report"))
|
||||
assertTrue(adapter.contains("CreatorChannelFanTalkRightAction.OwnerMore"))
|
||||
assertTrue(adapter.contains("private val onItemClick: (CreatorChannelFanTalkUiModel) -> Unit"))
|
||||
|
||||
@@ -0,0 +1,164 @@
|
||||
package kr.co.vividnext.sodalive.v2.gift.ui
|
||||
|
||||
import android.app.Activity
|
||||
import android.app.Application
|
||||
import android.graphics.Color
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.net.Uri
|
||||
import android.os.Looper
|
||||
import android.widget.FrameLayout
|
||||
import android.widget.ImageView
|
||||
import coil.Coil
|
||||
import coil.EventListener
|
||||
import coil.ImageLoader
|
||||
import coil.decode.DataSource
|
||||
import coil.fetch.DrawableResult
|
||||
import coil.fetch.Fetcher
|
||||
import coil.load
|
||||
import coil.request.ImageRequest
|
||||
import kotlinx.coroutines.CompletableDeferred
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kr.co.vividnext.sodalive.R
|
||||
import kr.co.vividnext.sodalive.common.ToastMessage
|
||||
import kr.co.vividnext.sodalive.databinding.ItemGiftInboxReceivedBinding
|
||||
import kr.co.vividnext.sodalive.databinding.ItemGiftInboxSentBinding
|
||||
import kr.co.vividnext.sodalive.v2.gift.GiftInboxCardUiModel
|
||||
import kr.co.vividnext.sodalive.v2.gift.GiftInboxDirection
|
||||
import kr.co.vividnext.sodalive.v2.gift.GiftInboxRow
|
||||
import org.junit.After
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertNotNull
|
||||
import org.junit.Assert.assertNull
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.Robolectric
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.Shadows.shadowOf
|
||||
import org.robolectric.annotation.Config
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [28], application = Application::class)
|
||||
class GiftInboxAdapterTest {
|
||||
private lateinit var activity: Activity
|
||||
private lateinit var loader: ImageLoader
|
||||
private val requests = mutableListOf<ImageRequest>()
|
||||
private val delayedFetch = CompletableDeferred<Unit>()
|
||||
|
||||
@Before
|
||||
fun setUp() {
|
||||
activity = Robolectric.buildActivity(Activity::class.java).setup().visible().get()
|
||||
loader = ImageLoader.Builder(activity)
|
||||
.dispatcher(Dispatchers.Unconfined)
|
||||
.components {
|
||||
add(
|
||||
Fetcher.Factory<Uri> { data, _, _ ->
|
||||
if (data.scheme != "https") {
|
||||
null
|
||||
} else {
|
||||
Fetcher {
|
||||
if (data.lastPathSegment == "delayed") delayedFetch.await()
|
||||
DrawableResult(ColorDrawable(Color.GREEN), false, DataSource.NETWORK)
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
.eventListenerFactory {
|
||||
object : EventListener {
|
||||
override fun onStart(request: ImageRequest) {
|
||||
requests += request
|
||||
}
|
||||
}
|
||||
}
|
||||
.build()
|
||||
Coil.setImageLoader(loader)
|
||||
}
|
||||
|
||||
@After
|
||||
fun tearDown() {
|
||||
activity.finish()
|
||||
Coil.reset()
|
||||
loader.shutdown()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `보낸 선물은 실제 URL 이미지만 요청하고 표시한다`() = verifyUrl(GiftInboxDirection.SENT)
|
||||
|
||||
@Test
|
||||
fun `받은 선물은 실제 URL 이미지만 요청하고 표시한다`() = verifyUrl(GiftInboxDirection.RECEIVED)
|
||||
|
||||
@Test
|
||||
fun `보낸 선물의 빈 source는 재사용 요청과 그림을 비운다`() = verifyEmptySource(GiftInboxDirection.SENT)
|
||||
|
||||
@Test
|
||||
fun `받은 선물의 빈 source는 재사용 요청과 그림을 비운다`() = verifyEmptySource(GiftInboxDirection.RECEIVED)
|
||||
|
||||
private fun verifyUrl(direction: GiftInboxDirection) {
|
||||
val (adapter, holder, image) = holder(direction)
|
||||
bind(adapter, holder, direction, "https://example.com/profile")
|
||||
shadowOf(Looper.getMainLooper()).idle()
|
||||
|
||||
val request = requests.single()
|
||||
assertEquals("https://example.com/profile", request.data)
|
||||
assertNull(request.placeholder)
|
||||
assertNull(request.error)
|
||||
assertNull(request.fallback)
|
||||
assertNotNull(image.drawable)
|
||||
}
|
||||
|
||||
private fun verifyEmptySource(direction: GiftInboxDirection) {
|
||||
val (adapter, holder, image) = holder(direction)
|
||||
listOf(null, "", " ").forEach { source ->
|
||||
val previous = image.load("https://example.com/delayed", loader)
|
||||
image.setImageDrawable(ColorDrawable(Color.RED))
|
||||
requests.clear()
|
||||
|
||||
bind(adapter, holder, direction, source)
|
||||
|
||||
assertTrue(previous.isDisposed)
|
||||
assertNull(image.drawable)
|
||||
assertTrue(requests.isEmpty())
|
||||
}
|
||||
delayedFetch.complete(Unit)
|
||||
shadowOf(Looper.getMainLooper()).idle()
|
||||
assertNull(image.drawable)
|
||||
}
|
||||
|
||||
private fun holder(direction: GiftInboxDirection): Triple<GiftInboxAdapter, GiftInboxAdapter.Holder, ImageView> {
|
||||
val adapter = GiftInboxAdapter({}, {}, {})
|
||||
adapter.submitList(listOf(GiftInboxRow.Card(card(direction, null))))
|
||||
val holder = adapter.onCreateViewHolder(FrameLayout(activity), adapter.getItemViewType(0))
|
||||
val image = when (val binding = holder.binding) {
|
||||
is ItemGiftInboxSentBinding -> binding.counterpartProfileImage
|
||||
is ItemGiftInboxReceivedBinding -> binding.counterpartProfileImage
|
||||
else -> error("선물 카드 바인딩 필요")
|
||||
}
|
||||
activity.setContentView(holder.itemView)
|
||||
image.layout(0, 0, 64, 64)
|
||||
return Triple(adapter, holder, image)
|
||||
}
|
||||
|
||||
private fun bind(adapter: GiftInboxAdapter, holder: GiftInboxAdapter.Holder, direction: GiftInboxDirection, source: String?) {
|
||||
adapter.submitList(null)
|
||||
adapter.submitList(listOf(GiftInboxRow.Card(card(direction, source))))
|
||||
adapter.onBindViewHolder(holder, 0)
|
||||
}
|
||||
|
||||
private fun card(direction: GiftInboxDirection, source: String?) = GiftInboxCardUiModel(
|
||||
applicationNo = "gift-1",
|
||||
direction = direction,
|
||||
status = ToastMessage(message = "신청"),
|
||||
subtitleRes = null,
|
||||
createdDate = "2026.10.28",
|
||||
dateLabelRes = R.string.gift_inbox_applied_date,
|
||||
sizeName = "small",
|
||||
categoryName = "gift",
|
||||
addressRequired = false,
|
||||
addressDeadlineDays = null,
|
||||
counterpartMemberId = 1L,
|
||||
counterpartNickname = "creator",
|
||||
counterpartProfileImageUrl = source
|
||||
)
|
||||
}
|
||||
Reference in New Issue
Block a user