From f0e841ffbe5a4df8101e10120d4f986c648a3dcc Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 21 Aug 2023 04:08:37 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20-=20=EC=A0=9C=EB=AA=A9=20=EC=99=BC=EC=AA=BD?= =?UTF-8?q?=EC=97=90=2019=EA=B8=88=20=ED=91=9C=EC=8B=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/room/LiveRoomActivity.kt | 2 +- .../live/room/detail/GetRoomDetailResponse.kt | 1 + .../room/detail/LiveRoomDetailFragment.kt | 6 ++++ .../layout/activity_audio_content_detail.xml | 2 +- .../main/res/layout/activity_can_payment.xml | 2 +- .../activity_live_reservation_complete.xml | 2 +- .../main/res/layout/activity_live_room.xml | 11 ++++--- app/src/main/res/layout/activity_login.xml | 2 +- .../res/layout/activity_notice_detail.xml | 2 +- .../main/res/layout/activity_user_profile.xml | 2 +- .../res/layout/fragment_live_room_detail.xml | 32 +++++++++++++++---- app/src/main/res/layout/item_notice.xml | 2 +- 12 files changed, 47 insertions(+), 19 deletions(-) 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 2ccc6e0..a058ccb 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 @@ -558,7 +558,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB } viewModel.roomInfoLiveData.observe(this) { response -> - binding.iv19.visibility = if (response.isAdult) { + binding.tv19.visibility = if (response.isAdult) { View.VISIBLE } else { View.GONE diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/GetRoomDetailResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/GetRoomDetailResponse.kt index 4161011..256c296 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/GetRoomDetailResponse.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/GetRoomDetailResponse.kt @@ -11,6 +11,7 @@ data class GetRoomDetailResponse( @SerializedName("title") val title: String, @SerializedName("notice") val notice: String, @SerializedName("isPaid") val isPaid: Boolean, + @SerializedName("isAdult") val isAdult: Boolean, @SerializedName("isPrivateRoom") val isPrivateRoom: Boolean, @SerializedName("password") val password: Int?, @SerializedName("tags") val tags: List, diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt index cb970f9..9e03632 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt @@ -84,6 +84,12 @@ class LiveRoomDetailFragment( @SuppressLint("SetTextI18n", "NotifyDataSetChanged") private fun setRoomDetail(response: GetRoomDetailResponse) { + binding.tv19.visibility = if (response.isAdult) { + View.VISIBLE + } else { + View.GONE + } + binding.tvTitle.text = response.title binding.tvDate.text = response.beginDateTime diff --git a/app/src/main/res/layout/activity_audio_content_detail.xml b/app/src/main/res/layout/activity_audio_content_detail.xml index c93a8f7..5b00db8 100644 --- a/app/src/main/res/layout/activity_audio_content_detail.xml +++ b/app/src/main/res/layout/activity_audio_content_detail.xml @@ -27,7 +27,7 @@ android:textSize="18.3sp" app:drawableStartCompat="@drawable/ic_back" tools:ignore="RelativeOverlap" - tools:text="바로, 상담 가능한 요즘친구" /> + tools:text="바로, 상담 가능한 크리에이터" /> diff --git a/app/src/main/res/layout/activity_live_reservation_complete.xml b/app/src/main/res/layout/activity_live_reservation_complete.xml index f4473c3..5fad73d 100644 --- a/app/src/main/res/layout/activity_live_reservation_complete.xml +++ b/app/src/main/res/layout/activity_live_reservation_complete.xml @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" android:lineSpacingExtra="5.3sp" - android:text="요즘친구" + android:text="크리에이터" android:textColor="@color/color_777777" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml index 83c9c34..cb5e5fe 100644 --- a/app/src/main/res/layout/activity_live_room.xml +++ b/app/src/main/res/layout/activity_live_room.xml @@ -127,13 +127,16 @@ android:layout_marginTop="10.7dp" android:orientation="horizontal"> - + tools:text="바로, 상담 가능한 크리에이터" /> + tools:text="소다라이브 App 오픈 관련 공지사항입니다." /> + tools:text="바로, 상담 가능한 크리에이터" /> - + android:orientation="horizontal"> + + + + + + tools:text="소다라이브 App 오픈 관련 공지사항입니다." />