From 5f7ed22711b42c758d592d905adb305018795b5c Mon Sep 17 00:00:00 2001 From: klaus Date: Fri, 5 Jan 2024 22:12:28 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EB=A7=8C?= =?UTF-8?q?=EB=93=A4=EA=B8=B0=20=EC=95=A1=ED=8B=B0=EB=B9=84=ED=8B=B0=20-?= =?UTF-8?q?=20=EC=9A=94=EC=A6=98=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=BB=AC?= =?UTF-8?q?=EB=9F=AC=EC=97=90=EC=84=9C=20=EC=86=8C=EB=8B=A4=EB=9D=BC?= =?UTF-8?q?=EC=9D=B4=EB=B8=8C=20=EC=BB=AC=EB=9F=AC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AudioContentMainNewContentThemeAdapter.kt | 4 +- .../room/create/LiveRoomCreateActivity.kt | 38 ++++++------ .../message/text/TextMessageFragment.kt | 12 ++-- .../message/voice/VoiceMessageFragment.kt | 12 ++-- .../res/drawable-xxhdpi/btn_make_live.png | Bin 5223 -> 5737 bytes .../drawable/bg_live_room_price_select.xml | 2 +- ...2222.xml => bg_round_corner_10_13181b.xml} | 4 +- ...l => bg_round_corner_10_13181b_3bb9f1.xml} | 4 +- ..._round_corner_16_7_transparent_3bb9f1.xml} | 6 +- ...70ff.xml => bg_round_corner_44_3bb9f1.xml} | 4 +- .../res/layout/activity_audio_content.xml | 2 +- .../layout/activity_audio_content_detail.xml | 2 +- .../activity_live_reservation_cancel.xml | 4 +- .../activity_live_reservation_complete.xml | 4 +- .../res/layout/activity_live_room_create.xml | 58 +++++++++--------- .../res/layout/activity_live_room_edit.xml | 2 +- .../res/layout/activity_modify_password.xml | 2 +- .../res/layout/activity_nickname_update.xml | 2 +- .../res/layout/activity_profile_update.xml | 2 +- app/src/main/res/layout/activity_signup.xml | 2 +- .../layout/activity_text_message_detail.xml | 2 +- .../layout/dialog_audio_content_delete.xml | 4 +- .../dialog_audio_content_order_confirm.xml | 4 +- .../layout/dialog_audio_content_report.xml | 4 +- .../layout/dialog_community_post_report.xml | 2 +- app/src/main/res/layout/dialog_live.xml | 8 +-- app/src/main/res/layout/dialog_live_input.xml | 6 +- .../res/layout/dialog_live_no_chatting.xml | 6 +- .../res/layout/dialog_live_room_donation.xml | 4 +- .../layout/dialog_live_room_info_update.xml | 4 +- .../res/layout/dialog_live_room_password.xml | 8 +-- .../layout/dialog_notification_settings.xml | 4 +- app/src/main/res/layout/dialog_soda.xml | 6 +- .../layout/fragment_audio_content_main.xml | 4 +- .../main/res/layout/fragment_creator_tag.xml | 2 +- .../res/layout/fragment_live_room_detail.xml | 4 +- app/src/main/res/layout/fragment_live_tag.xml | 2 +- app/src/main/res/layout/fragment_message.xml | 2 +- .../main/res/layout/fragment_text_message.xml | 2 +- .../res/layout/fragment_voice_message.xml | 2 +- .../layout/fragment_voice_message_write.xml | 4 +- .../res/layout/item_audio_content_comment.xml | 2 +- .../item_audio_content_comment_reply.xml | 2 +- .../layout/item_community_post_comment.xml | 2 +- .../item_community_post_comment_reply.xml | 2 +- .../res/layout/item_user_profile_cheers.xml | 2 +- .../layout/layout_live_recommend_channel.xml | 4 +- .../main/res/layout/layout_user_profile.xml | 4 +- .../layout_user_profile_audio_content.xml | 2 +- 49 files changed, 135 insertions(+), 135 deletions(-) rename app/src/main/res/drawable/{bg_round_corner_10_222222.xml => bg_round_corner_10_13181b.xml} (66%) rename app/src/main/res/drawable/{bg_round_corner_10_9970ff.xml => bg_round_corner_10_13181b_3bb9f1.xml} (66%) rename app/src/main/res/drawable/{bg_round_corner_10_339970ff_9970ff.xml => bg_round_corner_16_7_transparent_3bb9f1.xml} (51%) rename app/src/main/res/drawable/{bg_round_corner_44_9970ff.xml => bg_round_corner_44_3bb9f1.xml} (66%) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/new_content/AudioContentMainNewContentThemeAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/new_content/AudioContentMainNewContentThemeAdapter.kt index d6669d9..3e80c47 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/new_content/AudioContentMainNewContentThemeAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/new_content/AudioContentMainNewContentThemeAdapter.kt @@ -28,9 +28,9 @@ class AudioContentMainNewContentThemeAdapter( (selectedTheme == "" && theme == "매출") ) { binding.tvTheme.setBackgroundResource( - R.drawable.bg_round_corner_16_7_transparent_9970ff + R.drawable.bg_round_corner_16_7_transparent_3bb9f1 ) - binding.tvTheme.setTextColor(ContextCompat.getColor(context, R.color.color_9970ff)) + binding.tvTheme.setTextColor(ContextCompat.getColor(context, R.color.color_3bb9f1)) } else { binding.tvTheme.setBackgroundResource( R.drawable.bg_round_corner_16_7_transparent_777777 diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateActivity.kt index 38b6b32..b707ac3 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateActivity.kt @@ -365,9 +365,9 @@ class LiveRoomCreateActivity : BaseActivity( binding.llReservationDatetime.visibility = View.GONE binding.ivTimeReservation.visibility = View.GONE binding.ivTimeNow.visibility = View.VISIBLE - binding.llTimeNow.setBackgroundResource(R.drawable.bg_round_corner_6_7_9970ff) + binding.llTimeNow.setBackgroundResource(R.drawable.bg_round_corner_6_7_3bb9f1) binding.llTimeReservation.setBackgroundResource( - R.drawable.bg_round_corner_6_7_1f1734 + R.drawable.bg_round_corner_6_7_13181b ) binding.tvTimeNow.setTextColor( ContextCompat.getColor( @@ -379,22 +379,22 @@ class LiveRoomCreateActivity : BaseActivity( binding.tvTimeReservation.setTextColor( ContextCompat.getColor( applicationContext, - R.color.color_9970ff + R.color.color_3bb9f1 ) ) } else { binding.llReservationDatetime.visibility = View.VISIBLE binding.ivTimeReservation.visibility = View.VISIBLE binding.ivTimeNow.visibility = View.GONE - binding.llTimeNow.setBackgroundResource(R.drawable.bg_round_corner_6_7_1f1734) + binding.llTimeNow.setBackgroundResource(R.drawable.bg_round_corner_6_7_13181b) binding.llTimeReservation.setBackgroundResource( - R.drawable.bg_round_corner_6_7_9970ff + R.drawable.bg_round_corner_6_7_3bb9f1 ) binding.tvTimeNow.setTextColor( ContextCompat.getColor( applicationContext, - R.color.color_9970ff + R.color.color_3bb9f1 ) ) @@ -413,8 +413,8 @@ class LiveRoomCreateActivity : BaseActivity( binding.ivPrivate.visibility = View.VISIBLE binding.ivOpen.visibility = View.GONE - binding.llPrivate.setBackgroundResource(R.drawable.bg_round_corner_6_7_9970ff) - binding.llOpen.setBackgroundResource(R.drawable.bg_round_corner_6_7_1f1734) + binding.llPrivate.setBackgroundResource(R.drawable.bg_round_corner_6_7_3bb9f1) + binding.llOpen.setBackgroundResource(R.drawable.bg_round_corner_6_7_13181b) binding.tvPrivate.setTextColor( ContextCompat.getColor( @@ -426,7 +426,7 @@ class LiveRoomCreateActivity : BaseActivity( binding.tvOpen.setTextColor( ContextCompat.getColor( applicationContext, - R.color.color_9970ff + R.color.color_3bb9f1 ) ) @@ -437,13 +437,13 @@ class LiveRoomCreateActivity : BaseActivity( binding.ivOpen.visibility = View.VISIBLE binding.ivPrivate.visibility = View.GONE - binding.llOpen.setBackgroundResource(R.drawable.bg_round_corner_6_7_9970ff) - binding.llPrivate.setBackgroundResource(R.drawable.bg_round_corner_6_7_1f1734) + binding.llOpen.setBackgroundResource(R.drawable.bg_round_corner_6_7_3bb9f1) + binding.llPrivate.setBackgroundResource(R.drawable.bg_round_corner_6_7_13181b) binding.tvPrivate.setTextColor( ContextCompat.getColor( applicationContext, - R.color.color_9970ff + R.color.color_3bb9f1 ) ) @@ -501,16 +501,16 @@ class LiveRoomCreateActivity : BaseActivity( viewModel.isAdultLiveData.observe(this) { if (it) { binding.ivAgeAll.visibility = View.GONE - binding.llAgeAll.setBackgroundResource(R.drawable.bg_round_corner_6_7_1f1734) + binding.llAgeAll.setBackgroundResource(R.drawable.bg_round_corner_6_7_13181b) binding.tvAgeAll.setTextColor( ContextCompat.getColor( applicationContext, - R.color.color_9970ff + R.color.color_3bb9f1 ) ) binding.ivAge19.visibility = View.VISIBLE - binding.llAge19.setBackgroundResource(R.drawable.bg_round_corner_6_7_9970ff) + binding.llAge19.setBackgroundResource(R.drawable.bg_round_corner_6_7_3bb9f1) binding.tvAge19.setTextColor( ContextCompat.getColor( applicationContext, @@ -519,16 +519,16 @@ class LiveRoomCreateActivity : BaseActivity( ) } else { binding.ivAge19.visibility = View.GONE - binding.llAge19.setBackgroundResource(R.drawable.bg_round_corner_6_7_1f1734) + binding.llAge19.setBackgroundResource(R.drawable.bg_round_corner_6_7_13181b) binding.tvAge19.setTextColor( ContextCompat.getColor( applicationContext, - R.color.color_9970ff + R.color.color_3bb9f1 ) ) binding.ivAgeAll.visibility = View.VISIBLE - binding.llAgeAll.setBackgroundResource(R.drawable.bg_round_corner_6_7_9970ff) + binding.llAgeAll.setBackgroundResource(R.drawable.bg_round_corner_6_7_3bb9f1) binding.tvAgeAll.setTextColor( ContextCompat.getColor( applicationContext, @@ -605,7 +605,7 @@ class LiveRoomCreateActivity : BaseActivity( priceView.setTextColor( ContextCompat.getColor( applicationContext, - R.color.color_9970ff + R.color.color_3bb9f1 ) ) priceView.typeface = ResourcesCompat.getFont( diff --git a/app/src/main/java/kr/co/vividnext/sodalive/message/text/TextMessageFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/message/text/TextMessageFragment.kt index 4d2ce8a..4170f9c 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/message/text/TextMessageFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/message/text/TextMessageFragment.kt @@ -187,36 +187,36 @@ class TextMessageFragment : BaseFragment( when (it) { MessageBox.SENT -> { binding.tvSent.setBackgroundResource( - R.drawable.bg_round_corner_16_7_transparent_9970ff + R.drawable.bg_round_corner_16_7_transparent_3bb9f1 ) binding.tvSent.setTextColor( ContextCompat.getColor( requireContext(), - R.color.color_9970ff + R.color.color_3bb9f1 ) ) } MessageBox.RECEIVE -> { binding.tvReceive.setBackgroundResource( - R.drawable.bg_round_corner_16_7_transparent_9970ff + R.drawable.bg_round_corner_16_7_transparent_3bb9f1 ) binding.tvReceive.setTextColor( ContextCompat.getColor( requireContext(), - R.color.color_9970ff + R.color.color_3bb9f1 ) ) } MessageBox.KEEP -> { binding.tvKeep.setBackgroundResource( - R.drawable.bg_round_corner_16_7_transparent_9970ff + R.drawable.bg_round_corner_16_7_transparent_3bb9f1 ) binding.tvKeep.setTextColor( ContextCompat.getColor( requireContext(), - R.color.color_9970ff + R.color.color_3bb9f1 ) ) } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageFragment.kt index 7e74197..8b655d3 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageFragment.kt @@ -313,36 +313,36 @@ class VoiceMessageFragment : BaseFragment( when (it) { MessageBox.SENT -> { binding.tvSent.setBackgroundResource( - R.drawable.bg_round_corner_16_7_transparent_9970ff + R.drawable.bg_round_corner_16_7_transparent_3bb9f1 ) binding.tvSent.setTextColor( ContextCompat.getColor( requireContext(), - R.color.color_9970ff + R.color.color_3bb9f1 ) ) } MessageBox.RECEIVE -> { binding.tvReceive.setBackgroundResource( - R.drawable.bg_round_corner_16_7_transparent_9970ff + R.drawable.bg_round_corner_16_7_transparent_3bb9f1 ) binding.tvReceive.setTextColor( ContextCompat.getColor( requireContext(), - R.color.color_9970ff + R.color.color_3bb9f1 ) ) } MessageBox.KEEP -> { binding.tvKeep.setBackgroundResource( - R.drawable.bg_round_corner_16_7_transparent_9970ff + R.drawable.bg_round_corner_16_7_transparent_3bb9f1 ) binding.tvKeep.setTextColor( ContextCompat.getColor( requireContext(), - R.color.color_9970ff + R.color.color_3bb9f1 ) ) } diff --git a/app/src/main/res/drawable-xxhdpi/btn_make_live.png b/app/src/main/res/drawable-xxhdpi/btn_make_live.png index 8c1d45f1a63b872d9977b4b506c7aacbc303bc59..2d5e53ce01e75463b3e9ddfbfa581ec7010546b6 100644 GIT binary patch delta 5703 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 Yjngj%Q@GA9&N_gW8btN8igm>Q0FB?uHUIzs delta 5185 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 diff --git a/app/src/main/res/drawable/bg_live_room_price_select.xml b/app/src/main/res/drawable/bg_live_room_price_select.xml index 7526c8e..72fa3e3 100644 --- a/app/src/main/res/drawable/bg_live_room_price_select.xml +++ b/app/src/main/res/drawable/bg_live_room_price_select.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable/bg_round_corner_10_222222.xml b/app/src/main/res/drawable/bg_round_corner_10_13181b.xml similarity index 66% rename from app/src/main/res/drawable/bg_round_corner_10_222222.xml rename to app/src/main/res/drawable/bg_round_corner_10_13181b.xml index db787fc..46db67c 100644 --- a/app/src/main/res/drawable/bg_round_corner_10_222222.xml +++ b/app/src/main/res/drawable/bg_round_corner_10_13181b.xml @@ -1,8 +1,8 @@ - + + android:color="@color/color_13181b" /> diff --git a/app/src/main/res/drawable/bg_round_corner_10_9970ff.xml b/app/src/main/res/drawable/bg_round_corner_10_13181b_3bb9f1.xml similarity index 66% rename from app/src/main/res/drawable/bg_round_corner_10_9970ff.xml rename to app/src/main/res/drawable/bg_round_corner_10_13181b_3bb9f1.xml index 871bd7f..17ac1a1 100644 --- a/app/src/main/res/drawable/bg_round_corner_10_9970ff.xml +++ b/app/src/main/res/drawable/bg_round_corner_10_13181b_3bb9f1.xml @@ -1,8 +1,8 @@ - + + android:color="@color/color_3bb9f1" /> diff --git a/app/src/main/res/drawable/bg_round_corner_10_339970ff_9970ff.xml b/app/src/main/res/drawable/bg_round_corner_16_7_transparent_3bb9f1.xml similarity index 51% rename from app/src/main/res/drawable/bg_round_corner_10_339970ff_9970ff.xml rename to app/src/main/res/drawable/bg_round_corner_16_7_transparent_3bb9f1.xml index ac6052e..8c6937e 100644 --- a/app/src/main/res/drawable/bg_round_corner_10_339970ff_9970ff.xml +++ b/app/src/main/res/drawable/bg_round_corner_16_7_transparent_3bb9f1.xml @@ -1,8 +1,8 @@ - - + + + android:color="@color/color_3bb9f1" /> diff --git a/app/src/main/res/drawable/bg_round_corner_44_9970ff.xml b/app/src/main/res/drawable/bg_round_corner_44_3bb9f1.xml similarity index 66% rename from app/src/main/res/drawable/bg_round_corner_44_9970ff.xml rename to app/src/main/res/drawable/bg_round_corner_44_3bb9f1.xml index dfe5ec8..b852cd0 100644 --- a/app/src/main/res/drawable/bg_round_corner_44_9970ff.xml +++ b/app/src/main/res/drawable/bg_round_corner_44_3bb9f1.xml @@ -1,8 +1,8 @@ - + + android:color="@color/color_3bb9f1" /> diff --git a/app/src/main/res/layout/activity_audio_content.xml b/app/src/main/res/layout/activity_audio_content.xml index 287c5c5..27b93b1 100644 --- a/app/src/main/res/layout/activity_audio_content.xml +++ b/app/src/main/res/layout/activity_audio_content.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:background="@drawable/bg_round_corner_4_7_9970ff" + android:background="@drawable/bg_round_corner_4_7_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="17dp" 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 7aedcb3..c4c608d 100644 --- a/app/src/main/res/layout/activity_audio_content_detail.xml +++ b/app/src/main/res/layout/activity_audio_content_detail.xml @@ -661,7 +661,7 @@ android:layout_below="@+id/rl_profile" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:background="@drawable/bg_round_corner_10_222222" + android:background="@drawable/bg_round_corner_10_13181b" android:gravity="center" android:orientation="vertical" android:paddingVertical="60dp" diff --git a/app/src/main/res/layout/activity_live_reservation_cancel.xml b/app/src/main/res/layout/activity_live_reservation_cancel.xml index 6663c11..1479cdc 100644 --- a/app/src/main/res/layout/activity_live_reservation_cancel.xml +++ b/app/src/main/res/layout/activity_live_reservation_cancel.xml @@ -319,7 +319,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="13.3dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_10_339970ff_9970ff" + android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" @@ -332,7 +332,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" 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 5fad73d..c84fc44 100644 --- a/app/src/main/res/layout/activity_live_reservation_complete.xml +++ b/app/src/main/res/layout/activity_live_reservation_complete.xml @@ -312,7 +312,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@drawable/bg_round_corner_10_339970ff_9970ff" + android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" @@ -326,7 +326,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" diff --git a/app/src/main/res/layout/activity_live_room_create.xml b/app/src/main/res/layout/activity_live_room_create.xml index b62d53c..50063c3 100644 --- a/app/src/main/res/layout/activity_live_room_create.xml +++ b/app/src/main/res/layout/activity_live_room_create.xml @@ -34,11 +34,11 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:background="@drawable/bg_round_corner_8_transparent_9970ff" + android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" android:paddingHorizontal="10.7dp" android:paddingVertical="8dp" android:text="최근 데이터 가져오기" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="12sp" /> @@ -76,7 +76,7 @@ android:layout_width="80dp" android:layout_height="116.8dp" android:adjustViewBounds="true" - android:background="@drawable/bg_round_corner_13_3_3e3358" + android:background="@drawable/bg_round_corner_13_3_13181b" android:contentDescription="@null" android:src="@drawable/ic_logo" /> @@ -86,7 +86,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" - android:background="@drawable/bg_round_corner_33_3_9970ff" + android:background="@drawable/bg_round_corner_33_3_3bb9f1" android:contentDescription="@null" android:padding="10dp" android:src="@drawable/ic_camera" /> @@ -212,12 +212,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:background="@drawable/bg_round_corner_24_3_339970ff_9970ff" + android:background="@drawable/bg_round_corner_24_3_13181b_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="13.7dp" android:text="관심사 선택" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="16.7sp" /> @@ -272,7 +272,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="지금 즉시" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -282,7 +282,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_1f1734" + android:background="@drawable/bg_round_corner_6_7_13181b" android:gravity="center" android:paddingVertical="14.3dp"> @@ -301,7 +301,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="예약 설정" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -336,7 +336,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6.7dp" - android:background="@drawable/bg_round_corner_6_7_333333_9970ff" + android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" android:paddingVertical="15.3dp" @@ -366,7 +366,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6.7dp" - android:background="@drawable/bg_round_corner_6_7_333333_9970ff" + android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" android:paddingVertical="15.3dp" @@ -429,7 +429,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_1f1734" + android:background="@drawable/bg_round_corner_6_7_13181b" android:gravity="center" android:paddingVertical="14.3dp"> @@ -448,7 +448,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="공개" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -458,7 +458,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_1f1734" + android:background="@drawable/bg_round_corner_6_7_13181b" android:gravity="center" android:paddingVertical="14.3dp"> @@ -477,7 +477,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="비공개" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -550,7 +550,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_1f1734" + android:background="@drawable/bg_round_corner_6_7_13181b" android:gravity="center" android:paddingVertical="14.3dp"> @@ -569,7 +569,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="전체 연령" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -579,7 +579,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_1f1734" + android:background="@drawable/bg_round_corner_6_7_13181b" android:gravity="center" android:paddingVertical="14.3dp"> @@ -598,7 +598,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="19세 이상" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -640,7 +640,7 @@ android:gravity="center" android:paddingVertical="16.7dp" android:text="무료" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -688,7 +688,7 @@ android:gravity="center" android:paddingVertical="16.7dp" android:text="500 캔" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -742,7 +742,7 @@ android:maxLength="5" android:paddingVertical="16.7dp" android:text="0" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textCursorDrawable="@drawable/edit_text_cursor" android:textSize="13.3sp" /> @@ -755,7 +755,7 @@ android:layout_marginEnd="13.3dp" android:fontFamily="@font/gmarket_sans_medium" android:text="캔" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> @@ -771,7 +771,7 @@ android:layout_width="match_parent" android:layout_height="50dp" android:layout_margin="13.3dp" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:text="라이브 오픈하기" diff --git a/app/src/main/res/layout/activity_live_room_edit.xml b/app/src/main/res/layout/activity_live_room_edit.xml index 99f0cfc..7ff1c52 100644 --- a/app/src/main/res/layout/activity_live_room_edit.xml +++ b/app/src/main/res/layout/activity_live_room_edit.xml @@ -250,7 +250,7 @@ android:layout_width="match_parent" android:layout_height="50dp" android:layout_margin="13.3dp" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:text="라이브 수정" diff --git a/app/src/main/res/layout/activity_modify_password.xml b/app/src/main/res/layout/activity_modify_password.xml index 50057c7..92e5cbc 100644 --- a/app/src/main/res/layout/activity_modify_password.xml +++ b/app/src/main/res/layout/activity_modify_password.xml @@ -165,7 +165,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginVertical="13.7dp" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" diff --git a/app/src/main/res/layout/activity_nickname_update.xml b/app/src/main/res/layout/activity_nickname_update.xml index ac0889f..36203d9 100644 --- a/app/src/main/res/layout/activity_nickname_update.xml +++ b/app/src/main/res/layout/activity_nickname_update.xml @@ -99,7 +99,7 @@ android:id="@+id/tv_change_nickname" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" diff --git a/app/src/main/res/layout/activity_profile_update.xml b/app/src/main/res/layout/activity_profile_update.xml index 359c3d6..854a4b0 100644 --- a/app/src/main/res/layout/activity_profile_update.xml +++ b/app/src/main/res/layout/activity_profile_update.xml @@ -526,7 +526,7 @@ android:id="@+id/tv_save" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml index 8fb178f..264cce3 100644 --- a/app/src/main/res/layout/activity_signup.xml +++ b/app/src/main/res/layout/activity_signup.xml @@ -434,7 +434,7 @@ android:id="@+id/tv_sign_up" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" diff --git a/app/src/main/res/layout/activity_text_message_detail.xml b/app/src/main/res/layout/activity_text_message_detail.xml index 29011e6..db9aba1 100644 --- a/app/src/main/res/layout/activity_text_message_detail.xml +++ b/app/src/main/res/layout/activity_text_message_detail.xml @@ -58,7 +58,7 @@ android:layout_height="0dp" android:layout_marginTop="16.7dp" android:layout_marginBottom="30dp" - android:background="@drawable/bg_round_corner_10_222222" + android:background="@drawable/bg_round_corner_10_13181b" android:paddingHorizontal="26.7dp" android:paddingVertical="13.3dp" app:layout_constraintBottom_toTopOf="@+id/ll_buttons" diff --git a/app/src/main/res/layout/dialog_audio_content_delete.xml b/app/src/main/res/layout/dialog_audio_content_delete.xml index 797cd0b..732474c 100644 --- a/app/src/main/res/layout/dialog_audio_content_delete.xml +++ b/app/src/main/res/layout/dialog_audio_content_delete.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/bg_round_corner_10_222222" + android:background="@drawable/bg_round_corner_10_13181b" android:orientation="vertical" android:paddingHorizontal="16.7dp" android:paddingTop="40dp" @@ -87,7 +87,7 @@ android:layout_height="wrap_content" android:layout_marginStart="6.7dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="15.7dp" diff --git a/app/src/main/res/layout/dialog_audio_content_order_confirm.xml b/app/src/main/res/layout/dialog_audio_content_order_confirm.xml index cd63b7a..307e9f8 100644 --- a/app/src/main/res/layout/dialog_audio_content_order_confirm.xml +++ b/app/src/main/res/layout/dialog_audio_content_order_confirm.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/bg_round_corner_10_222222" + android:background="@drawable/bg_round_corner_10_13181b" android:orientation="vertical" android:paddingHorizontal="13.3dp" android:paddingTop="26.7dp" @@ -171,7 +171,7 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="15.7dp" diff --git a/app/src/main/res/layout/dialog_audio_content_report.xml b/app/src/main/res/layout/dialog_audio_content_report.xml index ff26f07..aefd5ed 100644 --- a/app/src/main/res/layout/dialog_audio_content_report.xml +++ b/app/src/main/res/layout/dialog_audio_content_report.xml @@ -2,7 +2,7 @@ + android:background="@drawable/bg_round_corner_10_13181b"> @@ -66,7 +66,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" diff --git a/app/src/main/res/layout/dialog_live_input.xml b/app/src/main/res/layout/dialog_live_input.xml index 690d101..5bea555 100644 --- a/app/src/main/res/layout/dialog_live_input.xml +++ b/app/src/main/res/layout/dialog_live_input.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@drawable/bg_round_corner_10_222222"> + android:background="@drawable/bg_round_corner_10_13181b"> + android:background="@drawable/bg_round_corner_10_13181b"> + android:background="@drawable/bg_round_corner_10_13181b"> @@ -116,7 +116,7 @@ android:id="@+id/tv_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:textColor="@color/white" diff --git a/app/src/main/res/layout/dialog_notification_settings.xml b/app/src/main/res/layout/dialog_notification_settings.xml index 3fead35..047e86a 100644 --- a/app/src/main/res/layout/dialog_notification_settings.xml +++ b/app/src/main/res/layout/dialog_notification_settings.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@drawable/bg_round_corner_10_222222" + android:background="@drawable/bg_round_corner_10_13181b" android:orientation="vertical" android:paddingVertical="20dp"> @@ -116,7 +116,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="26.7dp" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" diff --git a/app/src/main/res/layout/dialog_soda.xml b/app/src/main/res/layout/dialog_soda.xml index 8eda466..7139f26 100644 --- a/app/src/main/res/layout/dialog_soda.xml +++ b/app/src/main/res/layout/dialog_soda.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@drawable/bg_round_corner_10_222222"> + android:background="@drawable/bg_round_corner_10_13181b"> diff --git a/app/src/main/res/layout/fragment_creator_tag.xml b/app/src/main/res/layout/fragment_creator_tag.xml index 82fbc80..b182384 100644 --- a/app/src/main/res/layout/fragment_creator_tag.xml +++ b/app/src/main/res/layout/fragment_creator_tag.xml @@ -40,7 +40,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="13.3dp" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" diff --git a/app/src/main/res/layout/fragment_live_room_detail.xml b/app/src/main/res/layout/fragment_live_room_detail.xml index 6b6620a..3c918ce 100644 --- a/app/src/main/res/layout/fragment_live_room_detail.xml +++ b/app/src/main/res/layout/fragment_live_room_detail.xml @@ -288,7 +288,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_weight="2" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" @@ -347,7 +347,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" diff --git a/app/src/main/res/layout/fragment_live_tag.xml b/app/src/main/res/layout/fragment_live_tag.xml index b81d7e6..d4f9430 100644 --- a/app/src/main/res/layout/fragment_live_tag.xml +++ b/app/src/main/res/layout/fragment_live_tag.xml @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_margin="13.3dp" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml index 026bb37..777f5db 100644 --- a/app/src/main/res/layout/fragment_message.xml +++ b/app/src/main/res/layout/fragment_message.xml @@ -20,7 +20,7 @@ android:id="@+id/tabs" android:layout_width="match_parent" android:layout_height="50dp" - app:tabIndicatorColor="@color/color_9970ff" + app:tabIndicatorColor="@color/color_3bb9f1" app:tabIndicatorFullWidth="true" app:tabIndicatorHeight="1.3dp" app:tabSelectedTextColor="@color/color_eeeeee" diff --git a/app/src/main/res/layout/fragment_text_message.xml b/app/src/main/res/layout/fragment_text_message.xml index a2a4187..f7a4c5f 100644 --- a/app/src/main/res/layout/fragment_text_message.xml +++ b/app/src/main/res/layout/fragment_text_message.xml @@ -117,7 +117,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="16.7dp" android:layout_marginBottom="80dp" - android:background="@drawable/bg_round_corner_33_3_9970ff" + android:background="@drawable/bg_round_corner_33_3_3bb9f1" android:contentDescription="@null" android:padding="13.3dp" android:src="@drawable/ic_make_message" diff --git a/app/src/main/res/layout/fragment_voice_message.xml b/app/src/main/res/layout/fragment_voice_message.xml index 152d214..153ba10 100644 --- a/app/src/main/res/layout/fragment_voice_message.xml +++ b/app/src/main/res/layout/fragment_voice_message.xml @@ -116,7 +116,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="16.7dp" android:layout_marginBottom="80dp" - android:background="@drawable/bg_round_corner_33_3_9970ff" + android:background="@drawable/bg_round_corner_33_3_3bb9f1" android:contentDescription="@null" android:padding="13.3dp" android:src="@drawable/ic_make_voice" diff --git a/app/src/main/res/layout/fragment_voice_message_write.xml b/app/src/main/res/layout/fragment_voice_message_write.xml index 8fb3f19..20d4cfe 100644 --- a/app/src/main/res/layout/fragment_voice_message_write.xml +++ b/app/src/main/res/layout/fragment_voice_message_write.xml @@ -192,7 +192,7 @@ android:layout_width="0dp" android:layout_height="50dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_10_339970ff_9970ff" + android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:text="다시 녹음" @@ -205,7 +205,7 @@ android:layout_height="50dp" android:layout_marginStart="13.3dp" android:layout_weight="2" - android:background="@drawable/bg_round_corner_10_9970ff" + android:background="@drawable/bg_round_corner_10_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:text="메시지 보내기" diff --git a/app/src/main/res/layout/item_audio_content_comment.xml b/app/src/main/res/layout/item_audio_content_comment.xml index 01d2181..24ac473 100644 --- a/app/src/main/res/layout/item_audio_content_comment.xml +++ b/app/src/main/res/layout/item_audio_content_comment.xml @@ -112,7 +112,7 @@ android:layout_alignParentStart="true" android:layout_marginEnd="13.3dp" android:layout_toStartOf="@+id/tv_modify" - android:background="@drawable/bg_round_corner_10_339970ff_9970ff" + android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" android:importantForAutofill="no" android:inputType="text" android:paddingHorizontal="13.3dp" diff --git a/app/src/main/res/layout/item_audio_content_comment_reply.xml b/app/src/main/res/layout/item_audio_content_comment_reply.xml index abb0bd8..827ddd2 100644 --- a/app/src/main/res/layout/item_audio_content_comment_reply.xml +++ b/app/src/main/res/layout/item_audio_content_comment_reply.xml @@ -113,7 +113,7 @@ android:layout_alignParentStart="true" android:layout_marginEnd="13.3dp" android:layout_toStartOf="@+id/tv_modify" - android:background="@drawable/bg_round_corner_10_339970ff_9970ff" + android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" android:importantForAutofill="no" android:inputType="text" android:paddingHorizontal="13.3dp" diff --git a/app/src/main/res/layout/item_community_post_comment.xml b/app/src/main/res/layout/item_community_post_comment.xml index bbb3f4a..42594a3 100644 --- a/app/src/main/res/layout/item_community_post_comment.xml +++ b/app/src/main/res/layout/item_community_post_comment.xml @@ -83,7 +83,7 @@ android:layout_alignParentStart="true" android:layout_marginEnd="13.3dp" android:layout_toStartOf="@+id/tv_modify" - android:background="@drawable/bg_round_corner_10_339970ff_9970ff" + android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" android:importantForAutofill="no" android:inputType="text" android:paddingHorizontal="13.3dp" diff --git a/app/src/main/res/layout/item_community_post_comment_reply.xml b/app/src/main/res/layout/item_community_post_comment_reply.xml index 91af3fd..5f4fb0d 100644 --- a/app/src/main/res/layout/item_community_post_comment_reply.xml +++ b/app/src/main/res/layout/item_community_post_comment_reply.xml @@ -84,7 +84,7 @@ android:layout_alignParentStart="true" android:layout_marginEnd="13.3dp" android:layout_toStartOf="@+id/tv_modify" - android:background="@drawable/bg_round_corner_10_339970ff_9970ff" + android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" android:importantForAutofill="no" android:inputType="text" android:paddingHorizontal="13.3dp" diff --git a/app/src/main/res/layout/item_user_profile_cheers.xml b/app/src/main/res/layout/item_user_profile_cheers.xml index 3773140..96444ff 100644 --- a/app/src/main/res/layout/item_user_profile_cheers.xml +++ b/app/src/main/res/layout/item_user_profile_cheers.xml @@ -85,7 +85,7 @@ android:layout_alignParentStart="true" android:layout_marginEnd="13.3dp" android:layout_toStartOf="@+id/tv_modify" - android:background="@drawable/bg_round_corner_10_339970ff_9970ff" + android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" android:importantForAutofill="no" android:inputType="text" android:paddingHorizontal="13.3dp" diff --git a/app/src/main/res/layout/layout_live_recommend_channel.xml b/app/src/main/res/layout/layout_live_recommend_channel.xml index 574bd52..6d70c74 100644 --- a/app/src/main/res/layout/layout_live_recommend_channel.xml +++ b/app/src/main/res/layout/layout_live_recommend_channel.xml @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="채널" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="18.3sp" /> @@ -55,7 +55,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="채널" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/layout_user_profile.xml b/app/src/main/res/layout/layout_user_profile.xml index a938ce6..ab14fe0 100644 --- a/app/src/main/res/layout/layout_user_profile.xml +++ b/app/src/main/res/layout/layout_user_profile.xml @@ -66,7 +66,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6.7dp" - android:background="@drawable/bg_round_corner_16_7_transparent_9970ff" + android:background="@drawable/bg_round_corner_16_7_transparent_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:paddingHorizontal="16dp" android:paddingVertical="8dp" @@ -110,7 +110,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:fontFamily="@font/gmarket_sans_medium" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="12sp" app:layout_constraintStart_toStartOf="@+id/iv_profile" app:layout_constraintTop_toBottomOf="@+id/iv_profile" diff --git a/app/src/main/res/layout/layout_user_profile_audio_content.xml b/app/src/main/res/layout/layout_user_profile_audio_content.xml index a5d3d2e..0042c7d 100644 --- a/app/src/main/res/layout/layout_user_profile_audio_content.xml +++ b/app/src/main/res/layout/layout_user_profile_audio_content.xml @@ -36,7 +36,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="21.3dp" - android:background="@drawable/bg_round_corner_4_7_9970ff" + android:background="@drawable/bg_round_corner_4_7_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="17dp"