From 3a541f71a6ac0b6072c99b18c019f6cc4b26fc85 Mon Sep 17 00:00:00 2001 From: klaus Date: Tue, 16 Jan 2024 05:31:23 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=83=81?= =?UTF-8?q?=EB=8B=A8=20UI=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/room/LiveRoomActivity.kt | 51 ++-- .../sodalive/live/room/chat/LiveRoomChat.kt | 4 +- .../profile/LiveRoomProfileListAdapter.kt | 15 +- .../res/drawable-xxhdpi/btn_plus_round.png | Bin 1038 -> 2805 bytes .../drawable-xxhdpi/btn_select_checked.png | Bin 544 -> 1553 bytes ...6f3dec_9970ff.xml => bg_circle_3bb9f1.xml} | 4 +- ...f.xml => bg_round_corner_3_3_553bb9f1.xml} | 4 +- ...g_round_corner_5_3_transparent_3bb9f1.xml} | 2 +- ...bg_round_corner_5_3_transparent_bbbbbb.xml | 8 + ...g_round_corner_5_3_transparent_ff5c49.xml} | 2 +- .../main/res/layout/activity_live_room.xml | 242 ++++++++---------- .../res/layout/item_live_room_profile.xml | 24 +- app/src/main/res/values/colors.xml | 1 + 13 files changed, 149 insertions(+), 208 deletions(-) rename app/src/main/res/drawable/{bg_circle_6f3dec_9970ff.xml => bg_circle_3bb9f1.xml} (70%) rename app/src/main/res/drawable/{bg_round_corner_3_3_999970ff.xml => bg_round_corner_3_3_553bb9f1.xml} (65%) rename app/src/main/res/drawable/{bg_round_corner_13_3_transparent_3bb9f1.xml => bg_round_corner_5_3_transparent_3bb9f1.xml} (86%) create mode 100644 app/src/main/res/drawable/bg_round_corner_5_3_transparent_bbbbbb.xml rename app/src/main/res/drawable/{bg_round_corner_13_3_transparent_ff5c49.xml => bg_round_corner_5_3_transparent_ff5c49.xml} (86%) 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.AdaptersYWw9)6>)6y#Lod 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 Hu0mjfC`3*T literal 1038 zcmV+p1o8WcP)Px#Hc(7dMVWB_nQ;G_asQcc|A%7Yd0EbkW$Z_AOq6T- zkZALoaQ~Tb|Cw?Bn{xk}a{r=z|DAUKnQ;FvS+#Ni000qmQchDc>vfzqIyC??GqucF zI7kc{+r)*{000A7Nklw3c=2!>UxYdz#}|2I1mlPHOx$yR>#dAhwtkxxMJ z)3zyiucCP$rj9=s4VnihrLz{IS-X4&KRriI%1H};5QPmMtaNI6f*d0cyr^055UJx$ z zibsMQ#7!F1ky05awtFQ!s7{#z}EFspW!{dSxN--t@?k$C zV?rX?ppxh8C7nKtY+!LaGpoquD?=pYDsBLjY?$RgtFmE8*;pm`n&gGJnX0%MTHMx) z;u@bnNN`xMv&v>ZzbMkBdnyh7cAagdfsp@q>23wgwaj{48ti2jTMTY)ZpC1$fH{gm zu4LVIGnK5ZGRq$&D_2XG3!kR1pi+nGYqFMe^ZoW@U!xz?NlR~vpSwoi8 zER~|&N)ZiTp-aiQCMDp8k7!G8wNmG{lvw(WhVR-u$Fv;&(w0_Q{Q4lGyLqk-BI@Ik z&K92-m&6dwPX`gsQllqld;GlmIK%w`89RVr2V~zE<9%b;xSY=$BT>;a61_LLRb7MI zZ;Y4Ij<$#3{>~8m8>9NhgMxVUppd@%=VuT8ab|pueDZ|!3o%@NMK`@xGynhq07*qo IM6N<$g2{Q@Q2+n{ diff --git a/app/src/main/res/drawable-xxhdpi/btn_select_checked.png b/app/src/main/res/drawable-xxhdpi/btn_select_checked.png index ee6d977913f11d5f4c7772c1afeb61770e2f4c27..167a0fbfab3848083f53da686d1148295d32e91f 100644 GIT binary patch delta 1547 zcmV+m2K4!$1d$Ao8Gi-<0027t*>V5?010qNS#tmY3ljhU3ljkVnw%H_0004VQb$4n zuFf3k00004XF*Lt006O%3;baP000H1NkltysCDm4zJ3u)5l z?{ox5l6RyCmtecKBg#RnB{_(tRB3Lv7t26a2y!+!mb@{cgx{Ttp3$HtpnM?YTh-o9 zM?wjkpnry;yg=^UBm}Uyu=IS&q$(%EIls8=e2fbdN}gPnB$Tq%hOO?NQj1We)CCYa z4pl&11;XV04S2Xl;1J>r>;=idtP)0qGf<=)tWt3K?HcHNy$X6>Jpf~^wQ!`)ajzCP zYQXB{sn{>08;X!a+pU@P@qeWJRiSClJF$SBc^gD_lw}WArSG7MmN54Yxwl# zN`J0q0N0k*-P{}F*3f#EAJ2W8ysz9=_|4(2E$CKE$n@^_w80zWd+miHe=efk^quI4@ z&q11={h*;;-UfEJnS+EX1RgW_z<;}p_}4YDHoW<+0)OzvhyLK^B|=R zTy{$F5+)s=bu%p-E;BSM(^9J`t1jQ1ZqUVQa>GEA_w< zgYSZPG2IfTv;zRMUBM9~?diQakMOvp9-Td1|4q7`wj&;a10Vrx9!ih-+kYLwe!HEv z!jfZGRO)uF8$~;fng&^o_i?5JGLC79G!GDziuB*vEIr(J5Km4Z(onqBThjD7p74Il zlf|WbIdL;O%;{&J)9?9+6`%sEFqrK_A&xIxR_TFK1N_A%C?t|AXgxUF5gc{)H5XWG zLI5tX_*uw*X>$feVUwuG&3_{RIbEzQWHUj1y}jJYZ*fZ$iH34{y2ZQ4cn}8wG34cW zxA8=D2Tw~ysyZ5~TWRWcDZe`~9h02lfwxgFpHlO!8p;Battx1?mQ*M_DiiO7z;n^q xxc4|NzKAvZLAan5ECfg|87na3*Q0pP0GlDV2LY2okpKVy07*qoLzW|C(_BnQ;G_a{rri|Cw?BnsNV{aQ~fk|C(|CnQ{M_aR2}R|K{BP zxSRi}hX0>=|Mv3#$g=;{#Q&_%%b@@O01R|ePE!C$rr&fwpnvqm6SGF(QGC+?00C!7 zL_t(Y$EBCql7k=+MO_GsUPPn+|E(dJI5Q|qL*JKFEKUJUuU!|FnT6D&@*1@iv+2k( zLMsGPTG05%gs7%R8P!Ni=W#P2t08mvUZEh>r&s}kM4Xi%Nye_LL6p8T0)d!GA;dk8QE` zxn4bmX0Fw<)*cs=(Hvxb+8gX0Wv*buV`C;=`DEQSJY?&>@5t26thd-0EaHJ_4P|&+LORQOcz;Bi-m|PXm`0K=u>PqeQuN7Y z(zif@{{9@f>^&nzmslSdv5;Iy>^paBr1w5b`7;`mKlENKSn&k76xmM#Or&17uY}ag zOZu#G!z*;G63Z*@thR#J(C}I*UK7V_A6bnnvt{Nr>%1|6H=r;_Bj!+6F%G@}?lgvJ U7@V?o01E&B07*qoM6N<$f`q;TX#fBK diff --git a/app/src/main/res/drawable/bg_circle_6f3dec_9970ff.xml b/app/src/main/res/drawable/bg_circle_3bb9f1.xml similarity index 70% rename from app/src/main/res/drawable/bg_circle_6f3dec_9970ff.xml rename to app/src/main/res/drawable/bg_circle_3bb9f1.xml index bc0b8e4..0117705 100644 --- a/app/src/main/res/drawable/bg_circle_6f3dec_9970ff.xml +++ b/app/src/main/res/drawable/bg_circle_3bb9f1.xml @@ -3,7 +3,7 @@ android:shape="oval"> 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