app/build.gradle

@@ -40,8 +40,8 @@ android {
         applicationId "kr.co.vividnext.sodalive"
         minSdk 23
         targetSdk 33
-        versionCode 22
+        versionCode 20
-        versionName "1.6.0"
+        versionName "1.5.0"
     }
 
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -128,7 +128,6 @@
         <activity android:name=".audio_content.curation.AudioContentCurationActivity" />
         <activity android:name=".audio_content.all.AudioContentNewAllActivity" />
         <activity android:name=".audio_content.all.AudioContentRankingAllActivity" />
-        <activity android:name=".audio_content.all.by_theme.AudioContentAllByThemeActivity" />
         <activity android:name=".live.roulette.config.RouletteConfigActivity" />
 
         <activity

app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentApi.kt

@@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.audio_content
 
 import io.reactivex.rxjava3.core.Single
 import kr.co.vividnext.sodalive.audio_content.all.GetNewContentAllResponse
-import kr.co.vividnext.sodalive.audio_content.all.by_theme.GetContentByThemeResponse
 import kr.co.vividnext.sodalive.audio_content.comment.GetAudioContentCommentListResponse
 import kr.co.vividnext.sodalive.audio_content.comment.ModifyCommentRequest
 import kr.co.vividnext.sodalive.audio_content.comment.RegisterAudioContentCommentRequest
@@ -50,15 +49,6 @@ interface AudioContentApi {
         @Header("Authorization") authHeader: String
     ): Single<ApiResponse<List<GetAudioContentThemeResponse>>>
 
-    @GET("/audio-content/theme/{id}/content")
-    fun getAudioContentByTheme(
-        @Path("id") id: Long,
-        @Query("page") page: Int,
-        @Query("size") size: Int,
-        @Query("sort-type") sort: AudioContentViewModel.Sort,
-        @Header("Authorization") authHeader: String
-    ): Single<ApiResponse<GetContentByThemeResponse>>
-
     @POST("/audio-content")
     @Multipart
     fun uploadAudioContent(

app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentRepository.kt

@@ -206,18 +206,4 @@ class AudioContentRepository(
         creatorId: Long,
         token: String
     ) = categoryApi.getCategoryList(creatorId, authHeader = token)
-
-    fun getAudioContentByTheme(
-        themeId: Long,
-        page: Int,
-        size: Int,
-        sort: AudioContentViewModel.Sort = AudioContentViewModel.Sort.NEWEST,
-        token: String
-    ) = api.getAudioContentByTheme(
-        id = themeId,
-        page = page - 1,
-        size = size,
-        sort = sort,
-        authHeader = token
-    )
 }

app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt

