From f4ca63af9d6020c5cde954a25ae6bef0d22f052e Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Wed, 22 Nov 2023 23:51:26 +0900
Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=9C=A0?=
 =?UTF-8?q?=EC=A0=80=20=ED=94=84=EB=A1=9C=ED=95=84=20=EB=8B=A4=EC=9D=B4?=
 =?UTF-8?q?=EC=96=BC=EB=A1=9C=EA=B7=B8=20-=20=ED=81=AC=EB=A6=AC=EC=97=90?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=EA=B0=80=20=EC=95=84=EB=8B=8C=20=EC=9D=BC?=
 =?UTF-8?q?=EB=B0=98=20=EC=9C=A0=EC=A0=80=EB=8A=94=20=ED=83=9C=EA=B7=B8=20?=
 =?UTF-8?q?=EC=98=81=EC=97=AD=EA=B3=BC=20=EC=86=8C=EA=B0=9C=20=EC=98=81?=
 =?UTF-8?q?=EC=97=AD=EC=9D=B4=20=EB=B3=B4=EC=9D=B4=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../room/profile/LiveRoomUserProfileDialog.kt | 39 +++++++-------
 .../layout/dialog_live_room_user_profile.xml  | 52 +++++--------------
 2 files changed, 35 insertions(+), 56 deletions(-)

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomUserProfileDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomUserProfileDialog.kt
index b5594bd..bc6e0e4 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomUserProfileDialog.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomUserProfileDialog.kt
@@ -83,12 +83,8 @@ class LiveRoomUserProfileDialog(
             }
 
             dialogView.tvNickname.text = userProfile.nickname
-            dialogView.tvTags.text = userProfile.tags
             dialogView.tvGender.text = userProfile.gender
-            dialogView.tvIntroduce.text = userProfile.introduce
-
             dialogView.ivClose.setOnClickListener { alertDialog.dismiss() }
-
             dialogView.tvIntroduce.setOnClickListener {
                 isIntroduceFold = !isIntroduceFold
 
@@ -162,25 +158,32 @@ class LiveRoomUserProfileDialog(
             }
 
             if (userProfile.isFollowing != null) {
-                dialogView.llFollow.visibility = View.VISIBLE
+                dialogView.ivFollow.visibility = View.VISIBLE
 
                 if (userProfile.isFollowing) {
-                    dialogView.tvFollow.text = "팔로잉"
-                    dialogView.ivFollow.setImageResource(R.drawable.ic_alarm_selected)
-                    dialogView.llFollow.setBackgroundResource(
-                        R.drawable.bg_round_corner_23_3_3e1b93_9970ff
-                    )
-                    dialogView.tvFollow.setOnClickListener { onClickUnFollow(userProfile.userId) }
+                    dialogView.ivFollow.setImageResource(R.drawable.btn_following)
+                    dialogView.ivFollow.setOnClickListener { onClickUnFollow(userProfile.userId) }
                 } else {
-                    dialogView.tvFollow.text = "팔로우"
-                    dialogView.ivFollow.setImageResource(R.drawable.ic_alarm)
-                    dialogView.llFollow.setBackgroundResource(
-                        R.drawable.bg_round_corner_23_3_transparent_9970ff
-                    )
-                    dialogView.tvFollow.setOnClickListener { onClickFollow(userProfile.userId) }
+                    dialogView.ivFollow.setImageResource(R.drawable.btn_follow)
+                    dialogView.ivFollow.setOnClickListener { onClickFollow(userProfile.userId) }
+                }
+
+                if (userProfile.tags.isNotBlank()) {
+                    dialogView.tvTags.text = userProfile.tags
+                    dialogView.tvTags.visibility = View.VISIBLE
+                } else {
+                    dialogView.tvTags.visibility = View.GONE
+                }
+
+                if (userProfile.introduce.isNotBlank()) {
+                    dialogView.tvIntroduce.text = userProfile.introduce
+                    dialogView.tvIntroduce.visibility = View.VISIBLE
+                } else {
+                    dialogView.tvIntroduce.visibility = View.GONE
                 }
             } else {
-                dialogView.llFollow.visibility = View.GONE
+                dialogView.ivFollow.visibility = View.GONE
+                dialogView.tvIntroduce.visibility = View.GONE
             }
 
             dialogView.ivMenu.setOnClickListener {
diff --git a/app/src/main/res/layout/dialog_live_room_user_profile.xml b/app/src/main/res/layout/dialog_live_room_user_profile.xml
index a1623da..e8b417d 100644
--- a/app/src/main/res/layout/dialog_live_room_user_profile.xml
+++ b/app/src/main/res/layout/dialog_live_room_user_profile.xml
@@ -2,15 +2,13 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:background="@drawable/bg_round_corner_8_222222"
+    android:paddingTop="13.3dp"
+    android:paddingBottom="20dp"
+    android:layout_gravity="center_vertical"
     android:orientation="vertical">
 
-    <FrameLayout
-        android:id="@+id/fl_ad"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
     <RelativeLayout
         android:id="@+id/rl_title"
         android:layout_width="match_parent"
@@ -77,6 +75,14 @@
                         android:textColor="@color/white"
                         android:textSize="11.3sp"
                         tools:text="여" />
+
+                    <ImageView
+                        android:id="@+id/iv_follow"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="13.3dp"
+                        android:contentDescription="@null"
+                        tools:src="@drawable/btn_follow" />
                 </LinearLayout>
 
                 <ImageView
@@ -90,37 +96,6 @@
                     android:src="@drawable/ic_seemore_vertical" />
             </RelativeLayout>
 
-            <LinearLayout
-                android:id="@+id/ll_follow"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="21.3dp"
-                android:background="@drawable/bg_round_corner_23_3_transparent_9970ff"
-                android:baselineAligned="false"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingVertical="7.3dp"
-                tools:ignore="UseCompoundDrawables">
-
-                <ImageView
-                    android:id="@+id/iv_follow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="4dp"
-                    android:contentDescription="@null"
-                    tools:src="@drawable/ic_alarm" />
-
-                <TextView
-                    android:id="@+id/tv_follow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="@font/gmarket_sans_bold"
-                    android:gravity="center"
-                    android:textColor="@color/white"
-                    android:textSize="12sp"
-                    tools:text="팔로우" />
-            </LinearLayout>
-
             <ImageView
                 android:id="@+id/iv_profile"
                 android:layout_width="wrap_content"
@@ -196,6 +171,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="21.3dp"
+                android:visibility="gone"
                 android:fontFamily="@font/gmarket_sans_medium"
                 android:textColor="@color/color_9970ff"
                 android:textSize="13.3sp"
@@ -206,8 +182,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="18.7dp"
-                android:layout_marginBottom="20dp"
                 android:ellipsize="end"
+                android:visibility="gone"
                 android:maxLines="2"
                 android:textColor="@color/color_909090"
                 android:textSize="12sp"