feat: 메인 라이브
- 예약 라이브 - 유료 라이브 금액 나오지 않던 버그 수정 - 팔로잉 채널 - 위치 커뮤니티와 지금 라이브 중 사이로 이동
This commit is contained in:
@@ -35,8 +35,8 @@ android {
|
|||||||
applicationId "kr.co.vividnext.sodalive"
|
applicationId "kr.co.vividnext.sodalive"
|
||||||
minSdk 23
|
minSdk 23
|
||||||
targetSdk 34
|
targetSdk 34
|
||||||
versionCode 177
|
versionCode 178
|
||||||
versionName "1.39.1"
|
versionName "1.40.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|||||||
@@ -100,17 +100,17 @@ class LiveReservationAdapter(
|
|||||||
binding.tvDay.text = dateMap["day"]
|
binding.tvDay.text = dateMap["day"]
|
||||||
|
|
||||||
if (item.isReservation) {
|
if (item.isReservation) {
|
||||||
binding.tvCan.visibility = View.GONE
|
binding.llCan.visibility = View.GONE
|
||||||
binding.tvFree.visibility = View.GONE
|
binding.tvFree.visibility = View.GONE
|
||||||
binding.tvCompleteReservation.visibility = View.VISIBLE
|
binding.tvCompleteReservation.visibility = View.VISIBLE
|
||||||
} else if (item.price <= 0) {
|
} else if (item.price <= 0) {
|
||||||
binding.tvCan.visibility = View.GONE
|
binding.llCan.visibility = View.GONE
|
||||||
binding.tvCompleteReservation.visibility = View.GONE
|
binding.tvCompleteReservation.visibility = View.GONE
|
||||||
binding.tvFree.visibility = View.VISIBLE
|
binding.tvFree.visibility = View.VISIBLE
|
||||||
} else {
|
} else {
|
||||||
binding.tvFree.visibility = View.GONE
|
binding.tvFree.visibility = View.GONE
|
||||||
binding.tvCompleteReservation.visibility = View.GONE
|
binding.tvCompleteReservation.visibility = View.GONE
|
||||||
binding.tvCan.visibility = View.VISIBLE
|
binding.llCan.visibility = View.VISIBLE
|
||||||
|
|
||||||
binding.tvCan.text = item.price.moneyFormat()
|
binding.tvCan.text = item.price.moneyFormat()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,6 +75,13 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="48dp" />
|
android:layout_marginBottom="48dp" />
|
||||||
|
|
||||||
|
<include
|
||||||
|
android:id="@+id/layout_recommend_channel"
|
||||||
|
layout="@layout/layout_live_recommend_channel"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="48dp" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tv_community_post"
|
android:id="@+id/tv_community_post"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -167,13 +174,6 @@
|
|||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
android:paddingHorizontal="24dp" />
|
android:paddingHorizontal="24dp" />
|
||||||
|
|
||||||
<include
|
|
||||||
android:id="@+id/layout_recommend_channel"
|
|
||||||
layout="@layout/layout_live_recommend_channel"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginBottom="48dp" />
|
|
||||||
|
|
||||||
<include
|
<include
|
||||||
android:id="@+id/layout_live_reservation"
|
android:id="@+id/layout_live_reservation"
|
||||||
layout="@layout/layout_live_reservation"
|
layout="@layout/layout_live_reservation"
|
||||||
|
|||||||
Reference in New Issue
Block a user