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 8c1d45f..2d5e53c 100644 Binary files a/app/src/main/res/drawable-xxhdpi/btn_make_live.png and b/app/src/main/res/drawable-xxhdpi/btn_make_live.png differ 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"