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 @@
-
-
+
+
-
-
-
-
-
-
-