@@ -90,7 +90,7 @@ class AudioContentNewAllActivity : BaseActivity<ActivityAudioContentNewAllBindin
 
     private fun setupNewContent() {
         newContentAdapter = AudioContentNewAllAdapter(
-            itemWidth = (screenWidth - 54f.dpToPx().toInt()) / 3,
+            itemWidth = (screenWidth - 40f.dpToPx().toInt()) / 2,
             onClickItem = {
                 startActivity(
                     Intent(this, AudioContentDetailActivity::class.java).apply {
@@ -107,7 +107,7 @@ class AudioContentNewAllActivity : BaseActivity<ActivityAudioContentNewAllBindin
             }
         )
 
-        binding.rvContent.layoutManager = GridLayoutManager(this, 3)
+        binding.rvContent.layoutManager = GridLayoutManager(this, 2)
 
         binding.rvContent.addItemDecoration(object : RecyclerView.ItemDecoration() {
             override fun getItemOffsets(
@@ -118,10 +118,31 @@ class AudioContentNewAllActivity : BaseActivity<ActivityAudioContentNewAllBindin
             ) {
                 super.getItemOffsets(outRect, view, parent, state)
 
+                val position = parent.getChildAdapterPosition(view)
+                if (position % 2 == 0) {
+                    outRect.left = 13.3f.dpToPx().toInt()
+                    outRect.right = 6.7f.dpToPx().toInt()
+                } else {
+                    outRect.left = 6.7f.dpToPx().toInt()
+                    outRect.right = 13.3f.dpToPx().toInt()
+                }
+
+                when (position) {
+                    0, 1 -> {
+                        outRect.top = 13.3f.dpToPx().toInt()
+                        outRect.bottom = 6.7f.dpToPx().toInt()
+                    }
+
+                    newContentAdapter.itemCount - 1, newContentAdapter.itemCount - 2 -> {
+                        outRect.top = 6.7f.dpToPx().toInt()
+                        outRect.bottom = 13.3f.dpToPx().toInt()
+                    }
+
+                    else -> {
                         outRect.top = 6.7f.dpToPx().toInt()
                         outRect.bottom = 6.7f.dpToPx().toInt()
-                outRect.left = 6.7f.dpToPx().toInt()
+                    }
-                outRect.right = 6.7f.dpToPx().toInt()
+                }
             }
         })
 

app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllAdapter.kt

@@ -2,14 +2,12 @@ package kr.co.vividnext.sodalive.audio_content.all
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import coil.transform.CircleCropTransformation
 import coil.transform.RoundedCornersTransformation
-import com.orhanobut.logger.Logger
 import kr.co.vividnext.sodalive.R
 import kr.co.vividnext.sodalive.audio_content.main.GetAudioContentMainItem
 import kr.co.vividnext.sodalive.databinding.ItemAudioContentNewAllBinding
@@ -27,7 +25,6 @@ class AudioContentNewAllAdapter(
         private val onClickCreator: (Long) -> Unit
     ) : RecyclerView.ViewHolder(binding.root) {
         fun bind(item: GetAudioContentMainItem) {
-            Logger.e("item: $item")
             binding.ivAudioContentCoverImage.load(item.coverImageUrl) {
                 crossfade(true)
                 placeholder(R.drawable.ic_place_holder)
@@ -50,16 +47,6 @@ class AudioContentNewAllAdapter(
             binding.tvAudioContentTitle.text = item.title
             binding.tvAudioContentCreatorNickname.text = item.creatorNickname
 
-            if (item.price > 0) {
-                binding.ivCan.visibility = View.VISIBLE
-                binding.tvCan.text = "${item.price}"
-            } else {
-                binding.ivCan.visibility = View.GONE
-                binding.tvCan.text = "무료"
-            }
-
-            binding.tvTime.text = item.duration
-
             binding.ivAudioContentCreator.setOnClickListener { onClickCreator(item.creatorId) }
             binding.root.setOnClickListener { onClickItem(item.contentId) }
         }

app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeActivity.kt

@@ -1,191 +0,0 @@
-package kr.co.vividnext.sodalive.audio_content.all.by_theme
-
-import android.content.Intent
-import android.graphics.Rect
-import android.os.Bundle
-import android.view.View
-import android.widget.TextView
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import kr.co.vividnext.sodalive.R
-import kr.co.vividnext.sodalive.audio_content.AudioContentViewModel
-import kr.co.vividnext.sodalive.audio_content.all.AudioContentNewAllAdapter
-import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
-import kr.co.vividnext.sodalive.base.BaseActivity
-import kr.co.vividnext.sodalive.common.Constants
-import kr.co.vividnext.sodalive.common.LoadingDialog
-import kr.co.vividnext.sodalive.databinding.ActivityAudioContentAllByThemeBinding
-import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
-import kr.co.vividnext.sodalive.extensions.dpToPx
-import org.koin.android.ext.android.inject
-
-class AudioContentAllByThemeActivity : BaseActivity<ActivityAudioContentAllByThemeBinding>(
-    ActivityAudioContentAllByThemeBinding::inflate
-) {
-    private val viewModel: AudioContentAllByThemeViewModel by inject()
-
-    private lateinit var loadingDialog: LoadingDialog
-    private lateinit var adapter: AudioContentNewAllAdapter
-
-    private var themeId: Long = 0
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        themeId = intent.getLongExtra(Constants.EXTRA_THEME_ID, 0)
-
-        if (themeId <= 0) {
-            Toast.makeText(
-                applicationContext,
-                "잘못된 요청입니다.\n다시 시도해 주세요.",
-                Toast.LENGTH_LONG
-            ).show()
-
-            finish()
-        }
-
-        super.onCreate(savedInstanceState)
-
-        bindData()
-        viewModel.getContentList(themeId = themeId)
-    }
-
-    override fun setupView() {
-        loadingDialog = LoadingDialog(this, layoutInflater)
-        binding.toolbar.tvBack.setOnClickListener { finish() }
-
-        adapter = AudioContentNewAllAdapter(
-            itemWidth = (screenWidth - 54f.dpToPx().toInt()) / 3,
-            onClickItem = {
-                startActivity(
-                    Intent(this, AudioContentDetailActivity::class.java).apply {
-                        putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it)
-                    }
-                )
-            },
-            onClickCreator = {
-                startActivity(
-                    Intent(this, UserProfileActivity::class.java).apply {
-                        putExtra(Constants.EXTRA_USER_ID, it)
-                    }
-                )
-            }
-        )
-
-        binding.rvContentAll.layoutManager = GridLayoutManager(this, 3)
-
-        binding.rvContentAll.addItemDecoration(object : RecyclerView.ItemDecoration() {
-            override fun getItemOffsets(
-                outRect: Rect,
-                view: View,
-                parent: RecyclerView,
-                state: RecyclerView.State
-            ) {
-                super.getItemOffsets(outRect, view, parent, state)
-
-                outRect.top = 6.7f.dpToPx().toInt()
-                outRect.bottom = 6.7f.dpToPx().toInt()
-                outRect.left = 6.7f.dpToPx().toInt()
-                outRect.right = 6.7f.dpToPx().toInt()
-            }
-        })
-
-        binding.rvContentAll.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                super.onScrolled(recyclerView, dx, dy)
-
-                val lastVisibleItemPosition = (recyclerView.layoutManager as LinearLayoutManager?)!!
-                    .findLastCompletelyVisibleItemPosition()
-                val itemTotalCount = recyclerView.adapter!!.itemCount - 1
-
-                // 스크롤이 끝에 도달했는지 확인
-                if (!recyclerView.canScrollVertically(1) &&
-                    lastVisibleItemPosition == itemTotalCount
-                ) {
-                    viewModel.getContentList(themeId = themeId)
-                }
-            }
-        })
-
-        binding.rvContentAll.adapter = adapter
-
-        binding.tvSortNewest.setOnClickListener {
-            viewModel.changeSort(AudioContentViewModel.Sort.NEWEST)
-        }
-
-        binding.tvSortPriceLow.setOnClickListener {
-            viewModel.changeSort(AudioContentViewModel.Sort.PRICE_LOW)
-        }
-
-        binding.tvSortPriceHigh.setOnClickListener {
-            viewModel.changeSort(AudioContentViewModel.Sort.PRICE_HIGH)
-        }
-    }
-
-    private fun bindData() {
-        viewModel.toastLiveData.observe(this) {
-            it?.let { Toast.makeText(applicationContext, it, Toast.LENGTH_LONG).show() }
-        }
-
-        viewModel.isLoading.observe(this) {
-            if (it) {
-                loadingDialog.show(screenWidth, "")
-            } else {
-                loadingDialog.dismiss()
-            }
-        }
-
-        viewModel.contentListLiveData.observe(this) {
-            if (viewModel.page - 1 == 1) {
-                adapter.clear()
-                binding.rvContentAll.scrollToPosition(0)
-            }
-
-            binding.tvTotalCount.text = "${it.totalCount}"
-            binding.toolbar.tvBack.text = it.theme
-            adapter.addItems(it.items)
-        }
-
-        viewModel.sort.observe(this) {
-            deselectSort()
-            selectSort(
-                when (it) {
-                    AudioContentViewModel.Sort.PRICE_HIGH -> {
-                        binding.tvSortPriceHigh
-                    }
-
-                    AudioContentViewModel.Sort.PRICE_LOW -> {
-                        binding.tvSortPriceLow
-                    }
-
-                    else -> {
-                        binding.tvSortNewest
-                    }
-                }
-            )
-
-            viewModel.getContentList(themeId = themeId)
-        }
-    }
-
-    private fun deselectSort() {
-        val color = ContextCompat.getColor(
-            applicationContext,
-            R.color.color_88e2e2e2
-        )
-
-        binding.tvSortNewest.setTextColor(color)
-        binding.tvSortPriceLow.setTextColor(color)
-        binding.tvSortPriceHigh.setTextColor(color)
-    }
-
-    private fun selectSort(view: TextView) {
-        view.setTextColor(
-            ContextCompat.getColor(
-                applicationContext,
-                R.color.color_e2e2e2
-            )
-        )
-    }
-}

app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeViewModel.kt

@@ -1,86 +0,0 @@
-package kr.co.vividnext.sodalive.audio_content.all.by_theme
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import com.orhanobut.logger.Logger
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.schedulers.Schedulers
-import kr.co.vividnext.sodalive.audio_content.AudioContentRepository
-import kr.co.vividnext.sodalive.audio_content.AudioContentViewModel
-import kr.co.vividnext.sodalive.base.BaseViewModel
-import kr.co.vividnext.sodalive.common.SharedPreferenceManager
-
-class AudioContentAllByThemeViewModel(
-    private val repository: AudioContentRepository
-) : BaseViewModel() {
-    private val _toastLiveData = MutableLiveData<String?>()
-    val toastLiveData: LiveData<String?>
-        get() = _toastLiveData
-
-    private var _isLoading = MutableLiveData(false)
-    val isLoading: LiveData<Boolean>
-        get() = _isLoading
-
-    private var _contentListLiveData = MutableLiveData<GetContentByThemeResponse>()
-    val contentListLiveData: LiveData<GetContentByThemeResponse>
-        get() = _contentListLiveData
-
-    private val _sort = MutableLiveData(AudioContentViewModel.Sort.NEWEST)
-    val sort: LiveData<AudioContentViewModel.Sort>
-        get() = _sort
-
-    private var isLast = false
-    var page = 1
-    private val size = 15
-
-    fun getContentList(themeId: Long) {
-        if (!_isLoading.value!! && !isLast) {
-            _isLoading.value = true
-
-            compositeDisposable.add(
-                repository.getAudioContentByTheme(
-                    themeId = themeId,
-                    page = page,
-                    size = size,
-                    sort = _sort.value!!,
-                    token = "Bearer ${SharedPreferenceManager.token}"
-                )
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(
-                        {
-                            if (it.success && it.data != null) {
-                                if (it.data.items.isNotEmpty()) {
-                                    page += 1
-                                    _contentListLiveData.postValue(it.data!!)
-                                } else {
-                                    isLast = true
-                                }
-                            } else {
-                                if (it.message != null) {
-                                    _toastLiveData.postValue(it.message)
-                                } else {
-                                    _toastLiveData.postValue(
-                                        "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
-                                    )
-                                }
-                            }
-
-                            _isLoading.value = false
-                        },
-                        {
-                            _isLoading.value = false
-                            it.message?.let { message -> Logger.e(message) }
-                            _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
-                        }
-                    )
-            )
-        }
-    }
-
-    fun changeSort(sort: AudioContentViewModel.Sort) {
-        page = 1
-        isLast = false
-        _sort.postValue(sort)
-    }
-}

app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/GetContentByThemeResponse.kt

@@ -1,10 +0,0 @@
-package kr.co.vividnext.sodalive.audio_content.all.by_theme
-
-import com.google.gson.annotations.SerializedName
-import kr.co.vividnext.sodalive.audio_content.main.GetAudioContentMainItem
-
-data class GetContentByThemeResponse(
-    @SerializedName("theme") val theme: String,
-    @SerializedName("totalCount") val totalCount: Int,
-    @SerializedName("items") val items: List<GetAudioContentMainItem>
-)

app/src/main/java/kr/co/vividnext/sodalive/audio_content/curation/AudioContentCurationActivity.kt

@@ -55,7 +55,7 @@ class AudioContentCurationActivity : BaseActivity<ActivityAudioContentCurationBi
         binding.toolbar.tvBack.setOnClickListener { finish() }
 
         adapter = AudioContentNewAllAdapter(
-            itemWidth = (screenWidth - 54f.dpToPx().toInt()) / 3,
+            itemWidth = (screenWidth - 40f.dpToPx().toInt()) / 2,
             onClickItem = {
                 startActivity(
                     Intent(this, AudioContentDetailActivity::class.java).apply {
@@ -72,7 +72,7 @@ class AudioContentCurationActivity : BaseActivity<ActivityAudioContentCurationBi
             }
         )
 
-        binding.rvCuration.layoutManager = GridLayoutManager(this, 3)
+        binding.rvCuration.layoutManager = GridLayoutManager(this, 2)
 
         binding.rvCuration.addItemDecoration(object : RecyclerView.ItemDecoration() {
             override fun getItemOffsets(
@@ -83,10 +83,31 @@ class AudioContentCurationActivity : BaseActivity<ActivityAudioContentCurationBi
             ) {
                 super.getItemOffsets(outRect, view, parent, state)
 
+                val position = parent.getChildAdapterPosition(view)
+                if (position % 2 == 0) {
+                    outRect.left = 13.3f.dpToPx().toInt()
+                    outRect.right = 6.7f.dpToPx().toInt()
+                } else {
+                    outRect.left = 6.7f.dpToPx().toInt()
+                    outRect.right = 13.3f.dpToPx().toInt()
+                }
+
+                when (position) {
+                    0, 1 -> {
+                        outRect.top = 13.3f.dpToPx().toInt()
+                        outRect.bottom = 6.7f.dpToPx().toInt()
+                    }
+
+                    adapter.itemCount - 1, adapter.itemCount - 2 -> {
+                        outRect.top = 6.7f.dpToPx().toInt()
+                        outRect.bottom = 13.3f.dpToPx().toInt()
+                    }
+
+                    else -> {
                         outRect.top = 6.7f.dpToPx().toInt()
                         outRect.bottom = 6.7f.dpToPx().toInt()
-                outRect.left = 6.7f.dpToPx().toInt()
+                    }
-                outRect.right = 6.7f.dpToPx().toInt()
+                }
             }
         })
 

app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt

@@ -20,7 +20,6 @@ import com.zhpan.indicator.enums.IndicatorStyle
 import kr.co.vividnext.sodalive.R
 import kr.co.vividnext.sodalive.audio_content.all.AudioContentNewAllActivity
 import kr.co.vividnext.sodalive.audio_content.all.AudioContentRankingAllActivity
-import kr.co.vividnext.sodalive.audio_content.all.by_theme.AudioContentAllByThemeActivity
 import kr.co.vividnext.sodalive.audio_content.curation.AudioContentCurationActivity
 import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
 import kr.co.vividnext.sodalive.audio_content.main.banner.AudioContentMainBannerAdapter
@@ -117,22 +116,6 @@ class AudioContentMainFragment : BaseFragment<FragmentAudioContentMainBinding>(
             contentRankingViewModel.getContentRankingSortType()
             newContentCreatorViewModel.getNewContentUploadCreatorList()
         }
-
-        binding.llShortPlay.setOnClickListener {
-            startActivity(
-                Intent(requireContext(), AudioContentAllByThemeActivity::class.java).apply {
-                    putExtra(Constants.EXTRA_THEME_ID, 11L)
-                }
-            )
-        }
-
-        binding.llReviewLive.setOnClickListener {
-            startActivity(
-                Intent(requireContext(), AudioContentAllByThemeActivity::class.java).apply {
-                    putExtra(Constants.EXTRA_THEME_ID, 7L)
-                }
-            )
-        }
     }
 
     private fun setupNewContentCreator() {

app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/GetAudioContentMainResponse.kt

@@ -15,9 +15,7 @@ data class GetAudioContentMainItem(
     @SerializedName("title") val title: String,
     @SerializedName("creatorId") val creatorId: Long,
     @SerializedName("creatorProfileImageUrl") val creatorProfileImageUrl: String,
-    @SerializedName("creatorNickname") val creatorNickname: String,
+    @SerializedName("creatorNickname") val creatorNickname: String
-    @SerializedName("price") val price: Int,
-    @SerializedName("duration") val duration: String
 )
 
 data class GetAudioContentRanking(

app/src/main/java/kr/co/vividnext/sodalive/common/Constants.kt

@@ -23,7 +23,6 @@ object Constants {
     const val EXTRA_NOTICE = "extra_notice"
     const val EXTRA_ROOM_ID = "extra_room_id"
     const val EXTRA_USER_ID = "extra_user_id"
-    const val EXTRA_THEME_ID = "extra_theme_id"
     const val EXTRA_NICKNAME = "extra_nickname"
     const val EXTRA_MESSAGE_ID = "extra_message_id"
     const val EXTRA_ROOM_DETAIL = "extra_room_detail"

app/src/main/java/kr/co/vividnext/sodalive/di/AppDI.kt

@@ -9,7 +9,6 @@ import kr.co.vividnext.sodalive.audio_content.AudioContentViewModel
 import kr.co.vividnext.sodalive.audio_content.PlaybackTrackingRepository
 import kr.co.vividnext.sodalive.audio_content.all.AudioContentNewAllViewModel
 import kr.co.vividnext.sodalive.audio_content.all.AudioContentRankingAllViewModel
-import kr.co.vividnext.sodalive.audio_content.all.by_theme.AudioContentAllByThemeViewModel
 import kr.co.vividnext.sodalive.audio_content.category.CategoryApi
 import kr.co.vividnext.sodalive.audio_content.comment.AudioContentCommentListViewModel
 import kr.co.vividnext.sodalive.audio_content.comment.AudioContentCommentReplyViewModel
@@ -221,7 +220,6 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
         viewModel { UserProfileDonationAllViewModel(get(), get()) }
         viewModel { AudioContentCurationViewModel(get()) }
         viewModel { AudioContentNewAllViewModel(get()) }
-        viewModel { AudioContentAllByThemeViewModel(get()) }
         viewModel { AudioContentRankingAllViewModel(get()) }
         viewModel { RouletteSettingsViewModel(get()) }
         viewModel { CreatorCommunityAllViewModel(get(), get()) }

app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt

@@ -192,6 +192,7 @@ class LiveRoomViewModel(
                     {
                         if (it.success && it.data != null) {
                             roomInfoResponse = it.data
+                            Logger.e("data: ${it.data}")
                             _roomInfoLiveData.postValue(roomInfoResponse)
 
                             if (_coverImageUrlLiveData.value!! != roomInfoResponse.coverImageUrl) {

app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailAdapter.kt

@@ -1,50 +0,0 @@
-package kr.co.vividnext.sodalive.live.room.detail
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import coil.load
-import coil.transform.RoundedCornersTransformation
-import kr.co.vividnext.sodalive.R
-import kr.co.vividnext.sodalive.databinding.ItemLiveRoomDetailUserBinding
-import kr.co.vividnext.sodalive.extensions.dpToPx
-
-class LiveRoomDetailAdapter(
-    private val onClick: (GetRoomDetailUser) -> Unit
-) : RecyclerView.Adapter<LiveRoomDetailAdapter.ViewHolder>() {
-
-    val items = mutableListOf<GetRoomDetailUser>()
-
-    inner class ViewHolder(
-        private val binding: ItemLiveRoomDetailUserBinding
-    ) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(item: GetRoomDetailUser) {
-            binding.tvNickname.text = item.nickname
-            binding.ivProfile.load(item.profileImageUrl) {
-                crossfade(true)
-                placeholder(R.drawable.ic_place_holder)
-                transformations(RoundedCornersTransformation(23.4f.dpToPx()))
-            }
-            binding.root.setOnClickListener { onClick(item) }
-        }
-    }
-
-    override fun onCreateViewHolder(
-        parent: ViewGroup,
-        viewType: Int
-    ): ViewHolder {
-        return ViewHolder(
-            ItemLiveRoomDetailUserBinding.inflate(
-                LayoutInflater.from(parent.context),
-                parent,
-                false
-            )
-        )
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.bind(items[position])
-    }
-
-    override fun getItemCount() = items.count()
-}

app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt

@@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.live.room.detail
 
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.graphics.Rect
 import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,13 +9,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.webkit.URLUtil
 import android.widget.FrameLayout
-import android.widget.LinearLayout
 import android.widget.Toast
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import coil.transform.CircleCropTransformation
-import coil.transform.RoundedCornersTransformation
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kr.co.vividnext.sodalive.R
@@ -24,10 +19,8 @@ import kr.co.vividnext.sodalive.common.Constants
 import kr.co.vividnext.sodalive.common.LoadingDialog
 import kr.co.vividnext.sodalive.common.SharedPreferenceManager
 import kr.co.vividnext.sodalive.databinding.FragmentLiveRoomDetailBinding
-import kr.co.vividnext.sodalive.databinding.ItemLiveDetailUserSummaryBinding
 import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
 import kr.co.vividnext.sodalive.extensions.convertDateFormat
-import kr.co.vividnext.sodalive.extensions.dpToPx
 import org.koin.android.ext.android.inject
 import java.util.Locale
 
@@ -43,9 +36,7 @@ class LiveRoomDetailFragment(
     private val viewModel: LiveRoomDetailViewModel by inject()
 
     private lateinit var binding: FragmentLiveRoomDetailBinding
-    private var isAllProfileOpen = false
 
-    private lateinit var adapter: LiveRoomDetailAdapter
     private lateinit var loadingDialog: LoadingDialog
     private lateinit var roomDetail: GetRoomDetailResponse
 
@@ -68,33 +59,11 @@ class LiveRoomDetailFragment(
         val behavior = BottomSheetBehavior.from<View>(bottomSheet!!)
         behavior.state = BottomSheetBehavior.STATE_EXPANDED
 
-        setupAdapter()
         bindData()
         binding.ivClose.setOnClickListener { dismiss() }
         viewModel.getDetail(roomId) { dismiss() }
     }
 
-    private fun setupAdapter() {
-        val recyclerView = binding.rvParticipate
-        adapter = LiveRoomDetailAdapter {}
-
-        recyclerView.layoutManager = GridLayoutManager(requireContext(), 5)
-        recyclerView.addItemDecoration(object : RecyclerView.ItemDecoration() {
-            override fun getItemOffsets(
-                outRect: Rect,
-                view: View,
-                parent: RecyclerView,
-                state: RecyclerView.State
-            ) {
-                super.getItemOffsets(outRect, view, parent, state)
-
-                outRect.top = 13.3f.dpToPx().toInt()
-                outRect.bottom = 13.3f.dpToPx().toInt()
-            }
-        })
-        recyclerView.adapter = adapter
-    }
-
     private fun bindData() {
         viewModel.isLoading.observe(viewLifecycleOwner) {
             if (it) {
@@ -156,7 +125,6 @@ class LiveRoomDetailFragment(
         binding.ivShare2.setOnClickListener { shareRoom(response) }
 
         if (response.channelName.isNullOrBlank()) {
-            binding.tvParticipateExpression.text = "예약자"
             when {
                 response.manager.id == SharedPreferenceManager.userId -> {
                     binding.llStartDelete.visibility = View.VISIBLE
@@ -205,52 +173,6 @@ class LiveRoomDetailFragment(
             }
             binding.llStartDelete.visibility = View.GONE
         }
-
-        if (response.manager.id == SharedPreferenceManager.userId) {
-            setParticipantUserSummary(response.participatingUsers)
-
-            binding.llParticipateWrapper.visibility = View.VISIBLE
-            binding.tvParticipate.text = response.numberOfParticipants.toString()
-            binding.tvTotal.text = "/${response.numberOfParticipantsTotal}"
-
-            binding.tvOpenAllProfile.visibility = if (response.numberOfParticipants <= 0) {
-                View.GONE
-            } else {
-                View.VISIBLE
-            }
-
-            binding.tvOpenAllProfile.setOnClickListener {
-                isAllProfileOpen = !isAllProfileOpen
-                if (isAllProfileOpen) {
-                    binding.llProfiles.visibility = View.GONE
-                    binding.rvParticipate.visibility = View.VISIBLE
-                    binding.tvParticipateExpression.visibility = View.VISIBLE
-                    binding.tvOpenAllProfile.text = "닫기"
-                    binding.tvOpenAllProfile.setCompoundDrawablesWithIntrinsicBounds(
-                        R.drawable.ic_live_detail_top,
-                        0,
-                        0,
-                        0
-                    )
-                } else {
-                    binding.llProfiles.visibility = View.VISIBLE
-                    binding.rvParticipate.visibility = View.GONE
-                    binding.tvParticipateExpression.visibility = View.GONE
-                    binding.tvOpenAllProfile.text = "펼쳐보기"
-                    binding.tvOpenAllProfile.setCompoundDrawablesWithIntrinsicBounds(
-                        R.drawable.ic_live_detail_bottom,
-                        0,
-                        0,
-                        0
-                    )
-                }
-            }
-
-            adapter.items.addAll(response.participatingUsers)
-            adapter.notifyDataSetChanged()
-        } else {
-            binding.llParticipateWrapper.visibility = View.GONE
-        }
     }
 
     private fun setManagerProfile(manager: GetRoomDetailManager) {
@@ -322,32 +244,6 @@ class LiveRoomDetailFragment(
         }
     }
 
-    private fun setParticipantUserSummary(participatingUsers: List<GetRoomDetailUser>) {
-        val userCount = if (participatingUsers.size > 10) {
-            10
-        } else {
-            participatingUsers.size
-        }
-
-        for (index in 0 until userCount) {
-            val user = participatingUsers[index]
-            val itemView = ItemLiveDetailUserSummaryBinding.inflate(layoutInflater)
-            itemView.ivProfile.load(user.profileImageUrl) {
-                crossfade(true)
-                placeholder(R.drawable.ic_place_holder)
-                transformations(RoundedCornersTransformation(16.7f.dpToPx()))
-            }
-
-            val lp = LinearLayout.LayoutParams(33.3f.dpToPx().toInt(), 33.3f.dpToPx().toInt())
-            if (index > 0) {
-                lp.setMargins(-16.7f.dpToPx().toInt(), 0, 0, 0)
-            }
-            itemView.root.layoutParams = lp
-
-            binding.llProfiles.addView(itemView.root)
-        }
-    }
-
     private fun shareRoom(response: GetRoomDetailResponse) {
         viewModel.shareRoomLink(
             response.roomId,

app/src/main/res/drawable/bg_round_corner_10_b3333333.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_b3333333" />
-    <corners android:radius="10dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/color_b3333333" />
-</shape>

app/src/main/res/drawable/bg_round_corner_2_6_ecf9ff.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_ecf9ff" />
-    <corners android:radius="2.6dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/color_ecf9ff" />
-</shape>

app/src/main/res/drawable/bg_round_corner_2_6_ffecf7.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_ffecf7" />
-    <corners android:radius="2.6dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/color_ffecf7" />
-</shape>

app/src/main/res/layout/activity_audio_content_all_by_theme.xml

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:orientation="vertical">
-
-    <include
-        android:id="@+id/toolbar"
-        layout="@layout/detail_toolbar" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="13.3dp"
-        android:background="@color/color_161616"
-        android:gravity="end"
-        android:orientation="horizontal"
-        android:paddingHorizontal="20dp"
-        android:paddingVertical="13.3dp">
-
-        <TextView
-            android:id="@+id/tv_sort_newest"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/gmarket_sans_medium"
-            android:gravity="center"
-            android:text="최신순"
-            android:textColor="@color/color_88e2e2e2"
-            android:textSize="13.3sp" />
-
-        <TextView
-            android:id="@+id/tv_sort_price_high"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="13.3dp"
-            android:fontFamily="@font/gmarket_sans_medium"
-            android:gravity="center"
-            android:text="높은 가격순"
-            android:textColor="@color/color_88e2e2e2"
-            android:textSize="13.3sp" />
-
-        <TextView
-            android:id="@+id/tv_sort_price_low"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/gmarket_sans_medium"
-            android:gravity="center"
-            android:text="낮은 가격순"
-            android:textColor="@color/color_88e2e2e2"
-            android:textSize="13.3sp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingHorizontal="20dp"
-        android:paddingVertical="13.3dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/gmarket_sans_medium"
-            android:gravity="center"
-            android:text="전체"
-            android:textColor="@color/color_e2e2e2"
-            android:textSize="13.3sp" />
-
-        <TextView
-            android:id="@+id/tv_total_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:fontFamily="@font/gmarket_sans_medium"
-            android:gravity="center"
-            android:text="0"
-            android:textColor="@color/color_ff5c49"
-            android:textSize="13.3sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:fontFamily="@font/gmarket_sans_medium"
-            android:gravity="center"
-            android:text="개"
-            android:textColor="@color/color_e2e2e2"
-            android:textSize="13.3sp" />
-    </LinearLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_content_all"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false" />
-</LinearLayout>

app/src/main/res/layout/activity_audio_content_curation.xml

@@ -95,4 +95,5 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false" />
+
 </LinearLayout>

app/src/main/res/layout/fragment_audio_content_main.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -53,78 +51,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:layout_marginTop="6.7dp"
-                    android:layout_marginBottom="26.7dp" />
+                    android:layout_marginBottom="40dp" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="40dp"
-                    android:paddingHorizontal="13.3dp"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:id="@+id/ll_short_play"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@drawable/bg_round_corner_2_6_ffecf7"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:paddingVertical="10dp">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:drawablePadding="2.7dp"
-                            android:fontFamily="@font/gmarket_sans_bold"
-                            android:text="숏플"
-                            android:textColor="@color/color_dd158d"
-                            android:textSize="14.7sp"
-                            app:drawableStartCompat="@drawable/ic_short_play" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="2.7dp"
-                            android:fontFamily="@font/gmarket_sans_light"
-                            android:text="짧지만 꼴릿한 이야기"
-                            android:textColor="@color/color_dd158d"
-                            android:textSize="10sp"
-                            tools:ignore="SmallSp" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/ll_review_live"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@drawable/bg_round_corner_2_6_ecf9ff"
-                        android:layout_marginStart="8dp"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:paddingVertical="10dp">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:drawablePadding="2.7dp"
-                            android:fontFamily="@font/gmarket_sans_bold"
-                            android:text="라이브 다시듣기"
-                            android:textColor="@color/color_0057ff"
-                            android:textSize="14.7sp"
-                            app:drawableStartCompat="@drawable/ic_thumb_play_blue" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="2.7dp"
-                            android:fontFamily="@font/gmarket_sans_light"
-                            android:text="놓쳤던 라이브 다시 듣기"
-                            android:textColor="@color/color_0057ff"
-                            android:textSize="10sp"
-                            tools:ignore="SmallSp" />
-                    </LinearLayout>
-                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/ll_my_stash"

app/src/main/res/layout/fragment_live_room_detail.xml

@@ -91,102 +91,6 @@
                     tools:text="300" />
             </RelativeLayout>
 
-            <LinearLayout
-                android:id="@+id/ll_participate_wrapper"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone">
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="8dp"
-                    android:background="@color/color_88909090" />
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="13.3dp"
-                    android:layout_marginTop="16.7dp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/rl_date_and_can">
-
-                    <TextView
-                        android:id="@+id/tv_participate_expression"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:fontFamily="@font/gmarket_sans_medium"
-                        android:gravity="center_vertical"
-                        android:text="참여자"
-                        android:textColor="@color/color_eeeeee"
-                        android:textSize="12sp"
-                        android:visibility="gone" />
-
-                    <LinearLayout
-                        android:id="@+id/ll_profiles"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentStart="true"
-                        android:layout_centerVertical="true"
-                        android:layout_marginEnd="23.7dp"
-                        android:layout_toStartOf="@+id/ll_participate"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal" />
-
-                    <LinearLayout
-                        android:id="@+id/ll_participate"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
-                        android:gravity="center">
-
-                        <TextView
-                            android:id="@+id/tv_participate"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:fontFamily="@font/gmarket_sans_medium"
-                            android:textColor="@color/color_9970ff"
-                            android:textSize="12sp"
-                            tools:text="14" />
-
-                        <TextView
-                            android:id="@+id/tv_total"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:fontFamily="@font/gmarket_sans_medium"
-                            android:textColor="@color/color_bbbbbb"
-                            android:textSize="12sp"
-                            tools:text="/20" />
-                    </LinearLayout>
-                </RelativeLayout>
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rv_participate"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="13.3dp"
-                    android:layout_marginTop="13.3dp"
-                    android:visibility="gone" />
-
-                <TextView
-                    android:id="@+id/tv_open_all_profile"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="13.3dp"
-                    android:drawablePadding="6.7dp"
-                    android:fontFamily="@font/gmarket_sans_medium"
-                    android:gravity="center"
-                    android:text="펼쳐보기"
-                    android:textColor="@color/color_bbbbbb"
-                    android:textSize="12sp"
-                    app:drawableStartCompat="@drawable/ic_live_detail_bottom" />
-            </LinearLayout>
-
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"

app/src/main/res/layout/item_audio_content_new_all.xml

@@ -13,68 +13,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="2.7dp"
-        android:layout_marginBottom="2.7dp"
-        android:background="@drawable/bg_round_corner_10_b3333333"
-        android:orientation="horizontal"
-        android:padding="3dp"
-        android:gravity="center"
-        app:layout_constraintBottom_toBottomOf="@+id/iv_audio_content_cover_image"
-        app:layout_constraintStart_toStartOf="@+id/iv_audio_content_cover_image">
-
-        <ImageView
-            android:id="@+id/iv_can"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@null"
-            android:src="@drawable/ic_card_can_gray" />
-
-        <TextView
-            android:id="@+id/tv_can"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:fontFamily="@font/gmarket_sans_medium"
-            android:textColor="@color/white"
-            android:textSize="8.3sp"
-            tools:ignore="SmallSp"
-            tools:text="300" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="2.7dp"
-        android:layout_marginBottom="2.7dp"
-        android:background="@drawable/bg_round_corner_10_b3333333"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:padding="3dp"
-        app:layout_constraintBottom_toBottomOf="@+id/iv_audio_content_cover_image"
-        app:layout_constraintEnd_toEndOf="@+id/iv_audio_content_cover_image">
-
-        <ImageView
-            android:id="@+id/iv_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@null"
-            android:src="@drawable/ic_card_time_small_gray" />
-
-        <TextView
-            android:id="@+id/tv_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:fontFamily="@font/gmarket_sans_medium"
-            android:textColor="@color/white"
-            android:textSize="8.3sp"
-            tools:ignore="SmallSp"
-            tools:text="00:00:30" />
-    </LinearLayout>
-
     <TextView
         android:id="@+id/tv_audio_content_title"
         android:layout_width="0dp"
@@ -82,7 +20,7 @@
         android:layout_marginTop="8dp"
         android:ellipsize="end"
         android:fontFamily="@font/gmarket_sans_medium"
-        android:maxLines="1"
+        android:maxLines="2"
         android:textColor="@color/color_d2d2d2"
         android:textSize="13.3sp"
         app:layout_constraintEnd_toEndOf="@+id/iv_audio_content_cover_image"

app/src/main/res/layout/item_live_detail_user_summary.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/iv_profile"
-    android:layout_width="33.3dp"
-    android:layout_height="33.3dp"
-    android:contentDescription="@null"
-    tools:src="@mipmap/ic_launcher" />

app/src/main/res/layout/item_live_room_detail_user.xml

@@ -20,7 +20,6 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:fontFamily="@font/gmarket_sans_medium"
-        android:layout_marginTop="8dp"
         android:lines="1"
         android:textColor="@color/color_bbbbbb"
         android:textSize="12sp"

app/src/main/res/values/colors.xml

@@ -37,7 +37,6 @@
     <color name="color_ccc25264">#CCC25264</color>
 
     <color name="color_b3909090">#B3909090</color>
-    <color name="color_b3333333">#B3333333</color>
     <color name="color_88909090">#88909090</color>
     <color name="color_339970ff">#339970FF</color>
     <color name="color_7fe2e2e2">#7FE2E2E2</color>
@@ -109,8 +108,4 @@
     <color name="color_553bb9f1">#553bb9f1</color>
     <color name="color_ea3a25">#EA3A25</color>
     <color name="color_cc004462">#CC004462</color>
-    <color name="color_dd158d">#DD158D</color>
-    <color name="color_0057ff">#0057FF</color>
-    <color name="color_ffecf7">#FFECF7</color>
-    <color name="color_ecf9ff">#ECF9FF</color>
 </resources>