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 ad452561..03e999f2 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 @@ -782,7 +782,7 @@ class LiveRoomCreateActivity : BaseActivity( ) priceView.typeface = ResourcesCompat.getFont( applicationContext, - R.font.gmarket_sans_bold + R.font.pretendard_bold ) } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt index 9a0c22c0..e34a9184 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt @@ -467,7 +467,7 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl binding.ivTab.isSelected = isSelected val fontRes = if (isSelected) { - R.font.gmarket_sans_bold + R.font.pretendard_bold } else { R.font.gmarket_sans_light } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageWriteFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageWriteFragment.kt index 48b0d68b..ae659d7b 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageWriteFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageWriteFragment.kt @@ -111,7 +111,7 @@ class VoiceMessageWriteFragment( binding.tvNickname.text = nickname binding.tvNickname.typeface = ResourcesCompat.getFont( requireContext(), - R.font.gmarket_sans_bold + R.font.pretendard_bold ) binding.tvNickname.setTextColor( ContextCompat.getColor( diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt index 095c04b9..5d034b17 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt @@ -175,7 +175,7 @@ class CanPaymentActivity : BaseActivity( private fun paymentMethodSelect(view: TextView) { view.typeface = ResourcesCompat.getFont( applicationContext, - R.font.gmarket_sans_bold + R.font.pretendard_bold ) view.setTextColor(ContextCompat.getColor(applicationContext, R.color.color_3bb9f1)) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt index 9bcbc7d9..1bc312bd 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt @@ -129,7 +129,7 @@ class CanPaymentTempActivity : BaseActivity( private fun paymentMethodSelect(view: TextView) { view.typeface = ResourcesCompat.getFont( applicationContext, - R.font.gmarket_sans_bold + R.font.pretendard_bold ) view.setTextColor(ContextCompat.getColor(applicationContext, R.color.color_3bb9f1)) diff --git a/app/src/main/res/font/gmarket_sans_bold.ttf b/app/src/main/res/font/gmarket_sans_bold.ttf deleted file mode 100755 index 0d20d4a6..00000000 Binary files a/app/src/main/res/font/gmarket_sans_bold.ttf and /dev/null differ diff --git a/app/src/main/res/layout/activity_add_alarm.xml b/app/src/main/res/layout/activity_add_alarm.xml index 3cbee196..240b4ed0 100644 --- a/app/src/main/res/layout/activity_add_alarm.xml +++ b/app/src/main/res/layout/activity_add_alarm.xml @@ -212,7 +212,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/cancel" @@ -226,7 +226,7 @@ android:layout_marginStart="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/alarm_add_save" diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml index f8ff6f14..2d8d41db 100644 --- a/app/src/main/res/layout/activity_alarm_list.xml +++ b/app/src/main/res/layout/activity_alarm_list.xml @@ -21,7 +21,7 @@ android:layout_centerVertical="true" android:drawablePadding="6.7dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:minHeight="48dp" android:textColor="@color/color_eeeeee" @@ -87,7 +87,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/color_80d8ff" android:textSize="14.7sp" @@ -98,7 +98,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/alarm_extra_slot_price_suffix" android:textColor="@color/color_eeeeee" @@ -109,7 +109,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/alarm_extra_slot_unlimited" android:textColor="@color/color_ff5c49" @@ -120,7 +120,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/alarm_extra_slot_purchase_suffix" android:textColor="@color/color_eeeeee" diff --git a/app/src/main/res/layout/activity_audio_content.xml b/app/src/main/res/layout/activity_audio_content.xml index a5ec04c4..091ff1f1 100644 --- a/app/src/main/res/layout/activity_audio_content.xml +++ b/app/src/main/res/layout/activity_audio_content.xml @@ -25,7 +25,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_4_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="17dp" android:text="@string/screen_audio_content_new_content" 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 170179c3..4976c5f1 100644 --- a/app/src/main/res/layout/activity_audio_content_detail.xml +++ b/app/src/main/res/layout/activity_audio_content_detail.xml @@ -22,7 +22,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@+id/iv_menu" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" app:drawableStartCompat="@drawable/ic_back" @@ -224,7 +224,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_badge_sold_out" android:textColor="@color/white" android:textSize="36.7sp" @@ -492,7 +492,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_d2d2d2" android:textSize="16sp" tools:text="매버릭 팔레트 (feat. J-DRAGON)" /> @@ -641,7 +641,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="5.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" tools:text="10" /> @@ -663,7 +663,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_detail_buyer_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" @@ -746,7 +746,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="18.3dp" android:background="@drawable/bg_round_corner_5_3_525252" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_audio_content_detail_purchase_sold_out" @@ -786,7 +786,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="5.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/white" android:textSize="14.7sp" tools:text="300" /> @@ -805,7 +805,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_detail_action_buy" android:textColor="@color/white" android:textSize="14.7sp" /> @@ -816,7 +816,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/white" android:textSize="13.3sp" @@ -956,7 +956,7 @@ @@ -1012,7 +1012,7 @@ 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 e5a68da0..06741327 100644 --- a/app/src/main/res/layout/activity_audio_content_modify.xml +++ b/app/src/main/res/layout/activity_audio_content_modify.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_thumbnail_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -84,7 +84,7 @@ @@ -124,7 +124,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_content_label" android:textColor="@color/color_eeeeee" @@ -184,7 +184,7 @@ @@ -221,7 +221,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="30dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_point_section_title" android:textColor="@color/color_eeeeee" @@ -257,7 +257,7 @@ android:id="@+id/tv_available_point" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_point_available" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -286,7 +286,7 @@ android:id="@+id/tv_not_available_point" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_point_unavailable" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -305,7 +305,7 @@ @@ -368,7 +368,7 @@ android:id="@+id/tv_age_19" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_age_19" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -396,7 +396,7 @@ @@ -459,7 +459,7 @@ android:id="@+id/tv_comment_no" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_comment_disallow" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -482,7 +482,7 @@ android:layout_marginEnd="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/cancel" android:textColor="@color/color_3bb9f1" @@ -495,7 +495,7 @@ android:layout_marginStart="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/audio_content_playlist_modify_save" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_audio_content_playlist_create.xml b/app/src/main/res/layout/activity_audio_content_playlist_create.xml index 169d019d..d2af929a 100644 --- a/app/src/main/res/layout/activity_audio_content_playlist_create.xml +++ b/app/src/main/res/layout/activity_audio_content_playlist_create.xml @@ -23,7 +23,7 @@ android:layout_centerVertical="true" android:drawablePadding="6.7dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center_vertical" android:minHeight="48dp" android:paddingHorizontal="13.3dp" @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_marginTop="26.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_playlist_create_title_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" @@ -80,7 +80,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:importantForAutofill="no" android:inputType="textWebEditText" android:maxLines="1" @@ -100,7 +100,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="26.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_playlist_create_desc_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" @@ -125,7 +125,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:importantForAutofill="no" android:inputType="textWebEditText" android:maxLines="1" @@ -145,7 +145,7 @@ android:layout_height="wrap_content" android:layout_marginTop="26.7dp" android:drawablePadding="8dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center_vertical" android:text="@string/audio_content_playlist_create_add_content" android:textColor="@color/color_3bb9f1" diff --git a/app/src/main/res/layout/activity_audio_content_playlist_detail.xml b/app/src/main/res/layout/activity_audio_content_playlist_detail.xml index a3cb26ed..723ca6d6 100644 --- a/app/src/main/res/layout/activity_audio_content_playlist_detail.xml +++ b/app/src/main/res/layout/activity_audio_content_playlist_detail.xml @@ -20,7 +20,7 @@ android:layout_centerVertical="true" android:drawablePadding="6.7dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:minHeight="48dp" android:textColor="@color/color_eeeeee" @@ -171,7 +171,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:maxLines="2" android:textColor="@color/color_d2d2d2" android:textSize="18.3sp" @@ -244,7 +244,7 @@ android:id="@+id/tv_play" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:paddingVertical="11dp" android:text="@string/audio_content_playlist_detail_play" android:textColor="@color/white" @@ -274,7 +274,7 @@ android:id="@+id/tv_shuffle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:paddingVertical="11dp" android:text="@string/audio_content_playlist_detail_shuffle" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_audio_content_playlist_modify.xml b/app/src/main/res/layout/activity_audio_content_playlist_modify.xml index 7d32dbdc..31f230f2 100644 --- a/app/src/main/res/layout/activity_audio_content_playlist_modify.xml +++ b/app/src/main/res/layout/activity_audio_content_playlist_modify.xml @@ -23,7 +23,7 @@ android:layout_centerVertical="true" android:drawablePadding="6.7dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center_vertical" android:minHeight="48dp" android:paddingHorizontal="13.3dp" @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_marginTop="26.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_playlist_modify_title_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" @@ -80,7 +80,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:importantForAutofill="no" android:inputType="textWebEditText" android:maxLines="1" @@ -99,7 +99,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="26.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_playlist_modify_desc_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" @@ -124,7 +124,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:importantForAutofill="no" android:inputType="textWebEditText" android:maxLines="1" @@ -144,7 +144,7 @@ android:layout_height="wrap_content" android:layout_marginTop="26.7dp" android:drawablePadding="3.5dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center_vertical" android:text="@string/audio_content_playlist_create_add_content" android:textColor="@color/color_3bb9f1" diff --git a/app/src/main/res/layout/activity_audio_content_ranking_all.xml b/app/src/main/res/layout/activity_audio_content_ranking_all.xml index b8fb24ec..433fe20e 100644 --- a/app/src/main/res/layout/activity_audio_content_ranking_all.xml +++ b/app/src/main/res/layout/activity_audio_content_ranking_all.xml @@ -22,7 +22,7 @@ android:id="@+id/tv_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/activity_audio_content_upload.xml b/app/src/main/res/layout/activity_audio_content_upload.xml index 8ddb7b41..9152da16 100644 --- a/app/src/main/res/layout/activity_audio_content_upload.xml +++ b/app/src/main/res/layout/activity_audio_content_upload.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_thumbnail_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -80,7 +80,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_section_upload" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -115,7 +115,7 @@ @@ -155,7 +155,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_content_label" android:textColor="@color/color_eeeeee" @@ -215,7 +215,7 @@ @@ -242,7 +242,7 @@ android:id="@+id/tv_theme" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_theme_select" android:textColor="@color/color_80d8ff" android:textSize="16.7sp" /> @@ -259,7 +259,7 @@ @@ -294,7 +294,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_price_section_title" android:textColor="@color/color_eeeeee" @@ -330,7 +330,7 @@ android:id="@+id/tv_price_free" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_price_free" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -359,7 +359,7 @@ android:id="@+id/tv_price_paid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_price_paid" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -372,7 +372,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="26.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_keep_section_title" android:textColor="@color/color_eeeeee" @@ -408,7 +408,7 @@ android:id="@+id/tv_both" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_purchase_option_both" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -437,7 +437,7 @@ android:id="@+id/tv_buy_only" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_purchase_option_buy_only" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -465,7 +465,7 @@ android:id="@+id/tv_rent_only" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_purchase_option_rent_only" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -505,7 +505,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@+id/tv_price_unit" android:background="@null" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:importantForAutofill="no" android:inputType="numberSigned" android:paddingVertical="13.3dp" @@ -569,7 +569,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="30dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_limited_section_title" android:textColor="@color/color_eeeeee" @@ -605,7 +605,7 @@ android:id="@+id/tv_not_limited" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_limited_unlimited" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -634,7 +634,7 @@ android:id="@+id/tv_limited" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_limited_limited" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -648,7 +648,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:hint="@string/screen_audio_content_upload_limited_hint" android:importantForAutofill="no" android:inputType="numberSigned" @@ -667,7 +667,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="30dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_point_section_title" android:textColor="@color/color_eeeeee" @@ -703,7 +703,7 @@ android:id="@+id/tv_available_point" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_point_available" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -732,7 +732,7 @@ android:id="@+id/tv_not_available_point" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_point_unavailable" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -750,7 +750,7 @@ @@ -813,7 +813,7 @@ android:id="@+id/tv_preview_no" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_preview_not_generate" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -830,7 +830,7 @@ @@ -999,7 +999,7 @@ android:id="@+id/tv_age_19" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_age_19" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -1027,7 +1027,7 @@ @@ -1090,7 +1090,7 @@ android:id="@+id/tv_comment_no" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_comment_disallow" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -1109,7 +1109,7 @@ @@ -1172,7 +1172,7 @@ android:id="@+id/tv_active_reservation" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_active_reservation" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -1265,7 +1265,7 @@ android:layout_marginEnd="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_audio_content_upload_cancel" android:textColor="@color/color_3bb9f1" @@ -1278,7 +1278,7 @@ android:layout_marginStart="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_audio_content_upload_submit" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_audition_detail.xml b/app/src/main/res/layout/activity_audition_detail.xml index 641e3d6f..d8b62030 100644 --- a/app/src/main/res/layout/activity_audition_detail.xml +++ b/app/src/main/res/layout/activity_audition_detail.xml @@ -46,7 +46,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="15dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audition_detail_info_title" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" @@ -88,7 +88,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audition_detail_roles_title" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/activity_audition_role_detail.xml b/app/src/main/res/layout/activity_audition_role_detail.xml index b60149e1..f28d26a9 100644 --- a/app/src/main/res/layout/activity_audition_role_detail.xml +++ b/app/src/main/res/layout/activity_audition_role_detail.xml @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="12dp" android:text="@string/screen_audition_role_original_work" @@ -66,7 +66,7 @@ android:layout_marginStart="14dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="12dp" android:text="@string/screen_audition_role_script" @@ -80,7 +80,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="15dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audition_role_info_title" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" @@ -233,7 +233,7 @@ android:layout_marginEnd="19dp" android:layout_marginBottom="19dp" android:background="@drawable/bg_round_corner_44_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:padding="14dp" android:text="@string/screen_audition_apply" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_can_coupon.xml b/app/src/main/res/layout/activity_can_coupon.xml index 3b597db5..38a85e81 100644 --- a/app/src/main/res/layout/activity_can_coupon.xml +++ b/app/src/main/res/layout/activity_can_coupon.xml @@ -23,7 +23,7 @@ @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_marginTop="21.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_can_coupon_submit" @@ -73,7 +73,7 @@ @@ -98,7 +98,7 @@ diff --git a/app/src/main/res/layout/activity_can_payment.xml b/app/src/main/res/layout/activity_can_payment.xml index 60db382d..d3a96960 100644 --- a/app/src/main/res/layout/activity_can_payment.xml +++ b/app/src/main/res/layout/activity_can_payment.xml @@ -53,7 +53,7 @@ android:id="@+id/tv_charge_can_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" @@ -64,7 +64,7 @@ android:id="@+id/tv_price" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" app:layout_constraintBottom_toBottomOf="parent" @@ -78,7 +78,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="26.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_can_payment_select_method" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -204,7 +204,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="23.3sp" tools:text="3,300원" /> @@ -217,7 +217,7 @@ android:layout_height="wrap_content" android:layout_marginStart="31dp" android:background="@drawable/bg_round_corner_10_80d8ff" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_can_payment_pay" diff --git a/app/src/main/res/layout/activity_can_status.xml b/app/src/main/res/layout/activity_can_status.xml index a66d6233..dff83263 100644 --- a/app/src/main/res/layout/activity_can_status.xml +++ b/app/src/main/res/layout/activity_can_status.xml @@ -36,7 +36,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" @@ -76,7 +76,7 @@ android:id="@+id/tv_paid_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" tools:text="20,000" /> @@ -126,7 +126,7 @@ android:id="@+id/tv_reward_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" tools:text="20,000" /> @@ -187,7 +187,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_can_status_charge_action" android:textColor="@color/color_1313bc" diff --git a/app/src/main/res/layout/activity_content_settings.xml b/app/src/main/res/layout/activity_content_settings.xml index 87999caf..ec477f76 100644 --- a/app/src/main/res/layout/activity_content_settings.xml +++ b/app/src/main/res/layout/activity_content_settings.xml @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_content_settings_adult_toggle" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/activity_creator_community_modify.xml b/app/src/main/res/layout/activity_creator_community_modify.xml index 7c2d9021..215cc902 100644 --- a/app/src/main/res/layout/activity_creator_community_modify.xml +++ b/app/src/main/res/layout/activity_creator_community_modify.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_creator_community_write_image_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -121,7 +121,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_creator_community_write_content_label" android:textColor="@color/color_eeeeee" @@ -182,7 +182,7 @@ @@ -245,7 +245,7 @@ android:id="@+id/tv_comment_no" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_creator_community_write_comment_disabled" android:textColor="@color/color_80d8ff" android:textSize="14.7sp" /> @@ -264,7 +264,7 @@ @@ -327,7 +327,7 @@ android:id="@+id/tv_age_19" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_creator_community_write_age_19_plus" android:textColor="@color/color_80d8ff" android:textSize="14.7sp" /> @@ -350,7 +350,7 @@ android:layout_marginEnd="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_creator_community_write_close" android:textColor="@color/color_3bb9f1" @@ -363,7 +363,7 @@ android:layout_marginStart="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_creator_community_modify_submit" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_creator_community_write.xml b/app/src/main/res/layout/activity_creator_community_write.xml index c040ba11..dc7fc1bf 100644 --- a/app/src/main/res/layout/activity_creator_community_write.xml +++ b/app/src/main/res/layout/activity_creator_community_write.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_creator_community_write_image_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -119,7 +119,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_creator_community_write_record_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -178,7 +178,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_creator_community_write_content_label" android:textColor="@color/color_eeeeee" @@ -239,7 +239,7 @@ @@ -302,7 +302,7 @@ android:id="@+id/tv_comment_no" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_creator_community_write_comment_disabled" android:textColor="@color/color_80d8ff" android:textSize="14.7sp" /> @@ -321,7 +321,7 @@ @@ -384,7 +384,7 @@ android:id="@+id/tv_age_19" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_creator_community_write_age_19_plus" android:textColor="@color/color_80d8ff" android:textSize="14.7sp" /> @@ -403,7 +403,7 @@ @@ -467,7 +467,7 @@ android:id="@+id/tv_price_paid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_creator_community_write_price_paid" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -490,7 +490,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_toStartOf="@+id/tv_can" android:background="@null" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:importantForAutofill="no" android:inputType="numberDecimal" @@ -530,7 +530,7 @@ android:layout_marginEnd="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_creator_community_write_close" android:textColor="@color/color_3bb9f1" @@ -543,7 +543,7 @@ android:layout_marginStart="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_creator_community_write_submit" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_event_detail.xml b/app/src/main/res/layout/activity_event_detail.xml index 098a6e35..2436876a 100644 --- a/app/src/main/res/layout/activity_event_detail.xml +++ b/app/src/main/res/layout/activity_event_detail.xml @@ -34,7 +34,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_10_3e737c" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_event_participate" diff --git a/app/src/main/res/layout/activity_find_password.xml b/app/src/main/res/layout/activity_find_password.xml index b33682e7..765ccf18 100644 --- a/app/src/main/res/layout/activity_find_password.xml +++ b/app/src/main/res/layout/activity_find_password.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="26.7dp" android:layout_marginTop="40dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:lineSpacingExtra="6dp" android:text="@string/find_password_description_primary" @@ -81,7 +81,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="60dp" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/find_password_submit" 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 2434125e..f1baf9bd 100644 --- a/app/src/main/res/layout/activity_live_reservation_cancel.xml +++ b/app/src/main/res/layout/activity_live_reservation_cancel.xml @@ -128,7 +128,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/live_reservation_cancel_question" android:textColor="@color/color_a285eb" android:textSize="20sp" /> @@ -270,7 +270,7 @@ android:layout_marginTop="90dp" android:layout_marginBottom="13.3dp" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/live_reservation_cancel_action" @@ -290,7 +290,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/live_reservation_cancel_done" android:textColor="@color/color_a285eb" android:textSize="20sp" /> @@ -320,7 +320,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/live_reservation_cancel_other_reservation" @@ -333,7 +333,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/live_reservation_cancel_check_history" 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 78115c44..0e7fe768 100644 --- a/app/src/main/res/layout/activity_live_reservation_complete.xml +++ b/app/src/main/res/layout/activity_live_reservation_complete.xml @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_reservation_complete_message" android:textColor="@color/color_3bb9f1" android:textSize="20sp" /> @@ -41,7 +41,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="26.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_reservation_complete_info_title" android:textColor="@color/color_eeeeee" @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="26.7dp" android:layout_marginTop="20dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_reservation_complete_payment_title" android:textColor="@color/color_eeeeee" @@ -197,7 +197,7 @@ android:id="@+id/tv_have_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5.3sp" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" @@ -240,7 +240,7 @@ android:id="@+id/tv_use_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5.3sp" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" @@ -283,7 +283,7 @@ android:id="@+id/tv_remaining_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5.3sp" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" @@ -313,7 +313,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_reservation_complete_button_home" @@ -327,7 +327,7 @@ android:layout_marginStart="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_reservation_complete_button_history" diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml index 04deb443..89a45c0b 100644 --- a/app/src/main/res/layout/activity_live_room.xml +++ b/app/src/main/res/layout/activity_live_room.xml @@ -107,7 +107,7 @@ android:id="@+id/tv_notice_big" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_notice_prefix" android:textColor="@color/white" android:textSize="11.3sp" /> @@ -160,7 +160,7 @@ android:id="@+id/tv_menu_pan_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_menu_prefix" android:textColor="@color/white" android:textSize="11.3sp" /> @@ -348,7 +348,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="2.7dp" android:background="@drawable/bg_circle_ea3a25" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:padding="2.7dp" android:text="@string/screen_live_room_age_badge" android:textColor="@color/white" @@ -360,7 +360,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lines="1" android:textColor="@color/color_eeeeee" android:textSize="12sp" @@ -534,7 +534,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_bbbbbb" android:textSize="11sp" tools:ignore="RelativeOverlap,SmallSp" 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 3071f639..dbc6f644 100644 --- a/app/src/main/res/layout/activity_live_room_create.xml +++ b/app/src/main/res/layout/activity_live_room_create.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_create_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" @@ -62,7 +62,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_create_background_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -106,7 +106,7 @@ @@ -146,7 +146,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_notice" android:textColor="@color/color_eeeeee" @@ -208,7 +208,7 @@ @@ -273,7 +273,7 @@ android:id="@+id/tv_select_menu_1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_menu_preset_1" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -302,7 +302,7 @@ android:id="@+id/tv_select_menu_2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_menu_preset_2" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -331,7 +331,7 @@ android:id="@+id/tv_select_menu_3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_menu_preset_3" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -371,7 +371,7 @@ @@ -382,7 +382,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_24_3_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="13.7dp" android:text="@string/screen_profile_update_interest_select" @@ -403,7 +403,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_time_label" android:textColor="@color/color_eeeeee" @@ -439,7 +439,7 @@ android:id="@+id/tv_time_now" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_create_time_now" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -468,7 +468,7 @@ android:id="@+id/tv_time_reservation" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_create_time_reservation" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -550,7 +550,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_capacity_label" android:textColor="@color/color_eeeeee" @@ -580,7 +580,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_visibility_label" android:textColor="@color/color_eeeeee" @@ -615,7 +615,7 @@ android:id="@+id/tv_open" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_create_open_label" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -644,7 +644,7 @@ android:id="@+id/tv_private" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_create_private_label" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -663,7 +663,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_password_label" android:textColor="@color/color_eeeeee" @@ -694,7 +694,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_creator_join_label" android:textColor="@color/color_eeeeee" @@ -729,7 +729,7 @@ android:id="@+id/tv_available_join_creator_y" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_create_creator_join_available" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -758,7 +758,7 @@ android:id="@+id/tv_available_join_creator_n" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_create_creator_join_unavailable" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -777,7 +777,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_age_label" android:textColor="@color/color_eeeeee" @@ -812,7 +812,7 @@ android:id="@+id/tv_age_all" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_create_age_all" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -841,7 +841,7 @@ android:id="@+id/tv_age_19" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_age_limit_adult" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -862,7 +862,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_price_label" android:textColor="@color/color_eeeeee" @@ -881,7 +881,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_live_room_price_select" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_live_room_create_price_free" @@ -895,7 +895,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_weight="1" android:background="@drawable/bg_live_room_price_select" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_live_room_create_price_100" @@ -908,7 +908,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_live_room_price_select" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_live_room_create_price_300" @@ -929,7 +929,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_live_room_price_select" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_live_room_create_price_500" @@ -943,7 +943,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_weight="1" android:background="@drawable/bg_live_room_price_select" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_live_room_create_price_1000" @@ -956,7 +956,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_live_room_price_select" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_live_room_create_price_2000" @@ -980,7 +980,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_toStartOf="@+id/tv_can" android:background="@null" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:importantForAutofill="no" android:inputType="numberDecimal" @@ -1017,7 +1017,7 @@ android:layout_height="50dp" android:layout_margin="13.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_live_room_create_submit" android:textColor="@color/white" 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 5df5a5a2..161d5a4d 100644 --- a/app/src/main/res/layout/activity_live_room_edit.xml +++ b/app/src/main/res/layout/activity_live_room_edit.xml @@ -34,7 +34,7 @@ @@ -73,7 +73,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_notice" android:textColor="@color/color_eeeeee" @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_time_label" android:textColor="@color/color_eeeeee" @@ -211,7 +211,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_capacity_label" android:textColor="@color/color_eeeeee" @@ -253,7 +253,7 @@ android:layout_height="50dp" android:layout_margin="13.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_live_room_profile_edit_title" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_menu_config.xml b/app/src/main/res/layout/activity_menu_config.xml index 515b1811..bf0aecc4 100644 --- a/app/src/main/res/layout/activity_menu_config.xml +++ b/app/src/main/res/layout/activity_menu_config.xml @@ -48,7 +48,7 @@ android:id="@+id/tv_select_menu_1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_menu_preset_1" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -77,7 +77,7 @@ android:id="@+id/tv_select_menu_2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_menu_preset_2" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -106,7 +106,7 @@ android:id="@+id/tv_select_menu_3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_menu_preset_3" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -140,7 +140,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_menu_config_save" diff --git a/app/src/main/res/layout/activity_modify_password.xml b/app/src/main/res/layout/activity_modify_password.xml index de943d20..8cd3cd52 100644 --- a/app/src/main/res/layout/activity_modify_password.xml +++ b/app/src/main/res/layout/activity_modify_password.xml @@ -166,7 +166,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginVertical="13.7dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_modify_password_submit" diff --git a/app/src/main/res/layout/activity_nickname_update.xml b/app/src/main/res/layout/activity_nickname_update.xml index 58cd59e5..eaba0486 100644 --- a/app/src/main/res/layout/activity_nickname_update.xml +++ b/app/src/main/res/layout/activity_nickname_update.xml @@ -78,7 +78,7 @@ android:layout_marginHorizontal="20dp" android:layout_marginTop="21.3dp" android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="13.3dp" android:text="@string/screen_nickname_update_check" @@ -100,7 +100,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_nickname_update_submit" diff --git a/app/src/main/res/layout/activity_notification_settings.xml b/app/src/main/res/layout/activity_notification_settings.xml index e54422b3..55a74dee 100644 --- a/app/src/main/res/layout/activity_notification_settings.xml +++ b/app/src/main/res/layout/activity_notification_settings.xml @@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/notification_settings_live" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -61,7 +61,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/notification_settings_upload" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -93,7 +93,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/notification_settings_message" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/activity_point_status.xml b/app/src/main/res/layout/activity_point_status.xml index 98c97e46..f059750c 100644 --- a/app/src/main/res/layout/activity_point_status.xml +++ b/app/src/main/res/layout/activity_point_status.xml @@ -35,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" diff --git a/app/src/main/res/layout/activity_profile_update.xml b/app/src/main/res/layout/activity_profile_update.xml index 721b23a7..41e1e8ec 100644 --- a/app/src/main/res/layout/activity_profile_update.xml +++ b/app/src/main/res/layout/activity_profile_update.xml @@ -136,7 +136,7 @@ android:layout_alignParentEnd="true" android:layout_marginStart="13.3dp" android:background="@drawable/bg_round_corner_8_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:paddingHorizontal="22.7dp" android:paddingVertical="13.3dp" android:text="@string/screen_profile_update_change_password" @@ -204,7 +204,7 @@ android:layout_alignParentEnd="true" android:layout_marginStart="13.3dp" android:background="@drawable/bg_round_corner_8_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:paddingHorizontal="22.7dp" android:paddingVertical="13.3dp" android:text="@string/screen_profile_update_change_nickname" @@ -223,7 +223,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_profile_update_gender_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -438,7 +438,7 @@ @@ -449,7 +449,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_24_3_333bb9f1_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="13.7dp" android:text="@string/screen_profile_update_interest_select" @@ -483,7 +483,7 @@ @@ -105,7 +105,7 @@ android:id="@+id/tv_select_roulette_2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_roulette_config_preset_2" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -134,7 +134,7 @@ android:id="@+id/tv_select_roulette_3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_roulette_config_preset_3" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -153,7 +153,7 @@ android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_roulette_config_activate_question" android:textColor="@color/color_eeeeee" android:textSize="16sp" /> @@ -172,7 +172,7 @@ android:layout_height="wrap_content" android:layout_marginTop="26.7dp" android:layout_marginBottom="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_roulette_config_price_label" android:textColor="@color/color_eeeeee" android:textSize="16sp" /> @@ -209,7 +209,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_create_price_unit" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -219,7 +219,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="26.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_roulette_config_option_label" android:textColor="@color/color_eeeeee" android:textSize="16sp" /> @@ -302,7 +302,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_roulette_config_preview" @@ -316,7 +316,7 @@ android:layout_marginStart="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_roulette_config_save" diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index a4629ccd..4d6d6f37 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_search_creator_title" android:textColor="@color/color_eeeeee" android:textSize="16sp" /> @@ -122,7 +122,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_search_content_title" android:textColor="@color/color_eeeeee" android:textSize="16sp" /> @@ -153,7 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_search_series_title" android:textColor="@color/color_eeeeee" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/activity_series_detail.xml b/app/src/main/res/layout/activity_series_detail.xml index 8cf92cca..a4e7aa79 100644 --- a/app/src/main/res/layout/activity_series_detail.xml +++ b/app/src/main/res/layout/activity_series_detail.xml @@ -75,7 +75,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="27dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" tools:text="The 야한 남친" /> diff --git a/app/src/main/res/layout/activity_service_center.xml b/app/src/main/res/layout/activity_service_center.xml index 41e346c9..f1dd19df 100644 --- a/app/src/main/res/layout/activity_service_center.xml +++ b/app/src/main/res/layout/activity_service_center.xml @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_service_center_logo_label" android:textColor="@color/color_eeeeee" android:textSize="20sp" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_service_center_kakao" android:textColor="@color/black" android:textSize="13.3sp" @@ -67,7 +67,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_service_center_faq_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 88687271..c7d1bdcc 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_settings_notification" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -73,7 +73,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_settings_content" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -106,7 +106,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_settings_language" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -141,7 +141,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_settings_terms" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -174,7 +174,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_settings_privacy" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -207,7 +207,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_settings_oss_license" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -236,7 +236,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_settings_app_version" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -272,7 +272,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="46.7dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="19.3dp" android:text="@string/screen_settings_logout" diff --git a/app/src/main/res/layout/activity_sign_out.xml b/app/src/main/res/layout/activity_sign_out.xml index 5f3573e6..691d74c5 100644 --- a/app/src/main/res/layout/activity_sign_out.xml +++ b/app/src/main/res/layout/activity_sign_out.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_sign_out_question" android:textColor="@color/color_3bb9f1" android:textSize="20sp" /> @@ -286,7 +286,7 @@ android:layout_marginTop="53.3dp" android:layout_marginBottom="13.3dp" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_sign_out_submit" 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 b859df70..9875bbd8 100644 --- a/app/src/main/res/layout/activity_text_message_detail.xml +++ b/app/src/main/res/layout/activity_text_message_detail.xml @@ -34,7 +34,7 @@ android:id="@+id/tv_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" tools:text="이재형 대표님" /> @@ -91,7 +91,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_message_detail_action_reply" android:textColor="@color/color_eeeeee" @@ -104,7 +104,7 @@ android:layout_marginHorizontal="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_message_detail_action_keep" android:textColor="@color/color_3bb9f1" @@ -116,7 +116,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_message_detail_action_delete" android:textColor="@color/color_3bb9f1" 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 1dd866ec..68fa8788 100644 --- a/app/src/main/res/layout/activity_text_message_write.xml +++ b/app/src/main/res/layout/activity_text_message_write.xml @@ -16,7 +16,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_message_write_title_new" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -118,7 +118,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginBottom="13.3dp" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_message_write_button_send" android:textColor="@color/color_eeeeee" diff --git a/app/src/main/res/layout/activity_user_follower_list.xml b/app/src/main/res/layout/activity_user_follower_list.xml index 387bea6c..01fdbacb 100644 --- a/app/src/main/res/layout/activity_user_follower_list.xml +++ b/app/src/main/res/layout/activity_user_follower_list.xml @@ -16,7 +16,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_marginTop="26.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_user_follower_list_total_label" android:textColor="@color/white" android:textSize="18.3sp" diff --git a/app/src/main/res/layout/activity_user_profile_live_all.xml b/app/src/main/res/layout/activity_user_profile_live_all.xml index ad79ecd7..eec85e0d 100644 --- a/app/src/main/res/layout/activity_user_profile_live_all.xml +++ b/app/src/main/res/layout/activity_user_profile_live_all.xml @@ -29,7 +29,7 @@ @@ -71,7 +71,7 @@ @@ -81,7 +81,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toStartOf="@+id/tv_unit_today" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="12sp" tools:ignore="RelativeOverlap" /> @@ -105,7 +105,7 @@ @@ -115,7 +115,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toStartOf="@+id/tv_unit_last_week" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="12sp" tools:ignore="RelativeOverlap" /> @@ -139,7 +139,7 @@ @@ -149,7 +149,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toStartOf="@+id/tv_unit_this_month" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="12sp" tools:ignore="RelativeOverlap" /> diff --git a/app/src/main/res/layout/detail_toolbar.xml b/app/src/main/res/layout/detail_toolbar.xml index d5000265..3046c7cc 100644 --- a/app/src/main/res/layout/detail_toolbar.xml +++ b/app/src/main/res/layout/detail_toolbar.xml @@ -14,7 +14,7 @@ android:layout_centerVertical="true" android:drawablePadding="6.7dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:minHeight="48dp" android:textColor="@color/color_eeeeee" diff --git a/app/src/main/res/layout/dialog_application_method.xml b/app/src/main/res/layout/dialog_application_method.xml index 1c653556..49c15929 100644 --- a/app/src/main/res/layout/dialog_application_method.xml +++ b/app/src/main/res/layout/dialog_application_method.xml @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="33.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/dialog_audition_method_title" android:textColor="@color/color_bbbbbb" 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 0109927b..e6f46978 100644 --- a/app/src/main/res/layout/dialog_audio_content_delete.xml +++ b/app/src/main/res/layout/dialog_audio_content_delete.xml @@ -13,7 +13,7 @@ @@ -143,7 +143,7 @@ android:id="@+id/tv_point" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" android:visibility="gone" @@ -172,7 +172,7 @@ android:id="@+id/tv_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:text="300" /> @@ -190,7 +190,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="15.7dp" android:text="@string/cancel" @@ -204,7 +204,7 @@ android:layout_marginStart="12dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="15.7dp" android:text="@string/confirm" 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 524d3d74..049a9ad9 100644 --- a/app/src/main/res/layout/dialog_audio_content_report.xml +++ b/app/src/main/res/layout/dialog_audio_content_report.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_detail_report_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -120,7 +120,7 @@ android:layout_marginEnd="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="15.7dp" android:text="@string/cancel" @@ -134,7 +134,7 @@ android:layout_marginStart="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="15.7dp" android:text="@string/report_button" diff --git a/app/src/main/res/layout/dialog_community_post_report.xml b/app/src/main/res/layout/dialog_community_post_report.xml index fad6dc9e..b540cfed 100644 --- a/app/src/main/res/layout/dialog_community_post_report.xml +++ b/app/src/main/res/layout/dialog_community_post_report.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/dialog_community_post_report_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -120,7 +120,7 @@ android:layout_marginEnd="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="15.7dp" android:text="@string/cancel" @@ -134,7 +134,7 @@ android:layout_marginStart="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="15.7dp" android:text="@string/report_button" diff --git a/app/src/main/res/layout/dialog_live.xml b/app/src/main/res/layout/dialog_live.xml index 97ee79f2..1e37944c 100644 --- a/app/src/main/res/layout/dialog_live.xml +++ b/app/src/main/res/layout/dialog_live.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/color_bbbbbb" android:textSize="18.3sp" @@ -54,7 +54,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/color_3bb9f1" @@ -67,7 +67,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/white" diff --git a/app/src/main/res/layout/dialog_live_input.xml b/app/src/main/res/layout/dialog_live_input.xml index a9ffef18..8f5a7424 100644 --- a/app/src/main/res/layout/dialog_live_input.xml +++ b/app/src/main/res/layout/dialog_live_input.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/color_bbbbbb" android:textSize="18.3sp" @@ -63,7 +63,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/color_3bb9f1" @@ -76,7 +76,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/white" diff --git a/app/src/main/res/layout/dialog_live_no_chatting.xml b/app/src/main/res/layout/dialog_live_no_chatting.xml index b2b1338c..4d64158f 100644 --- a/app/src/main/res/layout/dialog_live_no_chatting.xml +++ b/app/src/main/res/layout/dialog_live_no_chatting.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_live_room_dialog_title_no_chat" android:textColor="@color/color_bbbbbb" @@ -83,7 +83,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/cancel" @@ -96,7 +96,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_ok" diff --git a/app/src/main/res/layout/dialog_live_payment.xml b/app/src/main/res/layout/dialog_live_payment.xml index e88875a2..3fb11a82 100644 --- a/app/src/main/res/layout/dialog_live_payment.xml +++ b/app/src/main/res/layout/dialog_live_payment.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/color_bbbbbb" android:textSize="18.3sp" @@ -117,7 +117,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/color_3bb9f1" @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:layout_weight="2" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/white" diff --git a/app/src/main/res/layout/dialog_live_room_donation.xml b/app/src/main/res/layout/dialog_live_room_donation.xml index b89f251a..b679fa58 100644 --- a/app/src/main/res/layout/dialog_live_room_donation.xml +++ b/app/src/main/res/layout/dialog_live_room_donation.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center_vertical" android:text="@string/screen_live_room_donation_title" android:textColor="@color/color_eeeeee" @@ -41,7 +41,7 @@ android:layout_marginEnd="6.7dp" android:layout_toStartOf="@+id/tv_charge" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="16sp" @@ -122,7 +122,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="12.7dp" android:text="@string/screen_live_room_donation_plus_10" @@ -136,7 +136,7 @@ android:layout_marginStart="8dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="12.7dp" android:text="@string/screen_live_room_donation_plus_100" @@ -150,7 +150,7 @@ android:layout_marginStart="8dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="12.7dp" android:text="@string/screen_live_room_donation_plus_1000" @@ -164,7 +164,7 @@ android:layout_marginStart="8dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="12.7dp" android:text="@string/screen_live_room_donation_plus_10000" @@ -224,7 +224,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_cancel" @@ -237,7 +237,7 @@ android:layout_height="wrap_content" android:layout_weight="1.5" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_donation_title" diff --git a/app/src/main/res/layout/dialog_live_room_donation_message.xml b/app/src/main/res/layout/dialog_live_room_donation_message.xml index c602feef..6a651c1d 100644 --- a/app/src/main/res/layout/dialog_live_room_donation_message.xml +++ b/app/src/main/res/layout/dialog_live_room_donation_message.xml @@ -18,7 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_donation_history_title" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" diff --git a/app/src/main/res/layout/dialog_live_room_donation_ranking.xml b/app/src/main/res/layout/dialog_live_room_donation_ranking.xml index ca7f13a7..29dff7c8 100644 --- a/app/src/main/res/layout/dialog_live_room_donation_ranking.xml +++ b/app/src/main/res/layout/dialog_live_room_donation_ranking.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:layout_marginStart="20dp" android:layout_marginTop="20dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_donation_ranking_title" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -52,7 +52,7 @@ @@ -68,7 +68,7 @@ @@ -100,7 +100,7 @@ diff --git a/app/src/main/res/layout/dialog_live_room_heart_ranking.xml b/app/src/main/res/layout/dialog_live_room_heart_ranking.xml index 52f15ede..6fdab76f 100644 --- a/app/src/main/res/layout/dialog_live_room_heart_ranking.xml +++ b/app/src/main/res/layout/dialog_live_room_heart_ranking.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:layout_marginStart="20dp" android:layout_marginTop="20dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_heart_ranking_title" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -45,7 +45,7 @@ android:id="@+id/tv_total_heart_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_total_label" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/dialog_live_room_info_update.xml b/app/src/main/res/layout/dialog_live_room_info_update.xml index 88fd0227..5aa64ee4 100644 --- a/app/src/main/res/layout/dialog_live_room_info_update.xml +++ b/app/src/main/res/layout/dialog_live_room_info_update.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_profile_edit_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -76,7 +76,7 @@ @@ -110,7 +110,7 @@ @@ -190,7 +190,7 @@ @@ -255,7 +255,7 @@ android:id="@+id/tv_select_menu_1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_menu_preset_1" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -284,7 +284,7 @@ android:id="@+id/tv_select_menu_2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_menu_preset_2" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -313,7 +313,7 @@ android:id="@+id/tv_select_menu_3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_live_room_menu_preset_3" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -353,7 +353,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_entry_message_label" android:textColor="@color/color_eeeeee" @@ -384,7 +384,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_cancel" @@ -397,7 +397,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_update_action" diff --git a/app/src/main/res/layout/dialog_live_room_password.xml b/app/src/main/res/layout/dialog_live_room_password.xml index a7c1cd3d..c7e52385 100644 --- a/app/src/main/res/layout/dialog_live_room_password.xml +++ b/app/src/main/res/layout/dialog_live_room_password.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_live_room_password_title" android:textColor="@color/color_bbbbbb" @@ -96,7 +96,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_cancel" @@ -117,7 +117,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/white" android:textSize="18.3sp" @@ -128,7 +128,7 @@ android:id="@+id/tv_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/white" android:textSize="18.3sp" diff --git a/app/src/main/res/layout/dialog_live_room_profile.xml b/app/src/main/res/layout/dialog_live_room_profile.xml index 488115df..d34d3f0a 100644 --- a/app/src/main/res/layout/dialog_live_room_profile.xml +++ b/app/src/main/res/layout/dialog_live_room_profile.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center_vertical" android:text="@string/screen_live_room_participants" android:textColor="@color/color_eeeeee" diff --git a/app/src/main/res/layout/dialog_live_room_user_profile.xml b/app/src/main/res/layout/dialog_live_room_user_profile.xml index 49e4557a..39594bee 100644 --- a/app/src/main/res/layout/dialog_live_room_user_profile.xml +++ b/app/src/main/res/layout/dialog_live_room_user_profile.xml @@ -19,7 +19,7 @@ @@ -59,7 +59,7 @@ android:id="@+id/tv_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" tools:text="닉네임" /> @@ -116,7 +116,7 @@ android:layout_marginTop="21.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="13dp" android:text="@string/screen_live_room_invite_speaker" @@ -131,7 +131,7 @@ android:layout_marginTop="21.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="13dp" android:text="@string/screen_live_room_set_manager" @@ -146,7 +146,7 @@ android:layout_marginTop="21.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="13dp" android:text="@string/screen_live_room_kick_confirm" @@ -160,7 +160,7 @@ android:layout_height="wrap_content" android:layout_marginTop="21.3dp" android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="13dp" android:text="@string/screen_live_room_no_chatting_three_minutes" diff --git a/app/src/main/res/layout/dialog_member_profile.xml b/app/src/main/res/layout/dialog_member_profile.xml index 8f2e9d6a..d521a692 100644 --- a/app/src/main/res/layout/dialog_member_profile.xml +++ b/app/src/main/res/layout/dialog_member_profile.xml @@ -19,7 +19,7 @@ @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="21.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" tools:text="닉네임" /> @@ -63,7 +63,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="13dp" android:text="@string/screen_live_room_block_title" @@ -76,7 +76,7 @@ android:layout_marginHorizontal="8dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="13dp" android:text="@string/dialog_user_report_title" @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="13dp" android:text="@string/dialog_member_profile_report_profile" diff --git a/app/src/main/res/layout/dialog_notification_settings.xml b/app/src/main/res/layout/dialog_notification_settings.xml index a61759f2..11f12d5d 100644 --- a/app/src/main/res/layout/dialog_notification_settings.xml +++ b/app/src/main/res/layout/dialog_notification_settings.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_notification_settings_title" android:textColor="@color/color_eeeeee" @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/notification_settings_live" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -61,7 +61,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/notification_settings_upload" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -94,7 +94,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/notification_settings_message" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -117,7 +117,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="26.7dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/notification_settings_confirm" diff --git a/app/src/main/res/layout/dialog_purchase_community_post.xml b/app/src/main/res/layout/dialog_purchase_community_post.xml index 584ca321..1c97fd6e 100644 --- a/app/src/main/res/layout/dialog_purchase_community_post.xml +++ b/app/src/main/res/layout/dialog_purchase_community_post.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/dialog_purchase_community_post_title" android:textColor="@color/color_bbbbbb" @@ -55,7 +55,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/cancel" @@ -69,7 +69,7 @@ android:layout_weight="2" android:background="@drawable/bg_round_corner_10_3bb9f1" android:paddingVertical="16dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/white" android:textSize="18.3sp" diff --git a/app/src/main/res/layout/dialog_roulette_preview.xml b/app/src/main/res/layout/dialog_roulette_preview.xml index 1e20b1ac..0f1fe343 100644 --- a/app/src/main/res/layout/dialog_roulette_preview.xml +++ b/app/src/main/res/layout/dialog_roulette_preview.xml @@ -38,7 +38,7 @@ android:id="@+id/tv_select_roulette_1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_roulette_config_preset_1" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -67,7 +67,7 @@ android:id="@+id/tv_select_roulette_2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_roulette_config_preset_2" android:textColor="@color/color_ffcb14" android:textSize="14.7sp" /> @@ -97,7 +97,7 @@ android:id="@+id/tv_select_roulette_3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_roulette_config_preset_3" android:textColor="@color/color_ff14d9" android:textSize="14.7sp" /> @@ -114,7 +114,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/white" android:textSize="18.3sp" /> @@ -124,7 +124,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="16sp" @@ -153,7 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_10_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingHorizontal="18dp" android:paddingVertical="16dp" @@ -168,7 +168,7 @@ android:layout_marginStart="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/white" diff --git a/app/src/main/res/layout/dialog_soda.xml b/app/src/main/res/layout/dialog_soda.xml index a10f806d..caa55b57 100644 --- a/app/src/main/res/layout/dialog_soda.xml +++ b/app/src/main/res/layout/dialog_soda.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/color_bbbbbb" android:textSize="18.3sp" @@ -53,7 +53,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/color_3bb9f1" @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:layout_weight="2" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/white" diff --git a/app/src/main/res/layout/fragment_audio_content_main.xml b/app/src/main/res/layout/fragment_audio_content_main.xml index dd336d37..45f1356c 100644 --- a/app/src/main/res/layout/fragment_audio_content_main.xml +++ b/app/src/main/res/layout/fragment_audio_content_main.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_toStartOf="@+id/iv_alarm" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_market_title" android:textColor="@color/color_3bb9f1" android:textSize="21.3sp" /> @@ -108,7 +108,7 @@ android:id="@+id/tv_creator_rank_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:paddingHorizontal="13.3dp" android:text="@string/audio_content_creator_rank_title" android:textColor="@color/color_eeeeee" @@ -127,7 +127,7 @@ android:id="@+id/tv_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -161,7 +161,7 @@ @@ -320,7 +320,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_ranking_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -348,7 +348,7 @@ android:id="@+id/tv_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -425,7 +425,7 @@ diff --git a/app/src/main/res/layout/fragment_audio_content_main_tab_alarm.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_alarm.xml index e1d4cb48..8992e024 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_alarm.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_alarm.xml @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_alarm_new_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/fragment_audio_content_main_tab_asmr.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_asmr.xml index a30b3771..b34c46e5 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_asmr.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_asmr.xml @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_asmr_new_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_asmr_channel_recommend_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/fragment_audio_content_main_tab_content.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_content.xml index cc002a62..8ec697c3 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_content.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_content.xml @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_content_new_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -85,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_content_daily_ranking_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -118,7 +118,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_content_channel_recommend_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -196,7 +196,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_content_tag_recommend_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/fragment_audio_content_main_tab_free.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_free.xml index 6b8fa508..aaee476b 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_free.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_free.xml @@ -40,7 +40,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_free_creator_intro_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -76,7 +76,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_free_recommend_series_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -106,7 +106,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_free_new_content_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -150,7 +150,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_free_channel_recommend_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/fragment_audio_content_main_tab_home.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_home.xml index 86f70635..be543e37 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_home.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_home.xml @@ -28,7 +28,7 @@ android:layout_alignParentStart="true" android:layout_centerVertical="true" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center_vertical" android:text="@string/app_name" android:textColor="@color/white" @@ -387,7 +387,7 @@ android:id="@+id/tv_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" tools:text="2023년 10월 16일~10월 22일" /> @@ -407,7 +407,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="30dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:paddingHorizontal="13.3dp" android:text="@string/audio_content_home_creator_title" android:textColor="@color/color_eeeeee" @@ -433,7 +433,7 @@ @@ -521,7 +521,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_home_channel_content_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -608,7 +608,7 @@ diff --git a/app/src/main/res/layout/fragment_audio_content_main_tab_replay.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_replay.xml index 8a8fe0ce..4c1ce164 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_replay.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_replay.xml @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_replay_new_live_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_replay_channel_live_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/fragment_audio_content_main_tab_series.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_series.xml index 380029c8..4b1cca6e 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_series.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_series.xml @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_series_original_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -77,7 +77,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_series_daily_ranking_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -103,7 +103,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_series_genre_recommend_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -167,7 +167,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_series_new_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -197,7 +197,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_series_complete_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -233,7 +233,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_series_channel_recommend_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/fragment_audio_content_order.xml b/app/src/main/res/layout/fragment_audio_content_order.xml index b1449f3f..545850b1 100644 --- a/app/src/main/res/layout/fragment_audio_content_order.xml +++ b/app/src/main/res/layout/fragment_audio_content_order.xml @@ -19,7 +19,7 @@ @@ -57,7 +57,7 @@ android:id="@+id/tv_rental" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:text="300" /> @@ -79,7 +79,7 @@ @@ -118,7 +118,7 @@ android:id="@+id/tv_keep" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:text="500" /> diff --git a/app/src/main/res/layout/fragment_audio_content_playlist_list.xml b/app/src/main/res/layout/fragment_audio_content_playlist_list.xml index 50765a8b..5ff4b619 100644 --- a/app/src/main/res/layout/fragment_audio_content_playlist_list.xml +++ b/app/src/main/res/layout/fragment_audio_content_playlist_list.xml @@ -13,7 +13,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_5_3_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="13.3dp" android:text="@string/audio_content_playlist_create" @@ -81,7 +81,7 @@ diff --git a/app/src/main/res/layout/fragment_audio_content_theme.xml b/app/src/main/res/layout/fragment_audio_content_theme.xml index b3c2a9ae..af86daa1 100644 --- a/app/src/main/res/layout/fragment_audio_content_theme.xml +++ b/app/src/main/res/layout/fragment_audio_content_theme.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:layout_marginStart="26.7dp" android:layout_marginTop="26.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audio_content_upload_theme_select" android:textColor="@color/white" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/fragment_audition_apply_dialog.xml b/app/src/main/res/layout/fragment_audition_apply_dialog.xml index ace21d15..35fe30de 100644 --- a/app/src/main/res/layout/fragment_audition_apply_dialog.xml +++ b/app/src/main/res/layout/fragment_audition_apply_dialog.xml @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/dialog_audition_apply_audio_file_title" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -71,7 +71,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/dialog_audition_apply_phone_title" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -128,7 +128,7 @@ android:layout_height="wrap_content" android:layout_marginTop="35dp" android:background="@drawable/bg_round_corner_8_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="13.3dp" android:text="@string/dialog_audition_apply_submit" diff --git a/app/src/main/res/layout/fragment_creator_follow_notify.xml b/app/src/main/res/layout/fragment_creator_follow_notify.xml index d20bf74d..9c86e90f 100644 --- a/app/src/main/res/layout/fragment_creator_follow_notify.xml +++ b/app/src/main/res/layout/fragment_creator_follow_notify.xml @@ -9,7 +9,7 @@ diff --git a/app/src/main/res/layout/fragment_creator_tag.xml b/app/src/main/res/layout/fragment_creator_tag.xml index 348ff5e0..f16fb42e 100644 --- a/app/src/main/res/layout/fragment_creator_tag.xml +++ b/app/src/main/res/layout/fragment_creator_tag.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:layout_marginStart="26.7dp" android:layout_marginTop="26.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_member_tag_title" android:textColor="@color/white" android:textSize="18.3sp" /> @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_margin="13.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_member_tag_confirm" 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 649f737a..0cad34f5 100644 --- a/app/src/main/res/layout/fragment_live_room_detail.xml +++ b/app/src/main/res/layout/fragment_live_room_detail.xml @@ -53,7 +53,7 @@ android:id="@+id/tv_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" tools:text="🧸여자들이 좋아하는 남자 스타일은?" /> @@ -83,7 +83,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" @@ -372,7 +372,7 @@ android:layout_marginStart="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_modify" @@ -386,7 +386,7 @@ android:layout_marginStart="13.3dp" android:layout_weight="2" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_start" @@ -431,7 +431,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:background="@drawable/bg_round_corner_10_525252" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_reservation_done" @@ -445,7 +445,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_reserve" @@ -459,7 +459,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:background="@drawable/bg_round_corner_10_ff5c49" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_join_now" diff --git a/app/src/main/res/layout/fragment_live_tag.xml b/app/src/main/res/layout/fragment_live_tag.xml index d39f11d9..fbe184ee 100644 --- a/app/src/main/res/layout/fragment_live_tag.xml +++ b/app/src/main/res/layout/fragment_live_tag.xml @@ -23,7 +23,7 @@ @@ -62,7 +62,7 @@ android:layout_alignParentBottom="true" android:layout_margin="13.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_tag_confirm" diff --git a/app/src/main/res/layout/fragment_playlist_add_content.xml b/app/src/main/res/layout/fragment_playlist_add_content.xml index 7679d861..5b6ca37d 100644 --- a/app/src/main/res/layout/fragment_playlist_add_content.xml +++ b/app/src/main/res/layout/fragment_playlist_add_content.xml @@ -16,7 +16,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_playlist_create_add_content" android:textColor="@color/color_eeeeee" android:textSize="18sp" diff --git a/app/src/main/res/layout/fragment_recording_voice.xml b/app/src/main/res/layout/fragment_recording_voice.xml index d4336338..c6907f87 100644 --- a/app/src/main/res/layout/fragment_recording_voice.xml +++ b/app/src/main/res/layout/fragment_recording_voice.xml @@ -12,7 +12,7 @@ @@ -123,7 +123,7 @@ android:layout_height="50dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_creator_community_record_retry" android:textColor="@color/color_3bb9f1" @@ -136,7 +136,7 @@ android:layout_marginStart="13.3dp" android:layout_weight="2" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:text="@string/screen_creator_community_record_complete" android:textColor="@color/white" diff --git a/app/src/main/res/layout/fragment_series_detail_home.xml b/app/src/main/res/layout/fragment_series_detail_home.xml index 88a52fb0..14550800 100644 --- a/app/src/main/res/layout/fragment_series_detail_home.xml +++ b/app/src/main/res/layout/fragment_series_detail_home.xml @@ -19,7 +19,7 @@ diff --git a/app/src/main/res/layout/fragment_series_detail_introduction.xml b/app/src/main/res/layout/fragment_series_detail_introduction.xml index 504f5374..c87d6bba 100644 --- a/app/src/main/res/layout/fragment_series_detail_introduction.xml +++ b/app/src/main/res/layout/fragment_series_detail_introduction.xml @@ -10,7 +10,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="16dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_series_detail_section_keywords" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="16dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_series_detail_section_introduction" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="16dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_series_detail_section_info" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -205,7 +205,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="18.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_series_detail_section_price" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> 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 634a0524..f450b744 100644 --- a/app/src/main/res/layout/fragment_voice_message_write.xml +++ b/app/src/main/res/layout/fragment_voice_message_write.xml @@ -13,7 +13,7 @@ @@ -155,7 +155,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:padding="13dp" android:text="@string/audio_content_playlist_modify_save" android:textColor="@color/white" /> 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 07548a80..c907aa3e 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 @@ -83,7 +83,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/white" android:textSize="12sp" tools:text="1,000" /> @@ -133,7 +133,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:padding="13dp" android:text="@string/audio_content_playlist_modify_save" android:textColor="@color/white" /> diff --git a/app/src/main/res/layout/item_audio_content_main_curation.xml b/app/src/main/res/layout/item_audio_content_main_curation.xml index 24fa8455..6ec1e1bf 100644 --- a/app/src/main/res/layout/item_audio_content_main_curation.xml +++ b/app/src/main/res/layout/item_audio_content_main_curation.xml @@ -8,7 +8,7 @@ android:id="@+id/tv_title" android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:paddingHorizontal="13.3dp" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" diff --git a/app/src/main/res/layout/item_audio_content_main_ranking.xml b/app/src/main/res/layout/item_audio_content_main_ranking.xml index 422953c9..1b9beefd 100644 --- a/app/src/main/res/layout/item_audio_content_main_ranking.xml +++ b/app/src/main/res/layout/item_audio_content_main_ranking.xml @@ -18,7 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="12dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_3bb9f1" android:textSize="16.7sp" tools:text="1" /> diff --git a/app/src/main/res/layout/item_audio_content_main_series_ranking.xml b/app/src/main/res/layout/item_audio_content_main_series_ranking.xml index c51fe214..a0a92f49 100644 --- a/app/src/main/res/layout/item_audio_content_main_series_ranking.xml +++ b/app/src/main/res/layout/item_audio_content_main_series_ranking.xml @@ -18,7 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="12dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_3bb9f1" android:textSize="16.7sp" tools:text="1" /> diff --git a/app/src/main/res/layout/item_audio_content_ranking_all.xml b/app/src/main/res/layout/item_audio_content_ranking_all.xml index 57c88804..f8226581 100644 --- a/app/src/main/res/layout/item_audio_content_ranking_all.xml +++ b/app/src/main/res/layout/item_audio_content_ranking_all.xml @@ -18,7 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="11dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_3bb9f1" android:textSize="16.7sp" app:layout_constraintBottom_toBottomOf="@+id/iv_cover" diff --git a/app/src/main/res/layout/item_audition_list_completed_header.xml b/app/src/main/res/layout/item_audition_list_completed_header.xml index 39834222..44ecfecc 100644 --- a/app/src/main/res/layout/item_audition_list_completed_header.xml +++ b/app/src/main/res/layout/item_audition_list_completed_header.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="30dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audition_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audition_off" android:textColor="@color/color_bbbbbb" android:textSize="18.3sp" diff --git a/app/src/main/res/layout/item_audition_list_in_progress_header.xml b/app/src/main/res/layout/item_audition_list_in_progress_header.xml index 5d8f4109..30a0f933 100644 --- a/app/src/main/res/layout/item_audition_list_in_progress_header.xml +++ b/app/src/main/res/layout/item_audition_list_in_progress_header.xml @@ -9,7 +9,7 @@ android:id="@+id/tv_audition_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audition_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/screen_audition_on" android:textColor="@color/color_ff5c49" android:textSize="18.3sp" diff --git a/app/src/main/res/layout/item_calendar_selected.xml b/app/src/main/res/layout/item_calendar_selected.xml index c7c721c4..65291b2e 100644 --- a/app/src/main/res/layout/item_calendar_selected.xml +++ b/app/src/main/res/layout/item_calendar_selected.xml @@ -22,7 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@android:color/white" android:textSize="15.3sp" /> diff --git a/app/src/main/res/layout/item_can_charge.xml b/app/src/main/res/layout/item_can_charge.xml index 73c94e8d..fb05cdd8 100644 --- a/app/src/main/res/layout/item_can_charge.xml +++ b/app/src/main/res/layout/item_can_charge.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" app:layout_constraintBottom_toBottomOf="parent" @@ -25,7 +25,7 @@ android:id="@+id/tv_price" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/item_can_use_status.xml b/app/src/main/res/layout/item_can_use_status.xml index feff05be..d6198d1e 100644 --- a/app/src/main/res/layout/item_can_use_status.xml +++ b/app/src/main/res/layout/item_can_use_status.xml @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" 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 4f64a44c..da55c78c 100644 --- a/app/src/main/res/layout/item_community_post_comment.xml +++ b/app/src/main/res/layout/item_community_post_comment.xml @@ -126,7 +126,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:padding="13dp" android:text="@string/audio_content_playlist_modify_save" android:textColor="@color/white" /> 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 c44acaa6..e8ae423a 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 @@ -103,7 +103,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:padding="13dp" android:text="@string/audio_content_playlist_modify_save" android:textColor="@color/white" /> diff --git a/app/src/main/res/layout/item_creator_community_all.xml b/app/src/main/res/layout/item_creator_community_all.xml index 10231a81..0e7db7d8 100644 --- a/app/src/main/res/layout/item_creator_community_all.xml +++ b/app/src/main/res/layout/item_creator_community_all.xml @@ -276,7 +276,7 @@ android:layout_height="wrap_content" android:layout_marginTop="26.7dp" android:background="@drawable/bg_round_corner_26_7_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:paddingHorizontal="21dp" android:paddingVertical="11dp" android:textColor="@color/color_3bb9f1" diff --git a/app/src/main/res/layout/item_explorer.xml b/app/src/main/res/layout/item_explorer.xml index 059e43a4..0472c17e 100644 --- a/app/src/main/res/layout/item_explorer.xml +++ b/app/src/main/res/layout/item_explorer.xml @@ -9,7 +9,7 @@ android:id="@+id/tv_title" android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:paddingHorizontal="13.3dp" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" @@ -35,7 +35,7 @@ android:id="@+id/tv_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/item_faq.xml b/app/src/main/res/layout/item_faq.xml index 6144588c..fe74ae98 100644 --- a/app/src/main/res/layout/item_faq.xml +++ b/app/src/main/res/layout/item_faq.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/faq_question_label" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> @@ -68,7 +68,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="7.5dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/faq_answer_label" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/item_live_reservation_status.xml b/app/src/main/res/layout/item_live_reservation_status.xml index bc97bf87..d80a4dff 100644 --- a/app/src/main/res/layout/item_live_reservation_status.xml +++ b/app/src/main/res/layout/item_live_reservation_status.xml @@ -97,7 +97,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_6_7_transparent_9970ff" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:padding="10.7dp" android:text="@string/live_reservation_status_cancel" android:textColor="@color/color_9970ff" diff --git a/app/src/main/res/layout/item_live_room_donation_ranking.xml b/app/src/main/res/layout/item_live_room_donation_ranking.xml index 0460a5a1..468dea75 100644 --- a/app/src/main/res/layout/item_live_room_donation_ranking.xml +++ b/app/src/main/res/layout/item_live_room_donation_ranking.xml @@ -18,7 +18,7 @@ android:layout_centerVertical="true" android:layout_marginStart="13.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:maxLength="10" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" diff --git a/app/src/main/res/layout/item_live_room_heart_ranking.xml b/app/src/main/res/layout/item_live_room_heart_ranking.xml index 3fd0c724..b376dbcb 100644 --- a/app/src/main/res/layout/item_live_room_heart_ranking.xml +++ b/app/src/main/res/layout/item_live_room_heart_ranking.xml @@ -19,7 +19,7 @@ android:layout_centerVertical="true" android:layout_marginStart="13.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:maxLength="10" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" diff --git a/app/src/main/res/layout/item_live_room_profile_header.xml b/app/src/main/res/layout/item_live_room_profile_header.xml index a277fb28..f783bb0a 100644 --- a/app/src/main/res/layout/item_live_room_profile_header.xml +++ b/app/src/main/res/layout/item_live_room_profile_header.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_eeeeee" android:textSize="13sp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/item_playlist_list.xml b/app/src/main/res/layout/item_playlist_list.xml index 7d7b65c9..346f3e3d 100644 --- a/app/src/main/res/layout/item_playlist_list.xml +++ b/app/src/main/res/layout/item_playlist_list.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:maxLines="1" android:textColor="@color/color_d2d2d2" android:textSize="14.7sp" diff --git a/app/src/main/res/layout/item_point_use_status.xml b/app/src/main/res/layout/item_point_use_status.xml index ca29dd87..ae0cb254 100644 --- a/app/src/main/res/layout/item_point_use_status.xml +++ b/app/src/main/res/layout/item_point_use_status.xml @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" diff --git a/app/src/main/res/layout/item_user_profile_donation_all.xml b/app/src/main/res/layout/item_user_profile_donation_all.xml index e7f9cfbe..1ced4549 100644 --- a/app/src/main/res/layout/item_user_profile_donation_all.xml +++ b/app/src/main/res/layout/item_user_profile_donation_all.xml @@ -49,7 +49,7 @@ android:layout_marginEnd="13.3dp" android:layout_toEndOf="@+id/rl_profile" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:maxLength="10" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" diff --git a/app/src/main/res/layout/item_user_profile_live.xml b/app/src/main/res/layout/item_user_profile_live.xml index 1554a656..e6a2bc3e 100644 --- a/app/src/main/res/layout/item_user_profile_live.xml +++ b/app/src/main/res/layout/item_user_profile_live.xml @@ -84,7 +84,7 @@ android:layout_width="0dp" android:layout_height="36.7dp" android:layout_marginStart="20dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:textSize="13.3sp" app:layout_constraintBottom_toBottomOf="@+id/rl_cover" diff --git a/app/src/main/res/layout/layout_roulette_preview_item.xml b/app/src/main/res/layout/layout_roulette_preview_item.xml index dc8aa261..fbb79609 100644 --- a/app/src/main/res/layout/layout_roulette_preview_item.xml +++ b/app/src/main/res/layout/layout_roulette_preview_item.xml @@ -10,7 +10,7 @@ android:id="@+id/tv_order" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:textColor="@color/color_e2e2e2" android:textSize="14.7sp" tools:text="1" /> diff --git a/app/src/main/res/layout/layout_user_profile.xml b/app/src/main/res/layout/layout_user_profile.xml index c86d0b7d..eebb19f6 100644 --- a/app/src/main/res/layout/layout_user_profile.xml +++ b/app/src/main/res/layout/layout_user_profile.xml @@ -44,7 +44,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@+id/iv_share" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:maxLines="1" android:textColor="@color/color_eeeeee" android:textSize="18sp" @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6.7dp" android:background="@drawable/bg_round_corner_16_7_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:paddingHorizontal="16dp" android:paddingVertical="8dp" android:text="@string/screen_user_profile_follower_list" diff --git a/app/src/main/res/layout/layout_user_profile_introduce.xml b/app/src/main/res/layout/layout_user_profile_introduce.xml index ff144934..af840c4b 100644 --- a/app/src/main/res/layout/layout_user_profile_introduce.xml +++ b/app/src/main/res/layout/layout_user_profile_introduce.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/layout/toolbar_audio_content_main.xml b/app/src/main/res/layout/toolbar_audio_content_main.xml index 20ebbb43..ee4db1b0 100644 --- a/app/src/main/res/layout/toolbar_audio_content_main.xml +++ b/app/src/main/res/layout/toolbar_audio_content_main.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_toStartOf="@+id/iv_alarm" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="@string/audio_content_market_title" android:textColor="@color/color_3bb9f1" android:textSize="21.3sp" />