diff --git 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 index 22ae33d..42268cc 100644 --- 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( diff --git 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 index 0d5bf3a..8e0afc2 100644 --- 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 - + + android:color="@color/color_13181b" /> diff --git a/app/src/main/res/drawable/bg_round_corner_4_7_2b2635.xml b/app/src/main/res/drawable/bg_round_corner_4_7_13181b.xml similarity index 66% rename from app/src/main/res/drawable/bg_round_corner_4_7_2b2635.xml rename to app/src/main/res/drawable/bg_round_corner_4_7_13181b.xml index f7705de..573a55c 100644 --- a/app/src/main/res/drawable/bg_round_corner_4_7_2b2635.xml +++ b/app/src/main/res/drawable/bg_round_corner_4_7_13181b.xml @@ -1,8 +1,8 @@ - + + android:color="@color/color_13181b" /> diff --git a/app/src/main/res/drawable/bg_round_corner_8_2b2635.xml b/app/src/main/res/drawable/bg_round_corner_8_13181b.xml similarity index 66% rename from app/src/main/res/drawable/bg_round_corner_8_2b2635.xml rename to app/src/main/res/drawable/bg_round_corner_8_13181b.xml index aeb43de..c241984 100644 --- a/app/src/main/res/drawable/bg_round_corner_8_2b2635.xml +++ b/app/src/main/res/drawable/bg_round_corner_8_13181b.xml @@ -1,8 +1,8 @@ - + + android:color="@color/color_13181b" /> diff --git a/app/src/main/res/drawable/bg_top_round_corner_4_7_2b2635.xml b/app/src/main/res/drawable/bg_top_round_corner_4_7_13181b.xml similarity index 71% rename from app/src/main/res/drawable/bg_top_round_corner_4_7_2b2635.xml rename to app/src/main/res/drawable/bg_top_round_corner_4_7_13181b.xml index c834f26..8bb6a64 100644 --- a/app/src/main/res/drawable/bg_top_round_corner_4_7_2b2635.xml +++ b/app/src/main/res/drawable/bg_top_round_corner_4_7_13181b.xml @@ -1,10 +1,10 @@ - + + android:color="@color/color_13181b" /> 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 67e972a..2ecbb8f 100644 --- 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" diff --git a/app/src/main/res/layout/activity_live_reservation_all.xml b/app/src/main/res/layout/activity_live_reservation_all.xml index d3105ab..3d371e9 100644 --- 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" diff --git a/app/src/main/res/layout/activity_user_profile_live_all.xml b/app/src/main/res/layout/activity_user_profile_live_all.xml index aa847d4..ec9447d 100644 --- 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"> + + + + + + + + + + + + @@ -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" /> @@ -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" /> diff --git a/app/src/main/res/layout/fragment_text_message.xml b/app/src/main/res/layout/fragment_text_message.xml index 87ec494..a2a4187 100644 --- 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" diff --git a/app/src/main/res/layout/fragment_voice_message.xml b/app/src/main/res/layout/fragment_voice_message.xml index 6724dcc..152d214 100644 --- 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" diff --git a/app/src/main/res/layout/layout_live_now.xml b/app/src/main/res/layout/layout_live_now.xml index 7eae7bc..0510a84 100644 --- 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" diff --git a/app/src/main/res/layout/layout_live_reservation.xml b/app/src/main/res/layout/layout_live_reservation.xml index 64344d8..3621bee 100644 --- 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" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 795330e..83b7f36 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -16,7 +16,6 @@ #ECFAFF #111111 #FF5C49 - #2b2635 #FFD300 #E2E2E2 #D2D2D2 @@ -98,4 +97,5 @@ #A94400 #FFE368 #CCF0FF + #13181B