diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt index aa25a89..38cc591 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt @@ -27,7 +27,6 @@ import androidx.activity.OnBackPressedCallback import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.widget.PopupMenu import androidx.core.content.ContextCompat -import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import coil.load @@ -111,7 +110,6 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB private var isSpeakerMute = false private var isMicrophoneMute = false private var isSpeaker = false - private var isSpeakerFold = false private var isNoChatting = false private var remainingNoChattingTime = noChattingTime @@ -456,31 +454,6 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB } binding.ivNotification.setOnClickListener { viewModel.toggleShowNotice() } binding.rlNotice.setOnClickListener { viewModel.toggleExpandNotice() } - binding.tvSpeakerFold.setOnClickListener { - isSpeakerFold = !isSpeakerFold - - if (isSpeakerFold) { - binding.rlSpeaker.visibility = View.VISIBLE - binding.rvSpeakers.visibility = View.VISIBLE - binding.tvSpeakerFold.text = "접기" - binding.tvSpeakerFold.setCompoundDrawablesWithIntrinsicBounds( - R.drawable.ic_live_detail_top, - 0, - 0, - 0 - ) - } else { - binding.rlSpeaker.visibility = View.GONE - binding.rvSpeakers.visibility = View.GONE - binding.tvSpeakerFold.text = "펼치기" - binding.tvSpeakerFold.setCompoundDrawablesWithIntrinsicBounds( - R.drawable.ic_live_detail_bottom, - 0, - 0, - 0 - ) - } - } binding.tvBgSwitch.setOnClickListener { viewModel.toggleBackgroundImage() } binding.llDonation.setOnClickListener { @@ -626,7 +599,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB ) ) binding.tvBgSwitch - .setBackgroundResource(R.drawable.bg_round_corner_13_3_transparent_3bb9f1) + .setBackgroundResource(R.drawable.bg_round_corner_5_3_transparent_3bb9f1) } else { binding.ivCover.visibility = View.GONE binding.tvBgSwitch.text = "배경 OFF" @@ -637,7 +610,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB ) ) binding.tvBgSwitch - .setBackgroundResource(R.drawable.bg_round_corner_13_3_transparent_bbbbbb) + .setBackgroundResource(R.drawable.bg_round_corner_5_3_transparent_bbbbbb) } } @@ -715,7 +688,11 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB } speakerListAdapter.managerId = response.creatorId - speakerListAdapter.updateList(response.speakerList) + speakerListAdapter.updateList( + response.speakerList.filter { + it.id != response.creatorId + } + ) if (response.creatorId == SharedPreferenceManager.userId) { binding.ivEdit.setOnClickListener { @@ -804,7 +781,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB if (response.creatorId != SharedPreferenceManager.userId) { binding.ivCreatorFollow.visibility = View.VISIBLE if (response.isFollowing) { - binding.ivCreatorFollow.setImageResource(R.drawable.btn_following) + binding.ivCreatorFollow.setImageResource(R.drawable.btn_select_checked) binding.ivCreatorFollow.setOnClickListener { viewModel.creatorUnFollow( creatorId = response.creatorId, @@ -812,7 +789,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB ) } } else { - binding.ivCreatorFollow.setImageResource(R.drawable.btn_follow) + binding.ivCreatorFollow.setImageResource(R.drawable.btn_plus_round) binding.ivCreatorFollow.setOnClickListener { viewModel.creatorFollow( creatorId = response.creatorId, @@ -999,7 +976,11 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB val rvSpeakers = binding.rvSpeakers speakerListAdapter = LiveRoomProfileListAdapter() - rvSpeakers.layoutManager = GridLayoutManager(applicationContext, 5) + rvSpeakers.layoutManager = LinearLayoutManager( + applicationContext, + LinearLayoutManager.HORIZONTAL, + false + ) rvSpeakers.addItemDecoration(object : RecyclerView.ItemDecoration() { override fun getItemOffsets( outRect: Rect, @@ -1009,8 +990,8 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB ) { super.getItemOffsets(outRect, view, parent, state) - outRect.top = 5f.dpToPx().toInt() - outRect.bottom = 5f.dpToPx().toInt() + outRect.left = 4f.dpToPx().toInt() + outRect.right = 4f.dpToPx().toInt() } }) rvSpeakers.adapter = speakerListAdapter diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt index 85c6199..f6f9340 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt @@ -188,7 +188,7 @@ data class LiveRoomNormalChat( } -1 -> { - itemBinding.ivBg.setImageResource(R.drawable.bg_circle_6f3dec_9970ff) + itemBinding.ivBg.setImageResource(R.drawable.bg_circle_3bb9f1) itemBinding.ivCrown.setImageResource(R.drawable.ic_crown) itemBinding.ivCrown.visibility = View.VISIBLE } @@ -227,7 +227,7 @@ data class LiveRoomNormalChat( ) if (SharedPreferenceManager.userId == userId) { - itemBinding.llMessageBg.setBackgroundResource(R.drawable.bg_round_corner_3_3_999970ff) + itemBinding.llMessageBg.setBackgroundResource(R.drawable.bg_round_corner_3_3_553bb9f1) } else { itemBinding.llMessageBg.setBackgroundResource(R.drawable.bg_round_corner_3_3_99000000) } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomProfileListAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomProfileListAdapter.kt index 67ff8e1..4c3ef01 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomProfileListAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomProfileListAdapter.kt @@ -5,8 +5,7 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import coil.load -import coil.transform.RoundedCornersTransformation +import coil.transform.CircleCropTransformation import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.databinding.ItemLiveRoomProfileBinding import kr.co.vividnext.sodalive.extensions.dpToPx @@ -21,7 +20,7 @@ class LiveRoomProfileListAdapter : RecyclerView.Adapter diff --git a/app/src/main/res/drawable/bg_round_corner_3_3_999970ff.xml b/app/src/main/res/drawable/bg_round_corner_3_3_553bb9f1.xml similarity index 65% rename from app/src/main/res/drawable/bg_round_corner_3_3_999970ff.xml rename to app/src/main/res/drawable/bg_round_corner_3_3_553bb9f1.xml index 540f1da..87dd946 100644 --- a/app/src/main/res/drawable/bg_round_corner_3_3_999970ff.xml +++ b/app/src/main/res/drawable/bg_round_corner_3_3_553bb9f1.xml @@ -1,8 +1,8 @@ - + + android:color="@color/color_553bb9f1" /> diff --git a/app/src/main/res/drawable/bg_round_corner_13_3_transparent_3bb9f1.xml b/app/src/main/res/drawable/bg_round_corner_5_3_transparent_3bb9f1.xml similarity index 86% rename from app/src/main/res/drawable/bg_round_corner_13_3_transparent_3bb9f1.xml rename to app/src/main/res/drawable/bg_round_corner_5_3_transparent_3bb9f1.xml index 3d601c8..8480ce0 100644 --- a/app/src/main/res/drawable/bg_round_corner_13_3_transparent_3bb9f1.xml +++ b/app/src/main/res/drawable/bg_round_corner_5_3_transparent_3bb9f1.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/drawable/bg_round_corner_5_3_transparent_bbbbbb.xml b/app/src/main/res/drawable/bg_round_corner_5_3_transparent_bbbbbb.xml new file mode 100644 index 0000000..0cb7723 --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_5_3_transparent_bbbbbb.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_round_corner_13_3_transparent_ff5c49.xml b/app/src/main/res/drawable/bg_round_corner_5_3_transparent_ff5c49.xml similarity index 86% rename from app/src/main/res/drawable/bg_round_corner_13_3_transparent_ff5c49.xml rename to app/src/main/res/drawable/bg_round_corner_5_3_transparent_ff5c49.xml index 0056003..b28ad63 100644 --- a/app/src/main/res/drawable/bg_round_corner_13_3_transparent_ff5c49.xml +++ b/app/src/main/res/drawable/bg_round_corner_5_3_transparent_ff5c49.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml index fb1d4d8..ef66372 100644 --- a/app/src/main/res/layout/activity_live_room.xml +++ b/app/src/main/res/layout/activity_live_room.xml @@ -63,10 +63,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentStart="true" - android:background="@drawable/bg_round_corner_13_3_transparent_ff5c49" + android:background="@drawable/bg_round_corner_5_3_transparent_ff5c49" android:fontFamily="@font/gmarket_sans_medium" - android:paddingHorizontal="11dp" - android:paddingVertical="7dp" + android:paddingHorizontal="8dp" + android:paddingVertical="4.7dp" android:text="나가기" android:textColor="@color/color_ff5c49" android:textSize="10sp" @@ -85,12 +85,12 @@ android:id="@+id/tv_bg_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="10dp" - android:background="@drawable/bg_round_corner_13_3_transparent_bbbbbb" + android:layout_marginEnd="5.3dp" + android:background="@drawable/bg_round_corner_5_3_transparent_bbbbbb" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:paddingHorizontal="11dp" - android:paddingVertical="7dp" + android:paddingHorizontal="8dp" + android:paddingVertical="4.7dp" android:text="배경 OFF" android:textColor="@color/color_eeeeee" android:textSize="10sp" @@ -100,110 +100,120 @@ android:id="@+id/iv_share" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="10dp" - android:background="@drawable/bg_round_corner_13_3_transparent_bbbbbb" + android:layout_marginEnd="5.3dp" + android:background="@drawable/bg_round_corner_5_3_transparent_bbbbbb" android:contentDescription="@null" - android:paddingHorizontal="11dp" - android:paddingVertical="5dp" + android:padding="2.7dp" android:src="@drawable/ic_share" /> - - - - - - - + android:layout_marginHorizontal="13.3dp" + android:layout_marginTop="8dp"> - + - + + + + + + + + + + + + + + + + + - - + android:clipToPadding="true" + android:orientation="horizontal" /> - - + android:layout_marginHorizontal="13.3dp" + android:layout_marginTop="8dp"> + android:orientation="horizontal" + tools:ignore="RelativeOverlap"> @@ -255,8 +268,7 @@ android:background="@drawable/bg_round_corner_15_transparent_bbbbbb" android:orientation="horizontal" android:paddingHorizontal="11dp" - android:paddingVertical="7dp" - android:visibility="gone" + android:paddingVertical="5.3dp" tools:ignore="RelativeOverlap"> + android:textSize="10.7sp" + tools:ignore="SmallSp" /> @@ -318,55 +331,8 @@ tools:text="jkljkljkljkljkljkljkl" /> - - - - - - - - - - - - - + android:layout_width="30dp" + android:layout_height="30dp"> @@ -32,15 +32,6 @@ android:layout_centerInParent="true" android:contentDescription="@null" android:src="@drawable/ic_mute" /> - - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 89d59a6..bddd804 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -105,4 +105,5 @@ #B38FFF #004B6C #003851 + #553bb9f1