diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/modify/AudioContentModifyActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/modify/AudioContentModifyActivity.kt index 7730ef7..91d8194 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/modify/AudioContentModifyActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/modify/AudioContentModifyActivity.kt @@ -173,17 +173,17 @@ class AudioContentModifyActivity : BaseActivity<ActivityAudioContentModifyBindin R.color.color_eeeeee ) ) - binding.llCommentYes.setBackgroundResource(R.drawable.bg_round_corner_6_7_9970ff) + binding.llCommentYes.setBackgroundResource(R.drawable.bg_round_corner_6_7_3bb9f1) binding.ivCommentNo.visibility = View.GONE binding.tvCommentNo.setTextColor( ContextCompat.getColor( applicationContext, - R.color.color_9970ff + R.color.color_3bb9f1 ) ) binding.llCommentNo.setBackgroundResource( - R.drawable.bg_round_corner_6_7_1f1734_9970ff + R.drawable.bg_round_corner_6_7_13181b_3bb9f1 ) } else { binding.ivCommentNo.visibility = View.VISIBLE @@ -193,17 +193,17 @@ class AudioContentModifyActivity : BaseActivity<ActivityAudioContentModifyBindin R.color.color_eeeeee ) ) - binding.llCommentNo.setBackgroundResource(R.drawable.bg_round_corner_6_7_9970ff) + binding.llCommentNo.setBackgroundResource(R.drawable.bg_round_corner_6_7_3bb9f1) binding.ivCommentYes.visibility = View.GONE binding.tvCommentYes.setTextColor( ContextCompat.getColor( applicationContext, - R.color.color_9970ff + R.color.color_3bb9f1 ) ) binding.llCommentYes - .setBackgroundResource(R.drawable.bg_round_corner_6_7_1f1734_9970ff) + .setBackgroundResource(R.drawable.bg_round_corner_6_7_13181b_3bb9f1) } } @@ -223,17 +223,17 @@ class AudioContentModifyActivity : BaseActivity<ActivityAudioContentModifyBindin if (it) { binding.ivAgeAll.visibility = View.GONE binding.llAgeAll.setBackgroundResource( - R.drawable.bg_round_corner_6_7_1f1734 + 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, @@ -242,17 +242,17 @@ class AudioContentModifyActivity : BaseActivity<ActivityAudioContentModifyBindin ) } 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 + R.drawable.bg_round_corner_6_7_3bb9f1 ) binding.tvAgeAll.setTextColor( ContextCompat.getColor( diff --git a/app/src/main/res/drawable-xxhdpi/ic_headphones_blue.png b/app/src/main/res/drawable-xxhdpi/ic_headphones_blue.png new file mode 100644 index 0000000..2ee3164 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_headphones_blue.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_headphones_purple.png b/app/src/main/res/drawable-xxhdpi/ic_headphones_purple.png deleted file mode 100644 index d285d38..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_headphones_purple.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_audio_content_modify.xml b/app/src/main/res/layout/activity_audio_content_modify.xml index 60e5f7a..a3ffba9 100644 --- a/app/src/main/res/layout/activity_audio_content_modify.xml +++ b/app/src/main/res/layout/activity_audio_content_modify.xml @@ -51,7 +51,7 @@ android:layout_width="106.7dp" android:layout_height="106.7dp" 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:padding="13.3dp" android:src="@drawable/ic_logo" /> @@ -209,7 +209,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"> @@ -228,7 +228,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" /> </LinearLayout> @@ -238,7 +238,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"> @@ -257,7 +257,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" /> </LinearLayout> </LinearLayout> @@ -300,7 +300,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"> @@ -319,7 +319,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" /> </LinearLayout> @@ -329,7 +329,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"> @@ -348,7 +348,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" /> </LinearLayout> </LinearLayout> @@ -368,11 +368,11 @@ android:layout_height="50dp" android:layout_marginEnd="6.7dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_1f1734_9970ff" + android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:text="취소" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="18.3sp" /> <TextView @@ -381,7 +381,7 @@ android:layout_height="50dp" android:layout_marginStart="6.7dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_9970ff" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:text="수정" diff --git a/app/src/main/res/layout/activity_find_password.xml b/app/src/main/res/layout/activity_find_password.xml index 216866f..605ba17 100644 --- a/app/src/main/res/layout/activity_find_password.xml +++ b/app/src/main/res/layout/activity_find_password.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="60dp" - android:background="@drawable/bg_round_corner_6_7_9970ff" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" @@ -102,13 +102,13 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="93dp" - android:background="@drawable/bg_round_corner_8_transparent_9970ff" + android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" android:drawablePadding="13.3dp" android:paddingHorizontal="18.7dp" android:paddingVertical="10.7dp" android:text="고객센터로 문의하기" - android:textColor="@color/color_9970ff" - app:drawableStartCompat="@drawable/ic_headphones_purple" /> + android:textColor="@color/color_3bb9f1" + app:drawableStartCompat="@drawable/ic_headphones_blue" /> </LinearLayout> </ScrollView> </androidx.constraintlayout.widget.ConstraintLayout> 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 1479cdc..9a66934 100644 --- a/app/src/main/res/layout/activity_live_reservation_cancel.xml +++ b/app/src/main/res/layout/activity_live_reservation_cancel.xml @@ -269,7 +269,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="90dp" android:layout_marginBottom="13.3dp" - android:background="@drawable/bg_round_corner_6_7_9970ff" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" @@ -324,7 +324,7 @@ android:gravity="center" android:paddingVertical="16dp" android:text="다른 라이브 예약하기" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="15sp" /> <TextView diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3b14818..2a7bb94 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -122,7 +122,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="40dp" - android:background="@drawable/bg_round_corner_6_7_9970ff" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" diff --git a/app/src/main/res/layout/activity_sign_out.xml b/app/src/main/res/layout/activity_sign_out.xml index 98b9c45..da6cfa3 100644 --- a/app/src/main/res/layout/activity_sign_out.xml +++ b/app/src/main/res/layout/activity_sign_out.xml @@ -276,7 +276,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="53.3dp" android:layout_marginBottom="13.3dp" - android:background="@drawable/bg_round_corner_6_7_9970ff" + android:background="@drawable/bg_round_corner_6_7_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 db9aba1..51e3644 100644 --- a/app/src/main/res/layout/activity_text_message_detail.xml +++ b/app/src/main/res/layout/activity_text_message_detail.xml @@ -90,7 +90,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_9970ff" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:text="답장" @@ -103,11 +103,11 @@ android:layout_height="match_parent" android:layout_marginHorizontal="6.7dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_1f1734" + android:background="@drawable/bg_round_corner_6_7_13181b" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:text="보관" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> <TextView @@ -115,11 +115,11 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_1f1734" + android:background="@drawable/bg_round_corner_6_7_13181b" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:text="삭제" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> </LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/activity_text_message_write.xml b/app/src/main/res/layout/activity_text_message_write.xml index f1063cc..9bd38db 100644 --- a/app/src/main/res/layout/activity_text_message_write.xml +++ b/app/src/main/res/layout/activity_text_message_write.xml @@ -30,7 +30,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="16.7sp" /> </RelativeLayout> @@ -117,7 +117,7 @@ android:layout_alignParentBottom="true" android:layout_marginHorizontal="13.3dp" android:layout_marginBottom="13.3dp" - android:background="@drawable/bg_round_corner_6_7_9970ff" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:text="메시지 보내기" 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 827ddd2..1cd6a32 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 @@ -130,7 +130,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:background="@drawable/bg_round_corner_6_7_9970ff" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:padding="13dp" android:text="수정"