후원랭킹 전체보기 - 후원랭킹 활성화 스위치 추가

2023-10-05 19:13:12 +09:00 · 2023-10-05 19:13:12 +09:00 · d35b920470
parent 5a4355044f
commit d35b920470
19 changed files with 81 additions and 34 deletions
--- a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/donation/UserProfileDonationAllAdapter.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/donation/UserProfileDonationAllAdapter.kt
@ -53,9 +53,9 @@ class UserProfileDonationAllAdapter(private val userId: Long) :
                    binding.ivCrown.visibility = View.VISIBLE
                    binding.rlDonationRankingRoot.setBackgroundResource(
                        if (items.size == 1) {
-                            R.drawable.bg_round_corner_4_7_2b2635
+                            R.drawable.bg_round_corner_4_7_13181b
                        } else {
-                            R.drawable.bg_top_round_corner_4_7_2b2635
+                            R.drawable.bg_top_round_corner_4_7_13181b
                        }
                    )

@ -81,11 +81,11 @@ class UserProfileDonationAllAdapter(private val userId: Long) :

                    if (items.size == 2) {
                        binding.rlDonationRankingRoot.setBackgroundResource(
-                            R.drawable.bg_bottom_round_corner_4_7_2b2635
+                            R.drawable.bg_bottom_round_corner_4_7_13181b
                        )
                    } else {
                        binding.rlDonationRankingRoot.setBackgroundColor(
-                            ContextCompat.getColor(context, R.color.color_2b2635)
+                            ContextCompat.getColor(context, R.color.color_13181b)
                        )
                    }

@ -109,7 +109,7 @@ class UserProfileDonationAllAdapter(private val userId: Long) :
                    binding.ivCrown.setImageResource(R.drawable.ic_crown_3)
                    binding.ivCrown.visibility = View.VISIBLE
                    binding.rlDonationRankingRoot.setBackgroundResource(
-                        R.drawable.bg_bottom_round_corner_4_7_2b2635
+                        R.drawable.bg_bottom_round_corner_4_7_13181b
                    )

                    lp.setMargins(
--- a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/donation/UserProfileDonationAllViewActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/donation/UserProfileDonationAllViewActivity.kt
@ -117,8 +117,10 @@ class UserProfileDonationAllViewActivity : BaseActivity<ActivityUserProfileLiveA

        if (SharedPreferenceManager.userId == userId) {
            binding.llTotal.visibility = View.VISIBLE
+            binding.llVisibleDonationRanking.visibility = View.VISIBLE
        } else {
            binding.llTotal.visibility = View.GONE
+            binding.llVisibleDonationRanking.visibility = View.GONE
        }
    }

--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRankingAdapter.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRankingAdapter.kt
@ -62,9 +62,9 @@ class LiveRoomDonationRankingAdapter :
                    binding.ivCrown.visibility = View.VISIBLE
                    binding.root.setBackgroundResource(
                        if (items.size == 1) {
-                            R.drawable.bg_round_corner_4_7_2b2635
+                            R.drawable.bg_round_corner_4_7_13181b
                        } else {
-                            R.drawable.bg_top_round_corner_4_7_2b2635
+                            R.drawable.bg_top_round_corner_4_7_13181b
                        }
                    )

@ -90,11 +90,11 @@ class LiveRoomDonationRankingAdapter :

                    if (items.size == 2) {
                        binding.root.setBackgroundResource(
-                            R.drawable.bg_bottom_round_corner_4_7_2b2635
+                            R.drawable.bg_bottom_round_corner_4_7_13181b
                        )
                    } else {
                        binding.root.setBackgroundColor(
-                            ContextCompat.getColor(context, R.color.color_2b2635)
+                            ContextCompat.getColor(context, R.color.color_13181b)
                        )
                    }

@ -118,7 +118,7 @@ class LiveRoomDonationRankingAdapter :
                    binding.ivCrown.setImageResource(R.drawable.ic_crown_3)
                    binding.ivCrown.visibility = View.VISIBLE
                    binding.root.setBackgroundResource(
-                        R.drawable.bg_bottom_round_corner_4_7_2b2635
+                        R.drawable.bg_bottom_round_corner_4_7_13181b
                    )

                    lp.setMargins(
--- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/profile/ProfileUpdateRequest.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/profile/ProfileUpdateRequest.kt
@ -16,5 +16,6 @@ data class ProfileUpdateRequest(
    @SerializedName("instagramUrl") val instagramUrl: String? = null,
    @SerializedName("websiteUrl") val websiteUrl: String? = null,
    @SerializedName("blogUrl") val blogUrl: String? = null,
+    @SerializedName("isVisibleDonationRank") val isVisibleDonationRank: Boolean? = null,
    @SerializedName("container") val container: String = "aos"
 )
--- a/app/src/main/res/drawable-xxhdpi/btn_toggle_off_big.png
+++ b/app/src/main/res/drawable-xxhdpi/btn_toggle_off_big.png
--- a/app/src/main/res/drawable-xxhdpi/btn_toggle_on_big.png
+++ b/app/src/main/res/drawable-xxhdpi/btn_toggle_on_big.png
--- a/app/src/main/res/drawable/bg_bottom_round_corner_4_7_13181b.xml
+++ b/app/src/main/res/drawable/bg_bottom_round_corner_4_7_13181b.xml
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_2b2635" />
+    <solid android:color="@color/color_13181b" />
    <corners
        android:bottomLeftRadius="4.7dp"
        android:bottomRightRadius="4.7dp" />
    <stroke
        android:width="1dp"
-        android:color="@color/color_2b2635" />
+        android:color="@color/color_13181b" />
 </shape>
--- a/app/src/main/res/drawable/bg_round_corner_4_7_13181b.xml
+++ b/app/src/main/res/drawable/bg_round_corner_4_7_13181b.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_2b2635" />
+    <solid android:color="@color/color_13181b" />
    <corners android:radius="4.7dp" />
    <stroke
        android:width="1dp"
-        android:color="@color/color_2b2635" />
+        android:color="@color/color_13181b" />
 </shape>
--- a/app/src/main/res/drawable/bg_round_corner_8_13181b.xml
+++ b/app/src/main/res/drawable/bg_round_corner_8_13181b.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_2b2635" />
+    <solid android:color="@color/color_13181b" />
    <corners android:radius="8dp" />
    <stroke
        android:width="1dp"
-        android:color="@color/color_2b2635" />
+        android:color="@color/color_13181b" />
 </shape>
--- a/app/src/main/res/drawable/bg_top_round_corner_4_7_13181b.xml
+++ b/app/src/main/res/drawable/bg_top_round_corner_4_7_13181b.xml
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_2b2635" />
+    <solid android:color="@color/color_13181b" />
    <corners
        android:topLeftRadius="4.7dp"
        android:topRightRadius="4.7dp" />
    <stroke
        android:width="1dp"
-        android:color="@color/color_2b2635" />
+        android:color="@color/color_13181b" />
 </shape>
--- a/app/src/main/res/layout/activity_audio_content_detail.xml
+++ b/app/src/main/res/layout/activity_audio_content_detail.xml
@ -572,7 +572,7 @@
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="21.3dp"
-                        android:background="@drawable/bg_round_corner_4_7_2b2635"
+                        android:background="@drawable/bg_round_corner_4_7_13181b"
                        android:gravity="center"
                        android:orientation="vertical"
                        android:paddingVertical="13.3dp"
@ -628,7 +628,7 @@
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="21.3dp"
-                        android:background="@drawable/bg_round_corner_4_7_2b2635"
+                        android:background="@drawable/bg_round_corner_4_7_13181b"
                        android:gravity="center"
                        android:orientation="vertical"
                        android:paddingVertical="13.3dp"
--- a/app/src/main/res/layout/activity_live_reservation_all.xml
+++ b/app/src/main/res/layout/activity_live_reservation_all.xml
@ -46,7 +46,7 @@
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="13.3dp"
        android:layout_marginTop="28.3dp"
-        android:background="@drawable/bg_round_corner_4_7_2b2635"
+        android:background="@drawable/bg_round_corner_4_7_13181b"
        android:gravity="center"
        android:orientation="vertical"
        android:paddingVertical="16.7dp"
--- a/app/src/main/res/layout/activity_user_profile_live_all.xml
+++ b/app/src/main/res/layout/activity_user_profile_live_all.xml
@ -3,21 +3,65 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
+    android:background="@color/black"
    android:orientation="vertical">

    <include
        android:id="@+id/toolbar"
        layout="@layout/detail_toolbar" />

+    <LinearLayout
+        android:id="@+id/ll_visible_donation_ranking"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="13.3dp"
+        android:layout_marginTop="5.3dp"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:gravity="center_vertical"
+            tools:ignore="UseCompoundDrawables">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/gmarket_sans_bold"
+                android:text="채널에 후원랭킹 활성화"
+                android:textColor="@color/color_eeeeee"
+                android:textSize="16sp" />
+
+            <ImageView
+                android:id="@+id/iv_visible_donation_rank"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:contentDescription="@null"
+                android:src="@drawable/btn_toggle_on_big" />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10.7dp"
+            android:fontFamily="@font/gmarket_sans_medium"
+            android:gravity="end"
+            android:text="※ 비활성화하면 채널 내 후원랭킹이 표시되지 않으며,\n라이브 중에도 후원랭킹에 따른 뱃지가 반영되지 않습니다."
+            android:textColor="@color/color_555555"
+            android:textSize="12sp" />
+    </LinearLayout>
+
    <LinearLayout
        android:id="@+id/ll_total"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_margin="13.3dp"
-        android:background="@drawable/bg_round_corner_8_2b2635"
+        android:background="@drawable/bg_round_corner_8_13181b"
        android:orientation="vertical"
-        android:paddingHorizontal="16.7dp"
-        android:paddingVertical="13.3dp"
+        android:padding="16.7dp"
        android:visibility="gone">

        <RelativeLayout
@ -143,7 +187,7 @@
            android:layout_height="wrap_content"
            android:layout_marginStart="6.7dp"
            android:fontFamily="@font/gmarket_sans_medium"
-            android:textColor="@color/color_9970ff"
+            android:textColor="@color/color_80d8ff"
            android:textSize="12sp"
            tools:text="56" />

@ -162,7 +206,7 @@
        android:layout_height="1dp"
        android:layout_marginHorizontal="13.3dp"
        android:layout_marginTop="6.7dp"
-        android:background="@color/color_88909090" />
+        android:background="@color/color_595959" />

    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/swipe_refresh_layout"
--- a/app/src/main/res/layout/dialog_live_room_donation_ranking.xml
+++ b/app/src/main/res/layout/dialog_live_room_donation_ranking.xml
@ -37,7 +37,7 @@
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="13.3dp"
        android:layout_marginTop="7.7dp"
-        android:background="@drawable/bg_round_corner_8_2b2635"
+        android:background="@drawable/bg_round_corner_8_13181b"
        android:paddingHorizontal="18.7dp"
        android:paddingVertical="10.7dp">

@ -62,7 +62,7 @@
            android:layout_toEndOf="@+id/tv_total_can_title"
            android:fontFamily="@font/gmarket_sans_medium"
            android:gravity="end"
-            android:textColor="@color/color_9970ff"
+            android:textColor="@color/color_80d8ff"
            android:textSize="16sp"
            tools:text="1,999,999" />

@ -102,7 +102,7 @@
            android:layout_height="wrap_content"
            android:layout_marginStart="6.7dp"
            android:fontFamily="@font/gmarket_sans_medium"
-            android:textColor="@color/color_9970ff"
+            android:textColor="@color/color_80d8ff"
            android:textSize="12sp"
            tools:text="56" />

--- a/app/src/main/res/layout/fragment_text_message.xml
+++ b/app/src/main/res/layout/fragment_text_message.xml
@ -73,7 +73,7 @@
        android:layout_width="0dp"
        android:layout_height="0dp"
        android:layout_margin="13.3dp"
-        android:background="@drawable/bg_round_corner_4_7_2b2635"
+        android:background="@drawable/bg_round_corner_4_7_13181b"
        android:gravity="center"
        android:orientation="vertical"
        android:visibility="gone"
--- a/app/src/main/res/layout/fragment_voice_message.xml
+++ b/app/src/main/res/layout/fragment_voice_message.xml
@ -72,7 +72,7 @@
        android:layout_width="0dp"
        android:layout_height="0dp"
        android:layout_margin="13.3dp"
-        android:background="@drawable/bg_round_corner_4_7_2b2635"
+        android:background="@drawable/bg_round_corner_4_7_13181b"
        android:gravity="center"
        android:orientation="vertical"
        android:visibility="gone"
--- a/app/src/main/res/layout/layout_live_now.xml
+++ b/app/src/main/res/layout/layout_live_now.xml
@ -58,7 +58,7 @@
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="13.3dp"
        android:layout_marginTop="28.3dp"
-        android:background="@drawable/bg_round_corner_4_7_2b2635"
+        android:background="@drawable/bg_round_corner_4_7_13181b"
        android:gravity="center"
        android:orientation="vertical"
        android:paddingVertical="16.7dp"
--- a/app/src/main/res/layout/layout_live_reservation.xml
+++ b/app/src/main/res/layout/layout_live_reservation.xml
@ -58,7 +58,7 @@
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="13.3dp"
        android:layout_marginVertical="28.3dp"
-        android:background="@drawable/bg_round_corner_4_7_2b2635"
+        android:background="@drawable/bg_round_corner_4_7_13181b"
        android:gravity="center"
        android:orientation="vertical"
        android:paddingVertical="16.7dp"
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@ -16,7 +16,6 @@
    <color name="color_ecfaff">#ECFAFF</color>
    <color name="color_111111">#111111</color>
    <color name="color_ff5c49">#FF5C49</color>
-    <color name="color_2b2635">#2b2635</color>
    <color name="color_ffd300">#FFD300</color>
    <color name="color_e2e2e2">#E2E2E2</color>
    <color name="color_d2d2d2">#D2D2D2</color>
@ -98,4 +97,5 @@
    <color name="color_a94400">#A94400</color>
    <color name="color_ffe368">#FFE368</color>
    <color name="color_ccf0ff">#CCF0FF</color>
+    <color name="color_13181b">#13181B</color>
 </resources>