diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/detail/SeriesDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/detail/SeriesDetailActivity.kt index ffcaaf8c..0a5f51d6 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/detail/SeriesDetailActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/detail/SeriesDetailActivity.kt @@ -150,7 +150,7 @@ class SeriesDetailActivity : BaseActivity( chip.setPadding(0, 0, 0, 0) chip.setTextColor(ContextCompat.getColor(applicationContext, R.color.color_d2d2d2)) - chip.typeface = ResourcesCompat.getFont(applicationContext, R.font.gmarket_sans_medium) + chip.typeface = ResourcesCompat.getFont(applicationContext, R.font.pretendard_medium) binding.chipGroup.addView(chip) } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/detail/SeriesDetailIntroductionFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/detail/SeriesDetailIntroductionFragment.kt index 73ec784d..d0bc97cb 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/detail/SeriesDetailIntroductionFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/detail/SeriesDetailIntroductionFragment.kt @@ -186,7 +186,7 @@ class SeriesDetailIntroductionFragment : BaseFragment( ) priceView.typeface = ResourcesCompat.getFont( applicationContext, - R.font.gmarket_sans_medium + R.font.pretendard_medium ) } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/iap/CanChargeIapAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/iap/CanChargeIapAdapter.kt index 5e49c325..de6bf08c 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/iap/CanChargeIapAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/iap/CanChargeIapAdapter.kt @@ -24,7 +24,7 @@ class CanChargeIapAdapter( fun bind(item: ProductDetails) { binding.tvPrice.text = item.oneTimePurchaseOfferDetails?.formattedPrice - val typeface = ResourcesCompat.getFont(context, R.font.gmarket_sans_medium) + val typeface = ResourcesCompat.getFont(context, R.font.pretendard_medium) binding.tvTitle.text = item.name.fontSpan( typeface, context.getString(R.string.screen_can_status_unit) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/pg/CanChargePgAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/pg/CanChargePgAdapter.kt index 9394ef10..222c4a15 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/pg/CanChargePgAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/pg/CanChargePgAdapter.kt @@ -25,7 +25,7 @@ class CanChargePgAdapter( currencyCode = canCharge.currency ) - val typeface = ResourcesCompat.getFont(context, R.font.gmarket_sans_medium) + val typeface = ResourcesCompat.getFont(context, R.font.pretendard_medium) binding.tvTitle.text = canCharge.title.fontSpan( typeface, context.getString(R.string.screen_can_status_unit) 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 5d034b17..a2f4b9c6 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 @@ -165,7 +165,7 @@ class CanPaymentActivity : BaseActivity( private fun paymentMethodSelectFalse(view: TextView) { view.typeface = ResourcesCompat.getFont( applicationContext, - R.font.gmarket_sans_medium + R.font.pretendard_medium ) view.setTextColor(ContextCompat.getColor(applicationContext, R.color.color_eeeeee)) 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 1bc312bd..8df52684 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 @@ -119,7 +119,7 @@ class CanPaymentTempActivity : BaseActivity( private fun paymentMethodSelectFalse(view: TextView) { view.typeface = ResourcesCompat.getFont( applicationContext, - R.font.gmarket_sans_medium + R.font.pretendard_medium ) view.setTextColor(ContextCompat.getColor(applicationContext, R.color.color_eeeeee)) diff --git a/app/src/main/res/font/gmarket_sans_medium.ttf b/app/src/main/res/font/gmarket_sans_medium.ttf deleted file mode 100755 index 2ac3b7ff..00000000 Binary files a/app/src/main/res/font/gmarket_sans_medium.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 240b4ed0..0fb35c4e 100644 --- a/app/src/main/res/layout/activity_add_alarm.xml +++ b/app/src/main/res/layout/activity_add_alarm.xml @@ -55,7 +55,7 @@ android:layout_centerVertical="true" android:layout_marginEnd="16dp" android:layout_toStartOf="@id/iv_calendar" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/white" android:textSize="12sp" /> @@ -155,7 +155,7 @@ @@ -165,7 +165,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/alarm_add_content_placeholder" android:textColor="@color/color_3bb9f1" android:textSize="12sp" /> @@ -184,7 +184,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="21dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/alarm_add_volume_label" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/activity_alarm.xml b/app/src/main/res/layout/activity_alarm.xml index be6d3235..e5bfb02f 100644 --- a/app/src/main/res/layout/activity_alarm.xml +++ b/app/src/main/res/layout/activity_alarm.xml @@ -11,7 +11,7 @@ android:id="@+id/tv_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@android:color/white" android:textSize="53sp" tools:text="6:10" /> @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="19dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@android:color/white" android:textSize="14.7sp" tools:text="7월 25일" /> @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="19dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@android:color/white" android:textSize="14.7sp" tools:text="라이브 방송 알람" /> diff --git a/app/src/main/res/layout/activity_alarm_content_all.xml b/app/src/main/res/layout/activity_alarm_content_all.xml index 371dc2ed..102b7e8a 100644 --- a/app/src/main/res/layout/activity_alarm_content_all.xml +++ b/app/src/main/res/layout/activity_alarm_content_all.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@color/color_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="13.3dp" android:paddingVertical="8dp" android:text="@string/screen_alarm_content_all_notice" @@ -40,7 +40,7 @@ @@ -253,7 +253,7 @@ android:id="@+id/tv_current_duration" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_time_default" android:textColor="@color/white" android:textSize="12sp" @@ -264,7 +264,7 @@ android:id="@+id/tv_total_duration" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_time_total_default" android:textColor="@color/white" android:textSize="12sp" @@ -324,7 +324,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_d2d2d2" android:textSize="11sp" @@ -335,7 +335,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_previous" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> @@ -369,7 +369,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_d2d2d2" android:textSize="11sp" @@ -380,7 +380,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_next" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> @@ -532,7 +532,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" tools:text="1234" /> @@ -545,7 +545,7 @@ android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_26_7_19ffffff" android:drawablePadding="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:orientation="horizontal" android:paddingHorizontal="13.3dp" @@ -577,7 +577,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_audio_content_detail_donation" android:textColor="@color/color_d2d2d2" @@ -601,7 +601,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_limited_edition" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> @@ -619,7 +619,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_6_transparent_d2d2d2" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.3dp" android:text="@string/audio_content_badge_sold_out" @@ -631,7 +631,7 @@ android:id="@+id/tv_remaining" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_remaining" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" /> @@ -650,7 +650,7 @@ android:id="@+id/tv_total_count" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" tools:text=" / 10" /> @@ -704,7 +704,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingExtra="5dp" android:maxLines="2" android:textColor="@color/color_909090" @@ -846,7 +846,7 @@ @@ -856,7 +856,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="12sp" tools:text="1,204" /> @@ -869,7 +869,7 @@ android:layout_alignParentEnd="true" android:button="@null" android:drawablePadding="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_audio_content_detail_comment_secret" android:textColor="@color/color_selected_secret" @@ -987,7 +987,7 @@ @@ -147,7 +147,7 @@ @@ -161,7 +161,7 @@ android:layout_height="200dp" android:layout_marginTop="6.7dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="top" android:hint="내용을 입력하세요" android:importantForAutofill="no" @@ -195,7 +195,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_medium" + android:fontFamily="@font/pretendard_medium" android:hint="예 : #연애 #커버곡 #태그" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -379,7 +379,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_upload_age_notice" android:textColor="@color/color_dd4500" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/activity_audio_content_new_all.xml b/app/src/main/res/layout/activity_audio_content_new_all.xml index 94c75460..4ec0e617 100644 --- a/app/src/main/res/layout/activity_audio_content_new_all.xml +++ b/app/src/main/res/layout/activity_audio_content_new_all.xml @@ -16,7 +16,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@color/color_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="13.3dp" android:paddingVertical="8dp" android:text="@string/screen_audio_content_new_all_notice" @@ -42,7 +42,7 @@ @@ -178,7 +178,7 @@ @@ -192,7 +192,7 @@ android:layout_height="200dp" android:layout_marginTop="6.7dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="top" android:hint="@string/screen_audio_content_upload_content_hint" android:importantForAutofill="no" @@ -270,7 +270,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_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_audio_content_upload_tag_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -485,7 +485,7 @@ android:id="@+id/tv_price_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_upload_price_title_keep" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" /> @@ -523,7 +523,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_upload_price_unit_can" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -539,7 +539,7 @@ android:id="@+id/tv_service_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_upload_service_period_until_end" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -548,7 +548,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_upload_price_rent_rate_notice" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -557,7 +557,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_upload_price_min_notice" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -840,7 +840,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_upload_preview_time_desc" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -860,7 +860,7 @@ @@ -896,7 +896,7 @@ @@ -1010,7 +1010,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_upload_age_notice" android:textColor="@color/color_dd4500" android:textSize="13.3sp" /> @@ -1199,7 +1199,7 @@ @@ -1210,7 +1210,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6.7dp" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingVertical="15.3dp" android:textColor="@color/color_eeeeee" @@ -1229,7 +1229,7 @@ @@ -1240,7 +1240,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6.7dp" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingVertical="15.3dp" android:textColor="@color/color_eeeeee" diff --git a/app/src/main/res/layout/activity_audition_detail.xml b/app/src/main/res/layout/activity_audition_detail.xml index d8b62030..950d7103 100644 --- a/app/src/main/res/layout/activity_audition_detail.xml +++ b/app/src/main/res/layout/activity_audition_detail.xml @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_marginTop="15dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingExtra="5dp" android:maxLines="3" android:textColor="@color/color_777777" @@ -73,7 +73,7 @@ android:layout_gravity="center" android:layout_marginTop="7dp" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_audition_detail_expand" android:textColor="@color/color_bbbbbb" 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 f28d26a9..3762a9be 100644 --- a/app/src/main/res/layout/activity_audition_role_detail.xml +++ b/app/src/main/res/layout/activity_audition_role_detail.xml @@ -95,7 +95,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="15dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="3" android:lineSpacingExtra="5dp" android:textColor="@color/color_777777" @@ -112,7 +112,7 @@ android:layout_marginTop="7dp" android:drawableStart="@drawable/ic_live_detail_bottom" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_audition_detail_expand" android:textColor="@color/color_bbbbbb" @@ -134,7 +134,7 @@ @@ -143,7 +143,7 @@ android:id="@+id/tv_applicant_count" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_3bb9f1" android:textSize="10.7sp" tools:text=" 24" /> @@ -151,7 +151,7 @@ @@ -162,7 +162,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audition_sort_likes" android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" @@ -175,7 +175,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audition_sort_newest" android:textColor="@color/color_3bb9f1" android:textSize="10.7sp" @@ -201,7 +201,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="30dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_audition_no_applicant" android:textColor="@color/color_bbbbbb" diff --git a/app/src/main/res/layout/activity_block_member.xml b/app/src/main/res/layout/activity_block_member.xml index 9dcd108c..6fa40f74 100644 --- a/app/src/main/res/layout/activity_block_member.xml +++ b/app/src/main/res/layout/activity_block_member.xml @@ -23,7 +23,7 @@ @@ -32,7 +32,7 @@ android:id="@+id/tv_total_count" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_dd4500" android:textSize="12sp" tools:text=" 10 " /> @@ -40,7 +40,7 @@ @@ -64,7 +64,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_block_member_empty" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/activity_can_coupon.xml b/app/src/main/res/layout/activity_can_coupon.xml index 38a85e81..56d4d970 100644 --- a/app/src/main/res/layout/activity_can_coupon.xml +++ b/app/src/main/res/layout/activity_can_coupon.xml @@ -34,7 +34,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_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_can_coupon_input_hint" android:importantForAutofill="no" android:inputType="textCapCharacters" @@ -82,7 +82,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingExtra="5sp" android:paddingHorizontal="10dp" android:text="@string/screen_can_coupon_guide_description" @@ -107,7 +107,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingExtra="5sp" android:paddingHorizontal="10dp" android:text="@string/screen_can_coupon_notice_description" @@ -118,7 +118,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_can_coupon_notice_support" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/activity_can_payment.xml b/app/src/main/res/layout/activity_can_payment.xml index d3a96960..f23574c2 100644 --- a/app/src/main/res/layout/activity_can_payment.xml +++ b/app/src/main/res/layout/activity_can_payment.xml @@ -96,7 +96,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_232323_777777" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_can_payment_method_unified" @@ -126,7 +126,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_232323_777777" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_can_payment_method_phone" @@ -142,7 +142,7 @@ android:layout_marginTop="16.7dp" android:button="@null" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_can_payment_agree" android:textColor="@color/color_eeeeee" @@ -155,7 +155,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_can_payment_notice" android:textColor="@color/color_777777" android:textSize="12sp" /> @@ -194,7 +194,7 @@ diff --git a/app/src/main/res/layout/activity_can_status.xml b/app/src/main/res/layout/activity_can_status.xml index dff83263..e688f1d7 100644 --- a/app/src/main/res/layout/activity_can_status.xml +++ b/app/src/main/res/layout/activity_can_status.xml @@ -85,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_can_status_unit" android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" @@ -135,7 +135,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_can_status_unit" android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" diff --git a/app/src/main/res/layout/activity_content_settings.xml b/app/src/main/res/layout/activity_content_settings.xml index ec477f76..40283cf4 100644 --- a/app/src/main/res/layout/activity_content_settings.xml +++ b/app/src/main/res/layout/activity_content_settings.xml @@ -72,7 +72,7 @@ android:layout_weight="1" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:text="@string/screen_content_settings_all" android:textColor="@color/color_eeeeee" @@ -87,7 +87,7 @@ android:layout_weight="1" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:text="@string/screen_content_settings_male" android:textColor="@color/color_eeeeee" @@ -101,7 +101,7 @@ android:layout_weight="1" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:text="@string/screen_content_settings_female" android:textColor="@color/color_eeeeee" 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 215cc902..75a559d5 100644 --- a/app/src/main/res/layout/activity_creator_community_modify.xml +++ b/app/src/main/res/layout/activity_creator_community_modify.xml @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_creator_community_write_notice_mark" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_creator_community_write_image_optional_desc" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -136,7 +136,7 @@ android:id="@+id/tv_number_of_characters" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_creator_community_write_character_count_format" android:textColor="@color/color_ff5c49" android:textSize="13.3sp" /> @@ -144,7 +144,7 @@ @@ -158,7 +158,7 @@ android:layout_height="200dp" android:layout_marginTop="6.7dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="top" android:hint="@string/screen_creator_community_write_content_hint" android:importantForAutofill="no" 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 dc7fc1bf..ec40e801 100644 --- a/app/src/main/res/layout/activity_creator_community_write.xml +++ b/app/src/main/res/layout/activity_creator_community_write.xml @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_creator_community_write_notice_mark" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_creator_community_write_image_optional_desc" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -131,7 +131,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_5_3_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingVertical="8dp" android:text="@string/screen_creator_community_write_record_action" @@ -148,7 +148,7 @@ @@ -156,7 +156,7 @@ @@ -193,7 +193,7 @@ android:id="@+id/tv_number_of_characters" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_creator_community_write_character_count_format" android:textColor="@color/color_ff5c49" android:textSize="13.3sp" /> @@ -201,7 +201,7 @@ @@ -215,7 +215,7 @@ android:layout_height="200dp" android:layout_marginTop="6.7dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="top" android:hint="@string/screen_creator_community_write_content_hint" android:importantForAutofill="no" @@ -508,7 +508,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_creator_community_write_can_unit" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/activity_find_password.xml b/app/src/main/res/layout/activity_find_password.xml index 765ccf18..8695d319 100644 --- a/app/src/main/res/layout/activity_find_password.xml +++ b/app/src/main/res/layout/activity_find_password.xml @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="26.7dp" android:layout_marginTop="40dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:lineSpacingExtra="6dp" android:text="@string/find_password_description_secondary" @@ -64,7 +64,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/find_password_email_hint" android:importantForAutofill="no" android:inputType="textEmailAddress" diff --git a/app/src/main/res/layout/activity_following_creator.xml b/app/src/main/res/layout/activity_following_creator.xml index e572fb64..869272fa 100644 --- a/app/src/main/res/layout/activity_following_creator.xml +++ b/app/src/main/res/layout/activity_following_creator.xml @@ -23,7 +23,7 @@ @@ -32,7 +32,7 @@ android:id="@+id/tv_total_count" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_dd4500" android:textSize="12sp" tools:text=" 10" /> @@ -40,7 +40,7 @@ @@ -64,7 +64,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/following_creator_empty" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/activity_live_now_all.xml b/app/src/main/res/layout/activity_live_now_all.xml index 4331835a..cce3e893 100644 --- a/app/src/main/res/layout/activity_live_now_all.xml +++ b/app/src/main/res/layout/activity_live_now_all.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="28.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_live_now_all_empty_message" android:textColor="@color/color_bbbbbb" android:textSize="13sp" diff --git a/app/src/main/res/layout/activity_live_reservation_all.xml b/app/src/main/res/layout/activity_live_reservation_all.xml index 26626833..612efd39 100644 --- a/app/src/main/res/layout/activity_live_reservation_all.xml +++ b/app/src/main/res/layout/activity_live_reservation_all.xml @@ -57,7 +57,7 @@ @@ -71,7 +71,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingExtra="4.7sp" android:maxLines="2" android:textColor="@color/color_e2e2e2" @@ -87,7 +87,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_7fe2e2e2" android:textSize="12sp" tools:text="300캔" /> @@ -137,7 +137,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:letterSpacing="0" android:text="@string/live_reservation_cancel_reason_title" android:textColor="@color/color_eeeeee" @@ -151,7 +151,7 @@ android:layout_marginTop="13.3dp" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/live_reservation_cancel_reason_private_schedule" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -165,7 +165,7 @@ android:layout_marginTop="10dp" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/live_reservation_cancel_reason_other_live" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -179,7 +179,7 @@ android:layout_marginTop="10dp" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/live_reservation_cancel_reason_uncomfortable" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -193,7 +193,7 @@ android:layout_marginTop="10dp" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/live_reservation_cancel_reason_cost" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -212,7 +212,7 @@ android:layout_height="wrap_content" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/live_reservation_cancel_reason_other" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -258,7 +258,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="23.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/live_reservation_cancel_notice" android:textColor="@color/color_ff5c49" /> @@ -301,7 +301,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="20dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="20sp" tools:text="결제한 500캔이\n환불처리 되었습니다." /> 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 0e7fe768..b66c8626 100644 --- a/app/src/main/res/layout/activity_live_reservation_complete.xml +++ b/app/src/main/res/layout/activity_live_reservation_complete.xml @@ -56,7 +56,7 @@ @@ -169,7 +169,7 @@ @@ -182,7 +182,7 @@ android:layout_height="200dp" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="top" android:hint="@string/screen_live_room_notice_hint" android:importantForAutofill="no" @@ -222,7 +222,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_menu_activate_question" android:textColor="@color/color_eeeeee" @@ -344,7 +344,7 @@ android:layout_height="200dp" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="top" android:hint="@string/screen_live_room_menu_hint" android:importantForAutofill="no" @@ -495,7 +495,7 @@ @@ -506,7 +506,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6.7dp" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingVertical="15.3dp" android:textColor="@color/color_eeeeee" @@ -525,7 +525,7 @@ @@ -536,7 +536,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6.7dp" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingVertical="15.3dp" android:textColor="@color/color_eeeeee" @@ -563,7 +563,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_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:hint="@string/screen_live_room_create_capacity_hint" android:importantForAutofill="no" @@ -676,7 +676,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_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:hint="@string/screen_live_room_create_password_hint" android:importantForAutofill="no" @@ -998,7 +998,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_live_room_create_price_unit" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> 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 161d5a4d..fc61fdd4 100644 --- a/app/src/main/res/layout/activity_live_room_edit.xml +++ b/app/src/main/res/layout/activity_live_room_edit.xml @@ -44,7 +44,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/edittext_underline" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_live_room_title_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -88,7 +88,7 @@ android:id="@+id/tv_number_of_characters" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_live_room_create_notice_char_count_placeholder" android:textColor="@color/color_ff5c49" android:textSize="13.3sp" /> @@ -96,7 +96,7 @@ @@ -108,7 +108,7 @@ android:layout_width="match_parent" android:layout_height="200dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="top" android:hint="@string/screen_live_room_notice_hint" android:importantForAutofill="no" @@ -154,7 +154,7 @@ @@ -165,7 +165,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6.7dp" android:background="@drawable/bg_round_corner_6_7_333333_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingVertical="15.3dp" android:text="@string/screen_live_room_create_reservation_date_placeholder" @@ -185,7 +185,7 @@ @@ -196,7 +196,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6.7dp" android:background="@drawable/bg_round_corner_6_7_333333_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingVertical="15.3dp" android:text="@string/screen_live_room_create_reservation_time_placeholder" @@ -223,7 +223,7 @@ android:layout_height="48.7dp" android:layout_margin="13.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:hint="@string/screen_live_room_create_capacity_hint" android:importantForAutofill="no" diff --git a/app/src/main/res/layout/activity_menu_config.xml b/app/src/main/res/layout/activity_menu_config.xml index bf0aecc4..38e69914 100644 --- a/app/src/main/res/layout/activity_menu_config.xml +++ b/app/src/main/res/layout/activity_menu_config.xml @@ -119,7 +119,7 @@ android:layout_height="200dp" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="top" android:hint="@string/screen_live_room_menu_hint" android:importantForAutofill="no" diff --git a/app/src/main/res/layout/activity_modify_password.xml b/app/src/main/res/layout/activity_modify_password.xml index 8cd3cd52..f1ff6647 100644 --- a/app/src/main/res/layout/activity_modify_password.xml +++ b/app/src/main/res/layout/activity_modify_password.xml @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_modify_password_current_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -79,7 +79,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_modify_password_new_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -115,7 +115,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_modify_password_new_confirm_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -145,7 +145,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="26.7dp" android:layout_marginTop="13.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_modify_password_requirement" android:textColor="@color/color_dd4500" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/activity_new_characters_all.xml b/app/src/main/res/layout/activity_new_characters_all.xml index 61809beb..f2e83a1b 100644 --- a/app/src/main/res/layout/activity_new_characters_all.xml +++ b/app/src/main/res/layout/activity_new_characters_all.xml @@ -22,7 +22,7 @@ @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="20dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_nickname_update_notice_secondary" android:textColor="@color/color_dd4500" /> @@ -47,7 +47,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_nickname_update_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -57,7 +57,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/edittext_underline" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_nickname_update_hint" android:importantForAutofill="no" android:inputType="textWebEditText" diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml index 66f8a9f2..495c4de9 100644 --- a/app/src/main/res/layout/activity_notice_detail.xml +++ b/app/src/main/res/layout/activity_notice_detail.xml @@ -23,7 +23,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" tools:text="보이스온 App 오픈 관련 공지사항입니다." /> @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_525252" android:textSize="12sp" tools:text="2021.07.01" /> diff --git a/app/src/main/res/layout/activity_point_status.xml b/app/src/main/res/layout/activity_point_status.xml index f059750c..1b28c6f3 100644 --- a/app/src/main/res/layout/activity_point_status.xml +++ b/app/src/main/res/layout/activity_point_status.xml @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_point_status_notice" android:textColor="@color/color_eeeeee" diff --git a/app/src/main/res/layout/activity_profile_update.xml b/app/src/main/res/layout/activity_profile_update.xml index 41e1e8ec..f0a69f3b 100644 --- a/app/src/main/res/layout/activity_profile_update.xml +++ b/app/src/main/res/layout/activity_profile_update.xml @@ -68,7 +68,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_profile_update_email_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" android:layout_marginTop="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="13.3sp" tools:text="tkdekatk121212@gmail.com" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_profile_update_password_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -116,7 +116,7 @@ android:layout_centerVertical="true" android:layout_marginStart="6.7dp" android:layout_toStartOf="@+id/tv_modify_password" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:text="@string/screen_profile_update_password_mask" android:textColor="@color/color_777777" @@ -167,7 +167,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_profile_update_nickname_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -184,7 +184,7 @@ android:layout_centerVertical="true" android:layout_marginStart="6.7dp" android:layout_toStartOf="@+id/tv_change_nickname" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -242,7 +242,7 @@ android:layout_weight="1" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_profile_update_gender_female" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -255,7 +255,7 @@ android:layout_weight="1" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_profile_update_gender_male" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -268,7 +268,7 @@ android:layout_weight="1" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_profile_update_gender_none" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -300,7 +300,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_profile_update_instagram_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -310,7 +310,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/edittext_underline" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_profile_update_instagram_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -333,7 +333,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_profile_update_youtube_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -343,7 +343,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/edittext_underline" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_profile_update_youtube_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -366,7 +366,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_profile_update_website_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -376,7 +376,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/edittext_underline" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_profile_update_website_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -399,7 +399,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_profile_update_blog_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -409,7 +409,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/edittext_underline" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_profile_update_blog_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -495,7 +495,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_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="top" android:hint="@string/screen_profile_update_introduce_hint" android:importantForAutofill="no" diff --git a/app/src/main/res/layout/activity_roulette_config.xml b/app/src/main/res/layout/activity_roulette_config.xml index 032035c8..dae4d5ef 100644 --- a/app/src/main/res/layout/activity_roulette_config.xml +++ b/app/src/main/res/layout/activity_roulette_config.xml @@ -190,7 +190,7 @@ android:layout_marginEnd="8dp" android:layout_toStartOf="@+id/tv_price_unit" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_roulette_config_price_hint" android:importantForAutofill="no" android:inputType="numberSigned" @@ -234,7 +234,7 @@ android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_roulette_config_option_limit" android:textColor="@color/color_ff5c49" android:textSize="13.3sp" /> @@ -270,7 +270,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 4d6d6f37..0e9d958c 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -41,7 +41,7 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical" android:background="@null" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:hint="@string/screen_search_hint" android:importantForAutofill="no" @@ -110,7 +110,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginBottom="30dp" android:background="@color/color_cc333333" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingVertical="10dp" android:text="@string/screen_search_more" @@ -141,7 +141,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginBottom="30dp" android:background="@color/color_cc333333" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingVertical="10dp" android:text="@string/screen_search_more" @@ -172,7 +172,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginBottom="13.3dp" android:background="@color/color_cc333333" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingVertical="10dp" android:text="@string/screen_search_more" @@ -210,7 +210,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginVertical="40dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_search_no_result" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_select_message_recipient.xml b/app/src/main/res/layout/activity_select_message_recipient.xml index cc0a8ce5..77d1d581 100644 --- a/app/src/main/res/layout/activity_select_message_recipient.xml +++ b/app/src/main/res/layout/activity_select_message_recipient.xml @@ -17,7 +17,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="20dp" android:background="@drawable/bg_round_corner_10_232323" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:hint="@string/screen_message_recipient_search_hint" android:importantForAutofill="no" diff --git a/app/src/main/res/layout/activity_series_content_all.xml b/app/src/main/res/layout/activity_series_content_all.xml index b9aa2d94..921e37c3 100644 --- a/app/src/main/res/layout/activity_series_content_all.xml +++ b/app/src/main/res/layout/activity_series_content_all.xml @@ -27,7 +27,7 @@ android:id="@+id/tv_sort_newest" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_series_content_sort_newest" android:textColor="@color/color_88e2e2e2" @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_series_content_sort_oldest" android:textColor="@color/color_88e2e2e2" diff --git a/app/src/main/res/layout/activity_series_detail.xml b/app/src/main/res/layout/activity_series_detail.xml index a4e7aa79..dcc0de3a 100644 --- a/app/src/main/res/layout/activity_series_detail.xml +++ b/app/src/main/res/layout/activity_series_detail.xml @@ -92,7 +92,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_6_28312b" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.3dp" android:textColor="@color/color_3bac6a" @@ -105,7 +105,7 @@ android:layout_height="wrap_content" android:layout_marginStart="5.3dp" android:background="@drawable/bg_round_corner_2_6_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.3dp" android:text="@string/screen_series_detail_age_all" @@ -118,7 +118,7 @@ android:layout_height="wrap_content" android:layout_marginStart="5.3dp" android:background="@drawable/bg_round_corner_2_6_312827" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.3dp" android:text="@string/screen_series_detail_age_19_badge" @@ -131,7 +131,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginStart="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="12sp" tools:text="매주 토 연재" /> @@ -178,7 +178,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="13.3sp" tools:text="청령" /> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index c7d1bdcc..60191746 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -247,7 +247,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:ignore="RelativeOverlap" @@ -260,7 +260,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="16.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/company_info" android:textColor="@color/color_777777" android:textSize="11sp" /> @@ -285,7 +285,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="26.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_settings_logout_all" android:textColor="@color/color_777777" android:textSize="14.7sp" /> @@ -296,7 +296,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="26.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_settings_sign_out" android:textColor="@color/color_777777" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/activity_sign_out.xml b/app/src/main/res/layout/activity_sign_out.xml index 691d74c5..b6dbb7c5 100644 --- a/app/src/main/res/layout/activity_sign_out.xml +++ b/app/src/main/res/layout/activity_sign_out.xml @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:letterSpacing="0" android:text="@string/screen_sign_out_description" android:textColor="@color/color_eeeeee" @@ -52,7 +52,7 @@ android:layout_marginTop="13.3dp" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_sign_out_reason_change_nickname" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -66,7 +66,7 @@ android:layout_marginTop="10dp" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_sign_out_reason_conflict_user" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -80,7 +80,7 @@ android:layout_marginTop="10dp" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_sign_out_reason_inconvenient" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -94,7 +94,7 @@ android:layout_marginTop="10dp" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_sign_out_reason_unhappy_service" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -108,7 +108,7 @@ android:layout_marginTop="10dp" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_sign_out_reason_other_service" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -122,7 +122,7 @@ android:layout_marginTop="10dp" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_sign_out_reason_remove_content" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -136,7 +136,7 @@ android:layout_marginTop="10dp" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_sign_out_reason_low_usage" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -150,7 +150,7 @@ android:layout_marginTop="10dp" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_sign_out_reason_missing_content" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -164,7 +164,7 @@ android:layout_marginTop="10dp" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_sign_out_reason_expensive" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -183,7 +183,7 @@ android:layout_height="wrap_content" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_sign_out_reason_etc" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -229,7 +229,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="26.7dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_sign_out_warning" android:textColor="@color/color_ff5c49" /> @@ -244,7 +244,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_sign_out_password_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -254,7 +254,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/edittext_underline" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:importantForAutofill="no" android:inputType="textWebPassword" android:paddingHorizontal="6.7dp" @@ -273,7 +273,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="26.7dp" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_sign_out_social_hint" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> 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 9875bbd8..19046da6 100644 --- a/app/src/main/res/layout/activity_text_message_detail.xml +++ b/app/src/main/res/layout/activity_text_message_detail.xml @@ -45,7 +45,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_bbbbbb" android:textSize="15sp" app:layout_constraintEnd_toEndOf="parent" @@ -70,7 +70,7 @@ android:id="@+id/tv_message" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="15sp" /> 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 68fa8788..868374f2 100644 --- a/app/src/main/res/layout/activity_text_message_write.xml +++ b/app/src/main/res/layout/activity_text_message_write.xml @@ -28,7 +28,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_message_write_cancel" android:textColor="@color/color_3bb9f1" android:textSize="16.7sp" /> @@ -47,7 +47,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_message_write_recipient_label" android:textColor="@color/color_777777" android:textSize="16.7sp" /> @@ -59,7 +59,7 @@ android:layout_centerVertical="true" android:layout_marginStart="13.3dp" android:layout_toEndOf="@+id/tv_recipient_title" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" tools:ignore="RelativeOverlap" @@ -96,7 +96,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@null" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="top" android:hint="@string/screen_message_write_input_hint" android:importantForAutofill="no" 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 01fdbacb..4f874cc4 100644 --- a/app/src/main/res/layout/activity_user_follower_list.xml +++ b/app/src/main/res/layout/activity_user_follower_list.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_3bb9f1" android:textSize="18.3sp" app:layout_constraintStart_toEndOf="@+id/tv_title" diff --git a/app/src/main/res/layout/activity_user_profile_fantalk_all.xml b/app/src/main/res/layout/activity_user_profile_fantalk_all.xml index 9602c8f0..fc4740bf 100644 --- a/app/src/main/res/layout/activity_user_profile_fantalk_all.xml +++ b/app/src/main/res/layout/activity_user_profile_fantalk_all.xml @@ -25,7 +25,7 @@ @@ -35,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="12sp" tools:text="3" /> 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 eec85e0d..ce6fe5b5 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 @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="end" android:text="@string/screen_user_profile_donation_toggle_desc" android:textColor="@color/color_555555" @@ -176,7 +176,7 @@ @@ -186,7 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_80d8ff" android:textSize="12sp" tools:text="56" /> @@ -194,7 +194,7 @@ diff --git a/app/src/main/res/layout/dialog_application_method.xml b/app/src/main/res/layout/dialog_application_method.xml index 49c15929..f2674f65 100644 --- a/app/src/main/res/layout/dialog_application_method.xml +++ b/app/src/main/res/layout/dialog_application_method.xml @@ -59,7 +59,7 @@ @@ -85,7 +85,7 @@ @@ -96,7 +96,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/dialog_audition_method_note" android:textColor="@color/color_777777" android:textSize="12sp" 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 e6f46978..07339839 100644 --- a/app/src/main/res/layout/dialog_audio_content_delete.xml +++ b/app/src/main/res/layout/dialog_audio_content_delete.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="21.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -42,7 +42,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:drawablePadding="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:text="@string/screen_audio_content_detail_delete_notice" android:textColor="@color/color_eeeeee" @@ -54,7 +54,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:lineSpacingExtra="4dp" android:text="@string/screen_audio_content_detail_delete_desc" diff --git a/app/src/main/res/layout/dialog_audio_content_detail_menu.xml b/app/src/main/res/layout/dialog_audio_content_detail_menu.xml index f5946dc3..0045b0a9 100644 --- a/app/src/main/res/layout/dialog_audio_content_detail_menu.xml +++ b/app/src/main/res/layout/dialog_audio_content_detail_menu.xml @@ -35,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_audio_content_detail_pin" android:textColor="@color/color_e2e2e2" @@ -62,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_audio_content_detail_edit" android:textColor="@color/color_e2e2e2" @@ -89,7 +89,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_audio_content_detail_delete" android:textColor="@color/color_e2e2e2" @@ -101,7 +101,7 @@ android:id="@+id/tv_report" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="21.3dp" android:paddingVertical="8dp" android:text="@string/screen_audio_content_detail_report" diff --git a/app/src/main/res/layout/dialog_audio_content_order_confirm.xml b/app/src/main/res/layout/dialog_audio_content_order_confirm.xml index d4a2f45c..b5400fcf 100644 --- a/app/src/main/res/layout/dialog_audio_content_order_confirm.xml +++ b/app/src/main/res/layout/dialog_audio_content_order_confirm.xml @@ -89,7 +89,7 @@ android:layout_centerVertical="true" android:layout_marginHorizontal="4.3dp" android:layout_toEndOf="@+id/iv_profile" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="10sp" tools:ignore="SmallSp" @@ -101,7 +101,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="11sp" tools:ignore="SmallSp" @@ -115,7 +115,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -153,7 +153,7 @@ android:id="@+id/tv_plus" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/audio_content_order_plus" android:visibility="gone" android:layout_marginHorizontal="10dp" 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 049a9ad9..79c9cbb5 100644 --- a/app/src/main/res/layout/dialog_audio_content_report.xml +++ b/app/src/main/res/layout/dialog_audio_content_report.xml @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_9970ff" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_report_reason_harassment" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_9970ff" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_report_reason_privacy" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_9970ff" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_report_reason_impersonation" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -61,7 +61,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_9970ff" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_report_reason_threat" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -71,7 +71,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_9970ff" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_report_reason_child_abuse" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -81,7 +81,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_9970ff" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_report_reason_hate" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_9970ff" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_report_reason_spam" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -101,7 +101,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="21.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_audio_content_detail_report_desc" android:textColor="@color/color_dd4500" 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 b540cfed..dc95dd1b 100644 --- a/app/src/main/res/layout/dialog_community_post_report.xml +++ b/app/src/main/res/layout/dialog_community_post_report.xml @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_unwanted_commercial" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_pornography" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_child_abuse_spaced" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -61,7 +61,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_hate_or_violence" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -71,7 +71,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_terror" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -81,7 +81,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_harassment_or_violence" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_self_harm" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -101,7 +101,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_misinformation" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/dialog_live.xml b/app/src/main/res/layout/dialog_live.xml index 1e37944c..0ef9a903 100644 --- a/app/src/main/res/layout/dialog_live.xml +++ b/app/src/main/res/layout/dialog_live.xml @@ -26,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/color_bbbbbb" android:textSize="15sp" diff --git a/app/src/main/res/layout/dialog_live_input.xml b/app/src/main/res/layout/dialog_live_input.xml index 8f5a7424..74bb5992 100644 --- a/app/src/main/res/layout/dialog_live_input.xml +++ b/app/src/main/res/layout/dialog_live_input.xml @@ -28,7 +28,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_6_7_333333_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="top" android:hint="취소사유를 입력해 주세요" android:importantForAutofill="no" 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 4d64158f..3d1449b5 100644 --- a/app/src/main/res/layout/dialog_live_no_chatting.xml +++ b/app/src/main/res/layout/dialog_live_no_chatting.xml @@ -55,7 +55,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="21dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_live_room_dialog_no_chat_desc" android:textColor="@color/color_bbbbbb" diff --git a/app/src/main/res/layout/dialog_live_payment.xml b/app/src/main/res/layout/dialog_live_payment.xml index 3fb11a82..471fe7e0 100644 --- a/app/src/main/res/layout/dialog_live_payment.xml +++ b/app/src/main/res/layout/dialog_live_payment.xml @@ -24,7 +24,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="21.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:lineSpacingExtra="4sp" android:textColor="@color/color_bbbbbb" @@ -51,7 +51,7 @@ @@ -60,7 +60,7 @@ android:id="@+id/tv_start_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_bbbbbb" android:textSize="13.3sp" tools:text="2024-01-01 15:30" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/dialog_live_payment_current_time_prefix" android:textColor="@color/color_bbbbbb" android:textSize="13.3sp" /> @@ -85,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_bbbbbb" android:textSize="13.3sp" tools:text="2024-01-01 19:30" /> @@ -97,7 +97,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingExtra="4sp" android:textColor="@color/color_bbbbbb" android:textSize="15sp" diff --git a/app/src/main/res/layout/dialog_live_room.xml b/app/src/main/res/layout/dialog_live_room.xml index 2cf2283b..4ce1eff2 100644 --- a/app/src/main/res/layout/dialog_live_room.xml +++ b/app/src/main/res/layout/dialog_live_room.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="11.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:text="OOO님이 스피커 요청을 했어요!\n스피커로 초대할까요?" /> @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_13_3_33ffffff_ffffff" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:letterSpacing="-0.03" android:paddingHorizontal="8dp" android:paddingVertical="8.3dp" @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_marginStart="6.7dp" android:background="@drawable/bg_round_corner_13_3_ffffff" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:letterSpacing="-0.03" android:paddingHorizontal="8dp" android:paddingVertical="8.3dp" 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 b679fa58..84d576ed 100644 --- a/app/src/main/res/layout/dialog_live_room_donation.xml +++ b/app/src/main/res/layout/dialog_live_room_donation.xml @@ -56,7 +56,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="13.3dp" android:paddingVertical="8dp" android:text="@string/screen_live_room_charge" @@ -85,7 +85,7 @@ android:layout_alignParentEnd="true" android:button="@null" android:drawablePadding="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingHorizontal="8dp" android:text="@string/screen_live_room_secret_mission" @@ -99,7 +99,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="20dp" android:background="@drawable/bg_round_corner_6_7_88333333" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_live_room_donation_input_min" android:importantForAutofill="no" android:inputType="numberSigned" @@ -197,7 +197,7 @@ android:layout_height="wrap_content" android:layout_marginStart="10.3dp" android:background="@drawable/bg_round_corner_6_7_88333333" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_live_room_donation_message_hint" android:importantForAutofill="no" android:inputType="text" 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 6a651c1d..63db1d67 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 @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toEndOf="@+id/tv_title" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" tools:ignore="RelativeOverlap" @@ -53,7 +53,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="30dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_live_room_donation_history_empty" android:textColor="@color/color_eeeeee" 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 29dff7c8..8f49990d 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 @@ -76,7 +76,7 @@ @@ -84,7 +84,7 @@ @@ -92,7 +92,7 @@ @@ -120,7 +120,7 @@ android:id="@+id/tv_total_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="end" android:textColor="@color/color_80d8ff" android:textSize="14sp" @@ -130,7 +130,7 @@ android:id="@+id/tv_total_can_slash" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="end" android:text="@string/screen_live_room_separator_slash" android:textColor="@color/white" @@ -141,7 +141,7 @@ android:id="@+id/tv_total_secret_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="end" android:textColor="@color/color_fedc00" android:textSize="14sp" @@ -155,7 +155,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_live_room_can_unit" android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" @@ -174,7 +174,7 @@ @@ -184,7 +184,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_80d8ff" android:textSize="12sp" tools:text="56" /> @@ -192,7 +192,7 @@ @@ -98,7 +98,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_80d8ff" android:textSize="12sp" tools:text="56" /> @@ -106,7 +106,7 @@ @@ -62,7 +62,7 @@ android:layout_height="wrap_content" android:background="@drawable/edittext_underline" android:digits="0123456789" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_live_room_password_hint" android:importantForAutofill="no" android:inputType="number" 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 d34d3f0a..5394bb83 100644 --- a/app/src/main/res/layout/dialog_live_room_profile.xml +++ b/app/src/main/res/layout/dialog_live_room_profile.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_marginStart="6.7dp" android:layout_toStartOf="@+id/tv_total_peoples" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:textColor="@color/color_3bb9f1" android:textSize="14sp" @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_bbbbbb" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@+id/tv_participate" 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 39594bee..ab6674c5 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 @@ -173,7 +173,7 @@ android:layout_height="wrap_content" android:layout_marginTop="21.3dp" android:visibility="gone" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" tools:text="#커버곡 #라이브 #연애 #썸 #채팅 #라방 #커버곡 #라이브 #연애 #썸 #채팅 #라방" /> diff --git a/app/src/main/res/layout/dialog_loading.xml b/app/src/main/res/layout/dialog_loading.xml index 4d8dfb10..1671096d 100644 --- a/app/src/main/res/layout/dialog_loading.xml +++ b/app/src/main/res/layout/dialog_loading.xml @@ -19,7 +19,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textSize="13sp" tools:text="로딩중 입니다..." /> diff --git a/app/src/main/res/layout/dialog_profile_report.xml b/app/src/main/res/layout/dialog_profile_report.xml index 49942442..f2c42004 100644 --- a/app/src/main/res/layout/dialog_profile_report.xml +++ b/app/src/main/res/layout/dialog_profile_report.xml @@ -9,7 +9,7 @@ @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginVertical="16.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/dialog_profile_report_notice" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="16.7dp" android:layout_toStartOf="@+id/tv_report" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:padding="6.7dp" android:text="@string/cancel" android:textColor="@color/color_eeeeee" @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_marginEnd="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:padding="6.7dp" android:text="@string/report_button" android:textColor="@color/color_3bb9f1" 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 1c97fd6e..211746ba 100644 --- a/app/src/main/res/layout/dialog_purchase_community_post.xml +++ b/app/src/main/res/layout/dialog_purchase_community_post.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/dialog_purchase_community_post_desc" android:textColor="@color/color_bbbbbb" diff --git a/app/src/main/res/layout/dialog_review_report.xml b/app/src/main/res/layout/dialog_review_report.xml index ddd60666..03ab22de 100644 --- a/app/src/main/res/layout/dialog_review_report.xml +++ b/app/src/main/res/layout/dialog_review_report.xml @@ -10,7 +10,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/dialog_review_report_title" android:textColor="@color/color_eeeeee" android:textSize="16sp" /> @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_unwanted_commercial" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_child_abuse_spaced" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -47,7 +47,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_hate_or_violence" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -57,7 +57,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_terror" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -67,7 +67,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_harassment" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -77,7 +77,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_self_harm" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -87,7 +87,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_misinformation" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -105,7 +105,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="16.7dp" android:layout_toStartOf="@+id/tv_report" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:padding="6.7dp" android:text="@string/cancel" android:textColor="@color/color_eeeeee" @@ -117,7 +117,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_marginEnd="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:padding="6.7dp" android:text="@string/report_button" android:textColor="@color/color_9970ff" diff --git a/app/src/main/res/layout/dialog_soda.xml b/app/src/main/res/layout/dialog_soda.xml index caa55b57..db629a82 100644 --- a/app/src/main/res/layout/dialog_soda.xml +++ b/app/src/main/res/layout/dialog_soda.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_bbbbbb" android:textSize="15sp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/dialog_user_report.xml b/app/src/main/res/layout/dialog_user_report.xml index 3fb439e7..9fc12b0a 100644 --- a/app/src/main/res/layout/dialog_user_report.xml +++ b/app/src/main/res/layout/dialog_user_report.xml @@ -9,7 +9,7 @@ @@ -26,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_report_reason_harassment" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -36,7 +36,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_report_reason_privacy" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_report_reason_impersonation" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -56,7 +56,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_report_reason_threat" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -66,7 +66,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_child_abuse_spaced" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -76,7 +76,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_report_reason_hate" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -86,7 +86,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_report_reason_spam" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -96,7 +96,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_909090" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/report_reason_none" android:textColor="@color/color_909090" android:textSize="14sp" /> @@ -114,7 +114,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="16.7dp" android:layout_toStartOf="@+id/tv_report" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:padding="6.7dp" android:text="@string/cancel" android:textColor="@color/color_eeeeee" @@ -126,7 +126,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_marginEnd="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:padding="6.7dp" android:text="@string/report_button" android:textColor="@color/color_3bb9f1" diff --git a/app/src/main/res/layout/fragment_audio_content_comment_list.xml b/app/src/main/res/layout/fragment_audio_content_comment_list.xml index e6fcdd11..b9aaff72 100644 --- a/app/src/main/res/layout/fragment_audio_content_comment_list.xml +++ b/app/src/main/res/layout/fragment_audio_content_comment_list.xml @@ -16,7 +16,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_detail_comment_title" android:textColor="@color/white" android:textSize="14.7sp" @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:layout_marginStart="6.7dp" android:layout_toEndOf="@+id/tv_title" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/iv_close" @@ -72,7 +72,7 @@ android:layout_marginTop="13.3dp" android:button="@null" android:drawablePadding="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:layout_marginHorizontal="13.3dp" android:text="@string/screen_audio_content_detail_comment_secret" diff --git a/app/src/main/res/layout/fragment_audio_content_comment_reply.xml b/app/src/main/res/layout/fragment_audio_content_comment_reply.xml index 835cd51d..61284a5a 100644 --- a/app/src/main/res/layout/fragment_audio_content_comment_reply.xml +++ b/app/src/main/res/layout/fragment_audio_content_comment_reply.xml @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:text="@string/audio_content_comment_reply_title" 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 45f1356c..66582797 100644 --- a/app/src/main/res/layout/fragment_audio_content_main.xml +++ b/app/src/main/res/layout/fragment_audio_content_main.xml @@ -88,7 +88,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@null" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:paddingHorizontal="54.67dp" android:text="@string/audio_content_search_channel_placeholder" @@ -195,7 +195,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_live_now_refresh" android:textSize="14.7sp" /> @@ -396,7 +396,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="16.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/company_info" android:textColor="@color/color_777777" android:textSize="11sp" /> 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 b34c46e5..73230faf 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 @@ -117,7 +117,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:lineSpacingExtra="8dp" android:text="@string/common_auth_request_mypage" 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 8ec697c3..69e190bb 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 @@ -160,7 +160,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:lineSpacingExtra="8dp" android:text="@string/common_auth_request_mypage" 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 aaee476b..a3b126fd 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 @@ -192,7 +192,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:lineSpacingExtra="8dp" android:text="@string/common_auth_request_mypage" 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 be543e37..c65f7ac2 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 @@ -59,7 +59,7 @@ android:id="@+id/tv_notice_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/white" android:textSize="13.3sp" tools:text="[업데이트] 1.23.0 버전 업데이트" /> @@ -69,7 +69,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/audio_content_home_more" android:textColor="@color/white" android:textSize="13.3sp" /> @@ -116,7 +116,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@null" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:paddingHorizontal="54.67dp" android:text="@string/audio_content_home_search_placeholder" @@ -161,7 +161,7 @@ android:layout_below="@+id/iv_category_series" android:layout_centerHorizontal="true" android:layout_marginTop="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/audio_content_home_tab_series" android:textColor="@color/color_777777" android:textSize="12sp" @@ -188,7 +188,7 @@ android:layout_below="@+id/iv_category_content" android:layout_centerHorizontal="true" android:layout_marginTop="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/audio_content_home_tab_content" android:textColor="@color/color_777777" android:textSize="12sp" @@ -215,7 +215,7 @@ android:layout_below="@+id/iv_category_alarm" android:layout_centerHorizontal="true" android:layout_marginTop="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/audio_content_home_tab_alarm" android:textColor="@color/color_777777" android:textSize="12sp" @@ -242,7 +242,7 @@ android:layout_below="@+id/iv_category_asmr" android:layout_centerHorizontal="true" android:layout_marginTop="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/audio_content_home_tab_asmr" android:textColor="@color/color_777777" android:textSize="12sp" @@ -277,7 +277,7 @@ android:layout_below="@+id/iv_category_replay" android:layout_centerHorizontal="true" android:layout_marginTop="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/audio_content_home_tab_replay" android:textColor="@color/color_777777" android:textSize="12sp" @@ -304,7 +304,7 @@ android:layout_below="@+id/iv_category_free" android:layout_centerHorizontal="true" android:layout_marginTop="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/audio_content_home_tab_free" android:textColor="@color/color_777777" android:textSize="12sp" @@ -331,7 +331,7 @@ android:layout_below="@+id/iv_category_audio_book" android:layout_centerHorizontal="true" android:layout_marginTop="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/audio_content_home_tab_audiobook" android:textColor="@color/color_777777" android:textSize="12sp" @@ -358,7 +358,7 @@ android:layout_below="@+id/iv_category_audio_toon" android:layout_centerHorizontal="true" android:layout_marginTop="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/audio_content_home_tab_audio_toon" android:textColor="@color/color_777777" android:textSize="12sp" @@ -563,7 +563,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:lineSpacingExtra="8dp" android:text="@string/common_auth_request_mypage" @@ -578,7 +578,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="30dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/company_info" android:textColor="@color/color_777777" android:textSize="11sp" /> 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 4c1ce164..610e130e 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 @@ -117,7 +117,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:lineSpacingExtra="8dp" android:text="@string/common_auth_request_mypage" 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 4b1cca6e..013e5cd6 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 @@ -145,7 +145,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:lineSpacingExtra="8dp" android:text="@string/common_auth_request_mypage" @@ -276,7 +276,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:lineSpacingExtra="8dp" android:text="@string/common_auth_request_mypage" diff --git a/app/src/main/res/layout/fragment_audio_content_order_list.xml b/app/src/main/res/layout/fragment_audio_content_order_list.xml index de6a25cf..ce0e9461 100644 --- a/app/src/main/res/layout/fragment_audio_content_order_list.xml +++ b/app/src/main/res/layout/fragment_audio_content_order_list.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_marginEnd="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audio_content_order_total_prefix" android:textColor="@color/color_eeeeee" android:textSize="12sp" @@ -24,7 +24,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_dd4500" android:textSize="12sp" app:layout_constraintStart_toEndOf="@+id/tv_total_count_prev" @@ -34,7 +34,7 @@ @@ -47,7 +47,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="12sp" tools:text="2개" /> @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/audio_content_playlist_empty_desc" android:textColor="@color/color_bbbbbb" diff --git a/app/src/main/res/layout/fragment_audition.xml b/app/src/main/res/layout/fragment_audition.xml index fcbb4f5b..312993e2 100644 --- a/app/src/main/res/layout/fragment_audition.xml +++ b/app/src/main/res/layout/fragment_audition.xml @@ -54,7 +54,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audition_how_to_use" android:textColor="@color/white" android:textSize="13.3sp" /> @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_audition_how_to_use_more" android:textColor="@color/white" android:textSize="13.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 35fe30de..bfa31c90 100644 --- a/app/src/main/res/layout/fragment_audition_apply_dialog.xml +++ b/app/src/main/res/layout/fragment_audition_apply_dialog.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/dialog_audition_apply_title" android:textColor="@color/white" android:textSize="18.3sp" /> @@ -62,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" /> @@ -82,7 +82,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:background="@drawable/bg_round_corner_5_3_13181b" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/dialog_audition_apply_phone_hint" android:importantForAutofill="no" android:inputType="numberSigned" @@ -115,7 +115,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingMultiplier="1.25" android:text="@string/dialog_audition_apply_agreement" android:textColor="@color/color_eeeeee" diff --git a/app/src/main/res/layout/fragment_character_comment_list.xml b/app/src/main/res/layout/fragment_character_comment_list.xml index 9bedb33e..c8dc0f2a 100644 --- a/app/src/main/res/layout/fragment_character_comment_list.xml +++ b/app/src/main/res/layout/fragment_character_comment_list.xml @@ -16,7 +16,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/character_comment_title" android:textColor="@color/white" android:textSize="14.7sp" @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:layout_marginStart="6.7dp" android:layout_toEndOf="@+id/tv_title" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/iv_close" diff --git a/app/src/main/res/layout/fragment_character_comment_reply.xml b/app/src/main/res/layout/fragment_character_comment_reply.xml index 85b4d232..801cd362 100644 --- a/app/src/main/res/layout/fragment_character_comment_reply.xml +++ b/app/src/main/res/layout/fragment_character_comment_reply.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:text="@string/character_comment_reply_title" android:textColor="@color/white" 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 9c86e90f..725301d3 100644 --- a/app/src/main/res/layout/fragment_creator_follow_notify.xml +++ b/app/src/main/res/layout/fragment_creator_follow_notify.xml @@ -32,7 +32,7 @@ @@ -56,7 +56,7 @@ @@ -80,7 +80,7 @@ diff --git a/app/src/main/res/layout/fragment_event_popup_dialog.xml b/app/src/main/res/layout/fragment_event_popup_dialog.xml index 5624be15..5189e68d 100644 --- a/app/src/main/res/layout/fragment_event_popup_dialog.xml +++ b/app/src/main/res/layout/fragment_event_popup_dialog.xml @@ -21,7 +21,7 @@ android:id="@+id/tv_close_always" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/dialog_event_popup_never_show" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/dialog_event_popup_close" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/fragment_explorer.xml b/app/src/main/res/layout/fragment_explorer.xml index 3b139fb7..6b7f6daf 100644 --- a/app/src/main/res/layout/fragment_explorer.xml +++ b/app/src/main/res/layout/fragment_explorer.xml @@ -35,7 +35,7 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical" android:background="@null" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:hint="채널명을 입력해보세요" android:importantForAutofill="no" 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 0cad34f5..1e5b70a9 100644 --- a/app/src/main/res/layout/fragment_live_room_detail.xml +++ b/app/src/main/res/layout/fragment_live_room_detail.xml @@ -71,7 +71,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_bbbbbb" android:textSize="12sp" tools:text="2021.06.20 SUN 10p.m" /> @@ -119,7 +119,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:text="@string/screen_live_room_participant_label" android:textColor="@color/color_eeeeee" @@ -149,7 +149,7 @@ android:id="@+id/tv_participate" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_3bb9f1" android:textSize="12sp" tools:text="14" /> @@ -158,7 +158,7 @@ android:id="@+id/tv_total" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_bbbbbb" android:textSize="12sp" tools:text="/20" /> @@ -180,7 +180,7 @@ android:layout_gravity="center" android:layout_marginTop="13.3dp" android:drawablePadding="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_live_room_expand" android:textColor="@color/color_bbbbbb" @@ -223,7 +223,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" tools:text="사냥꾼1004" /> @@ -233,7 +233,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lines="3" android:textColor="@color/color_777777" android:textSize="12sp" @@ -292,7 +292,7 @@ android:layout_marginTop="21dp" android:background="@drawable/bg_round_corner_16_7_3bb9f1" android:drawablePadding="3.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="8.7dp" android:paddingVertical="10dp" android:text="@string/screen_live_room_channel" @@ -313,7 +313,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="26.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" tools:text="#연애 #연애상담 #소개팅 #연애팁 #남자 #여자" /> @@ -324,7 +324,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="16.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingExtra="3.3sp" android:textColor="@color/color_777777" android:textSize="13.3sp" @@ -401,7 +401,7 @@ android:layout_gravity="center" android:layout_marginTop="16dp" android:background="@drawable/bg_round_corner_5_3_transparent_dd4500" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="5.3dp" android:text="@string/screen_live_room_cancel_reservation" diff --git a/app/src/main/res/layout/fragment_live_tag.xml b/app/src/main/res/layout/fragment_live_tag.xml index fbe184ee..659e850c 100644 --- a/app/src/main/res/layout/fragment_live_tag.xml +++ b/app/src/main/res/layout/fragment_live_tag.xml @@ -31,7 +31,7 @@ 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 5b6ca37d..acff9e7b 100644 --- a/app/src/main/res/layout/fragment_playlist_add_content.xml +++ b/app/src/main/res/layout/fragment_playlist_add_content.xml @@ -31,7 +31,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="13dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/dialog_close" android:textColor="@color/color_eeeeee" /> @@ -47,7 +47,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/audio_content_label_all" android:textColor="@color/white" android:textSize="14.7sp" /> @@ -59,7 +59,7 @@ android:layout_centerVertical="true" android:layout_marginStart="5.3dp" android:layout_toEndOf="@+id/tv_all" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="12sp" tools:text="40개" /> diff --git a/app/src/main/res/layout/fragment_recording_voice.xml b/app/src/main/res/layout/fragment_recording_voice.xml index c6907f87..5eea98a5 100644 --- a/app/src/main/res/layout/fragment_recording_voice.xml +++ b/app/src/main/res/layout/fragment_recording_voice.xml @@ -100,7 +100,7 @@ android:layout_centerVertical="true" android:layout_marginStart="60dp" android:layout_toEndOf="@+id/iv_record_play" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_creator_community_record_delete" android:textColor="@color/color_bbbbbb" android:textSize="15.3sp" /> 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 c87d6bba..6eb1101d 100644 --- a/app/src/main/res/layout/fragment_series_detail_introduction.xml +++ b/app/src/main/res/layout/fragment_series_detail_introduction.xml @@ -45,7 +45,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="16dp" android:lineSpacingExtra="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="14.7sp" /> @@ -80,7 +80,7 @@ @@ -89,7 +89,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_series_detail_label_age" android:textColor="@color/color_777777" android:textSize="14.7sp" /> @@ -99,7 +99,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_series_detail_label_writer" android:textColor="@color/color_777777" android:textSize="14.7sp" /> @@ -109,7 +109,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_series_detail_label_studio" android:textColor="@color/color_777777" android:textSize="14.7sp" /> @@ -118,7 +118,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_series_detail_label_published_days" android:textColor="@color/color_777777" android:textSize="14.7sp" /> @@ -127,7 +127,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_series_detail_label_published_date" android:textColor="@color/color_777777" android:textSize="14.7sp" /> @@ -143,7 +143,7 @@ android:id="@+id/tv_genre" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/white" android:textSize="14.7sp" tools:text="드라마" /> @@ -153,7 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/white" android:textSize="14.7sp" tools:text="19세 이상" /> @@ -163,7 +163,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/white" android:textSize="14.7sp" tools:text="빙봉" /> @@ -173,7 +173,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/white" android:textSize="14.7sp" tools:text="스튜디오드래곤" /> @@ -183,7 +183,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/white" android:textSize="14.7sp" tools:text="매주 일, 화, 수요일" /> @@ -193,7 +193,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/white" android:textSize="14.7sp" tools:text="2024.04.11" /> @@ -225,7 +225,7 @@ @@ -234,7 +234,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_series_detail_price_keep_label" android:textColor="@color/color_777777" android:textSize="14.7sp" /> @@ -250,7 +250,7 @@ android:id="@+id/tv_rental_price" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" tools:text="무료 ~ 300캔 (5일)" /> @@ -260,7 +260,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" tools:text="무료 ~ 500캔" /> diff --git a/app/src/main/res/layout/fragment_text_message.xml b/app/src/main/res/layout/fragment_text_message.xml index 7eaf45ca..c082c032 100644 --- a/app/src/main/res/layout/fragment_text_message.xml +++ b/app/src/main/res/layout/fragment_text_message.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="10dp" android:layout_marginTop="20dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_message_notice_autodelete" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" @@ -34,7 +34,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_16_7_transparent_777777" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="25dp" android:paddingVertical="10.7dp" android:text="@string/screen_message_filter_receive" @@ -47,7 +47,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" android:background="@drawable/bg_round_corner_16_7_transparent_777777" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="25dp" android:paddingVertical="10.7dp" android:text="@string/screen_message_filter_sent" @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_16_7_transparent_777777" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="25dp" android:paddingVertical="10.7dp" android:text="@string/screen_message_filter_keep" @@ -91,7 +91,7 @@ @@ -159,7 +159,7 @@ android:layout_centerVertical="true" android:layout_marginStart="60dp" android:layout_toEndOf="@+id/iv_record_play" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/screen_message_detail_action_delete" android:textColor="@color/color_bbbbbb" android:textSize="15.3sp" /> diff --git a/app/src/main/res/layout/item_alarm.xml b/app/src/main/res/layout/item_alarm.xml index 10f718b4..03b63386 100644 --- a/app/src/main/res/layout/item_alarm.xml +++ b/app/src/main/res/layout/item_alarm.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="12sp" tools:text="모닝콜" /> @@ -32,7 +32,7 @@ android:id="@+id/tv_ampm" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_d2d2d2" android:textSize="14sp" tools:text="오전" /> @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="28sp" @@ -57,7 +57,7 @@ android:layout_marginHorizontal="8dp" android:layout_toStartOf="@+id/iv_enable" android:layout_toEndOf="@+id/ll_time" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="end" android:text="@string/audio_content_alarm_repeat_example" android:textColor="@color/color_909090" @@ -87,7 +87,7 @@ android:id="@+id/tv_creator_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="12sp" tools:text="설린" /> @@ -98,7 +98,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16.7dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="1" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" diff --git a/app/src/main/res/layout/item_audio_content.xml b/app/src/main/res/layout/item_audio_content.xml index abf31043..c2835bd9 100644 --- a/app/src/main/res/layout/item_audio_content.xml +++ b/app/src/main/res/layout/item_audio_content.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="8dp" android:background="@drawable/bg_round_corner_2_6_003851" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:padding="2.6dp" android:text="@string/audio_content_badge_scheduled" android:textColor="@color/color_3bb9f1" @@ -47,7 +47,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_6_28312b" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_3bac6a" @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_2_6_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_777777" @@ -75,7 +75,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_2_6_7849bc" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:text="@string/audio_content_badge_point" @@ -101,7 +101,7 @@ android:layout_marginTop="2.6dp" android:layout_marginBottom="6.7dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_d2d2d2" android:textSize="12sp" @@ -129,7 +129,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/color_777777" android:textSize="10sp" @@ -156,7 +156,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/color_777777" android:textSize="10sp" @@ -181,7 +181,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:drawablePadding="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/color_909090" android:textSize="12sp" @@ -193,7 +193,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_6_b1ef2c" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" android:text="@string/audio_content_badge_owned" @@ -206,7 +206,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_6_660fd4" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" android:text="@string/audio_content_badge_rented" @@ -219,7 +219,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_6_transparent_d2d2d2" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.3dp" android:text="@string/audio_content_badge_sold_out" diff --git a/app/src/main/res/layout/item_audio_content_comment.xml b/app/src/main/res/layout/item_audio_content_comment.xml index 0a192e73..c007ebe5 100644 --- a/app/src/main/res/layout/item_audio_content_comment.xml +++ b/app/src/main/res/layout/item_audio_content_comment.xml @@ -27,7 +27,7 @@ android:id="@+id/tv_comment_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="12sp" tools:text="alkfje203" /> @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_3_3_553bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingHorizontal="4dp" android:paddingTop="2dp" @@ -64,7 +64,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_555555" android:textSize="10.3sp" app:layout_constraintEnd_toEndOf="parent" @@ -116,7 +116,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingExtra="8dp" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -167,7 +167,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/audio_content_comment_write_reply" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" 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 c907aa3e..ecd07c8c 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 @@ -19,7 +19,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="12sp" app:layout_constraintEnd_toStartOf="@+id/iv_menu" @@ -42,7 +42,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_555555" android:textSize="10.3sp" app:layout_constraintEnd_toEndOf="@+id/tv_comment_nickname" @@ -94,7 +94,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingExtra="8dp" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" diff --git a/app/src/main/res/layout/item_audio_content_main.xml b/app/src/main/res/layout/item_audio_content_main.xml index cc79c4cd..0b16d2e0 100644 --- a/app/src/main/res/layout/item_audio_content_main.xml +++ b/app/src/main/res/layout/item_audio_content_main.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" 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 6ec1e1bf..5a7c7549 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 @@ -33,7 +33,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="13.3dp" android:textColor="@color/color_777777" android:textSize="13sp" diff --git a/app/src/main/res/layout/item_audio_content_main_new_content_creator.xml b/app/src/main/res/layout/item_audio_content_main_new_content_creator.xml index 8f8694c1..895a2189 100644 --- a/app/src/main/res/layout/item_audio_content_main_new_content_creator.xml +++ b/app/src/main/res/layout/item_audio_content_main_new_content_creator.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:maxLines="1" android:textColor="@color/color_bbbbbb" diff --git a/app/src/main/res/layout/item_audio_content_main_new_series.xml b/app/src/main/res/layout/item_audio_content_main_new_series.xml index c795027c..31765854 100644 --- a/app/src/main/res/layout/item_audio_content_main_new_series.xml +++ b/app/src/main/res/layout/item_audio_content_main_new_series.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="9dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" app:layout_constraintStart_toStartOf="@+id/iv_cover" @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@+id/iv_creator_profile" 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 1b9beefd..f814c031 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 @@ -32,7 +32,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="11sp" tools:text="J Fla" /> 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 a0a92f49..bf97b034 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 @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" @@ -44,7 +44,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="11sp" tools:text="J Fla" /> diff --git a/app/src/main/res/layout/item_audio_content_main_tab_popular_content.xml b/app/src/main/res/layout/item_audio_content_main_tab_popular_content.xml index 51462d5c..62e82327 100644 --- a/app/src/main/res/layout/item_audio_content_main_tab_popular_content.xml +++ b/app/src/main/res/layout/item_audio_content_main_tab_popular_content.xml @@ -51,7 +51,7 @@ android:id="@+id/tv_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="bottom" android:textColor="@color/white" android:textSize="10sp" @@ -66,7 +66,7 @@ android:layout_marginEnd="2.7dp" android:layout_marginBottom="2.7dp" android:background="@drawable/bg_round_corner_10_b3333333" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="4dp" android:textColor="@color/white" @@ -82,7 +82,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="1" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" @@ -115,7 +115,7 @@ android:layout_height="wrap_content" android:layout_marginStart="5.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="1" android:textColor="@color/color_777777" android:textSize="10sp" diff --git a/app/src/main/res/layout/item_audio_content_new_all.xml b/app/src/main/res/layout/item_audio_content_new_all.xml index f9601f38..75672e08 100644 --- a/app/src/main/res/layout/item_audio_content_new_all.xml +++ b/app/src/main/res/layout/item_audio_content_new_all.xml @@ -50,7 +50,7 @@ android:id="@+id/tv_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/white" android:textSize="8.5sp" tools:ignore="SmallSp" @@ -73,7 +73,7 @@ android:id="@+id/tv_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/white" android:textSize="8.5sp" tools:ignore="SmallSp" @@ -86,7 +86,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" diff --git a/app/src/main/res/layout/item_audio_content_order_list.xml b/app/src/main/res/layout/item_audio_content_order_list.xml index d2dedd0d..56d257b1 100644 --- a/app/src/main/res/layout/item_audio_content_order_list.xml +++ b/app/src/main/res/layout/item_audio_content_order_list.xml @@ -34,7 +34,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_6_28312b" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_3bac6a" @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_2_6_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_777777" @@ -62,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.6dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="9sp" tools:ignore="SmallSp" /> @@ -73,7 +73,7 @@ android:layout_height="wrap_content" android:layout_marginTop="2.6dp" android:layout_marginBottom="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_d2d2d2" android:textSize="12sp" @@ -101,7 +101,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/color_777777" android:textSize="10sp" @@ -128,7 +128,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/color_777777" android:textSize="10sp" @@ -152,7 +152,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_6_b1ef2c" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" android:text="@string/alarm_select_badge_owned" 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 f8226581..a9b7783b 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 @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_6_28312b" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_3bac6a" @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_2_6_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_777777" @@ -74,7 +74,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_2_6_7849bc" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:text="@string/audio_content_badge_point" @@ -90,7 +90,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="2.7dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_777777" android:textSize="10.7sp" @@ -103,7 +103,7 @@ android:layout_height="wrap_content" android:layout_marginTop="2.6dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_d2d2d2" android:textSize="12sp" @@ -117,7 +117,7 @@ android:layout_centerVertical="true" android:layout_marginEnd="5.3dp" android:drawablePadding="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/color_909090" android:textSize="12sp" diff --git a/app/src/main/res/layout/item_audio_content_theme.xml b/app/src/main/res/layout/item_audio_content_theme.xml index 10de4b26..0d4bb664 100644 --- a/app/src/main/res/layout/item_audio_content_theme.xml +++ b/app/src/main/res/layout/item_audio_content_theme.xml @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/color_bbbbbb" android:textSize="14.3sp" diff --git a/app/src/main/res/layout/item_audio_other_content.xml b/app/src/main/res/layout/item_audio_other_content.xml index a766fe5c..adf8ab0e 100644 --- a/app/src/main/res/layout/item_audio_other_content.xml +++ b/app/src/main/res/layout/item_audio_other_content.xml @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="1" android:textColor="@color/color_777777" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/item_audition_applicant.xml b/app/src/main/res/layout/item_audition_applicant.xml index 97641e9a..62628da5 100644 --- a/app/src/main/res/layout/item_audition_applicant.xml +++ b/app/src/main/res/layout/item_audition_applicant.xml @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxEms="9" android:maxLines="1" android:textColor="@color/white" @@ -62,7 +62,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@+id/tv_total_duration" android:layout_toEndOf="@+id/tv_nickname" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="end" android:textColor="@color/color_777777" android:textSize="12sp" @@ -74,7 +74,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="12sp" tools:text="/30:00:00" /> @@ -114,7 +114,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="12sp" tools:text="777" /> diff --git a/app/src/main/res/layout/item_audition_list.xml b/app/src/main/res/layout/item_audition_list.xml index 9b50e4a1..03bf9264 100644 --- a/app/src/main/res/layout/item_audition_list.xml +++ b/app/src/main/res/layout/item_audition_list.xml @@ -34,7 +34,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" app:layout_constraintEnd_toEndOf="@+id/iv_cover" diff --git a/app/src/main/res/layout/item_audition_role.xml b/app/src/main/res/layout/item_audition_role.xml index ea7bc34a..a372220d 100644 --- a/app/src/main/res/layout/item_audition_role.xml +++ b/app/src/main/res/layout/item_audition_role.xml @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginStart="7dp" android:layout_marginTop="7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="9dp" android:paddingVertical="3dp" android:textColor="@color/white" @@ -50,7 +50,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" app:layout_constraintEnd_toEndOf="@+id/iv_cover" diff --git a/app/src/main/res/layout/item_blocked_member_list.xml b/app/src/main/res/layout/item_blocked_member_list.xml index 8b94d61e..03016fa0 100644 --- a/app/src/main/res/layout/item_blocked_member_list.xml +++ b/app/src/main/res/layout/item_blocked_member_list.xml @@ -19,7 +19,7 @@ android:layout_marginStart="13.3dp" android:layout_toStartOf="@+id/tv_block" android:layout_toEndOf="@+id/iv_profile" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textSize="16.7sp" tools:text="상남자" /> @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:minWidth="83dp" android:paddingHorizontal="12dp" diff --git a/app/src/main/res/layout/item_calendar.xml b/app/src/main/res/layout/item_calendar.xml index 1b0abcfa..21e3710a 100644 --- a/app/src/main/res/layout/item_calendar.xml +++ b/app/src/main/res/layout/item_calendar.xml @@ -11,7 +11,7 @@ android:id="@+id/tv_day_calendar_item" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/white" android:textSize="11.3sp" /> @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/white" android:textSize="15.3sp" /> diff --git a/app/src/main/res/layout/item_calendar_selected.xml b/app/src/main/res/layout/item_calendar_selected.xml index 65291b2e..15888d04 100644 --- a/app/src/main/res/layout/item_calendar_selected.xml +++ b/app/src/main/res/layout/item_calendar_selected.xml @@ -12,7 +12,7 @@ android:id="@+id/tv_day_calendar_item" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@android:color/white" android:textSize="11.3sp" /> diff --git a/app/src/main/res/layout/item_can_charge_status.xml b/app/src/main/res/layout/item_can_charge_status.xml index 1db98595..88bebeef 100644 --- a/app/src/main/res/layout/item_can_charge_status.xml +++ b/app/src/main/res/layout/item_can_charge_status.xml @@ -13,7 +13,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" app:layout_constraintStart_toStartOf="parent" @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" @@ -36,7 +36,7 @@ android:id="@+id/tv_charge_method" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" 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 d6198d1e..4f64795b 100644 --- a/app/src/main/res/layout/item_can_use_status.xml +++ b/app/src/main/res/layout/item_can_use_status.xml @@ -13,7 +13,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" app:layout_constraintStart_toStartOf="parent" @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" 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 da55c78c..5586daa6 100644 --- a/app/src/main/res/layout/item_community_post_comment.xml +++ b/app/src/main/res/layout/item_community_post_comment.xml @@ -27,7 +27,7 @@ android:id="@+id/tv_comment_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="12sp" tools:text="alkfje203" /> @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_3_3_553bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:paddingHorizontal="4dp" android:paddingTop="2dp" @@ -64,7 +64,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_555555" android:textSize="10.3sp" app:layout_constraintEnd_toEndOf="@+id/ll_comment_nickname" @@ -87,7 +87,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingExtra="8dp" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -138,7 +138,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/audio_content_comment_write_reply" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" 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 e8ae423a..170ae1b5 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 @@ -19,7 +19,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="12sp" app:layout_constraintEnd_toStartOf="@+id/iv_menu" @@ -42,7 +42,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_555555" android:textSize="10.3sp" app:layout_constraintEnd_toEndOf="@+id/tv_comment_nickname" @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:text="내용내용내용내용내용내용내용내용내용내용내용내용내용 내용내용내용내용내용내용내용내용내용내용 내용내용내용내용" /> diff --git a/app/src/main/res/layout/item_content_rank_creator.xml b/app/src/main/res/layout/item_content_rank_creator.xml index a5efd359..73d10f2d 100644 --- a/app/src/main/res/layout/item_content_rank_creator.xml +++ b/app/src/main/res/layout/item_content_rank_creator.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:maxLines="1" android:textColor="@color/color_bbbbbb" 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 0e7db7d8..09a912a2 100644 --- a/app/src/main/res/layout/item_creator_community_all.xml +++ b/app/src/main/res/layout/item_creator_community_all.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_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:text="민하나" /> @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingExtra="8dp" android:maxLines="3" android:textColor="@color/color_bbbbbb" @@ -126,7 +126,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" tools:text="1234" /> @@ -155,7 +155,7 @@ @@ -165,7 +165,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="12sp" tools:text="1,204" /> @@ -178,7 +178,7 @@ android:layout_alignParentEnd="true" android:button="@null" android:drawablePadding="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_audio_content_detail_comment_secret" android:textColor="@color/color_selected_secret" diff --git a/app/src/main/res/layout/item_explorer_section.xml b/app/src/main/res/layout/item_explorer_section.xml index 67e30dfa..4f2423e8 100644 --- a/app/src/main/res/layout/item_explorer_section.xml +++ b/app/src/main/res/layout/item_explorer_section.xml @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:maxLines="1" android:textColor="@color/color_bbbbbb" @@ -57,7 +57,7 @@ android:layout_height="wrap_content" android:layout_marginTop="3.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:maxLines="1" android:textColor="@color/color_3bb9f1" diff --git a/app/src/main/res/layout/item_faq.xml b/app/src/main/res/layout/item_faq.xml index fe74ae98..9597bfa9 100644 --- a/app/src/main/res/layout/item_faq.xml +++ b/app/src/main/res/layout/item_faq.xml @@ -29,7 +29,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@+id/iv_dropdown" android:layout_toEndOf="@+id/tv_q" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" tools:text="댓보이스는 어떻게 사용하는 건가요?" /> diff --git a/app/src/main/res/layout/item_faq_category.xml b/app/src/main/res/layout/item_faq_category.xml index ac7cf360..43c37db3 100644 --- a/app/src/main/res/layout/item_faq_category.xml +++ b/app/src/main/res/layout/item_faq_category.xml @@ -8,7 +8,7 @@ android:id="@+id/tv_category" android:layout_width="match_parent" android:layout_height="match_parent" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:lineSpacingExtra="6.7sp" android:textColor="@color/white" diff --git a/app/src/main/res/layout/item_follower_list.xml b/app/src/main/res/layout/item_follower_list.xml index da5ebe07..94b6476b 100644 --- a/app/src/main/res/layout/item_follower_list.xml +++ b/app/src/main/res/layout/item_follower_list.xml @@ -19,7 +19,7 @@ android:layout_marginStart="13.3dp" android:layout_toStartOf="@+id/iv_follow" android:layout_toEndOf="@+id/iv_profile" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textSize="16.7sp" tools:text="상남자" /> diff --git a/app/src/main/res/layout/item_live_now_all.xml b/app/src/main/res/layout/item_live_now_all.xml index fcb92bc7..732d6b4c 100644 --- a/app/src/main/res/layout/item_live_now_all.xml +++ b/app/src/main/res/layout/item_live_now_all.xml @@ -32,7 +32,7 @@ android:layout_marginStart="3.3dp" android:layout_marginTop="3.3dp" android:drawablePadding="1dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="7.3dp" android:paddingVertical="4dp" android:textColor="@color/white" @@ -75,7 +75,7 @@ android:id="@+id/tv_remaining_participant" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="12sp" tools:ignore="SmallSp" @@ -86,7 +86,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="2dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_3bb9f1" android:textSize="12sp" tools:ignore="SmallSp" @@ -99,7 +99,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_eeeeee" android:textSize="12sp" @@ -121,7 +121,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_3bb9f1" android:textSize="11sp" app:layout_constraintEnd_toEndOf="@+id/tv_title" @@ -148,7 +148,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center_vertical" android:textColor="@color/color_777777" android:textSize="10sp" diff --git a/app/src/main/res/layout/item_live_reservation.xml b/app/src/main/res/layout/item_live_reservation.xml index 73940436..a8b399e4 100644 --- a/app/src/main/res/layout/item_live_reservation.xml +++ b/app/src/main/res/layout/item_live_reservation.xml @@ -30,7 +30,7 @@ android:id="@+id/tv_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_ffd300" android:textSize="9.3sp" tools:ignore="SmallSp" @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_bbbbbb" android:textSize="11.3sp" tools:text="사냥꾼 1004" /> @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_e2e2e2" android:textSize="15.3sp" @@ -86,7 +86,7 @@ android:id="@+id/tv_price" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_7fe2e2e2" android:textSize="12sp" tools:text="300캔" /> @@ -96,7 +96,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_10_2e6279" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="7.5dp" android:paddingVertical="4.3dp" android:text="@string/live_reservation_complete" 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 d80a4dff..9c505b11 100644 --- a/app/src/main/res/layout/item_live_reservation_status.xml +++ b/app/src/main/res/layout/item_live_reservation_status.xml @@ -32,7 +32,7 @@ android:id="@+id/tv_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_ffd300" android:textSize="9.3sp" tools:ignore="SmallSp" @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_bbbbbb" android:textSize="11.3sp" tools:text="사냥꾼1004" /> @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lineSpacingExtra="4.7sp" android:maxLines="2" android:textColor="@color/color_e2e2e2" @@ -70,7 +70,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_7fe2e2e2" android:textSize="12sp" tools:text="300캔" /> diff --git a/app/src/main/res/layout/item_live_room_detail_user.xml b/app/src/main/res/layout/item_live_room_detail_user.xml index 08b41c71..3381c6d9 100644 --- a/app/src/main/res/layout/item_live_room_detail_user.xml +++ b/app/src/main/res/layout/item_live_room_detail_user.xml @@ -19,7 +19,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:layout_marginTop="8dp" android:lines="1" android:textColor="@color/color_bbbbbb" diff --git a/app/src/main/res/layout/item_live_room_donation_message.xml b/app/src/main/res/layout/item_live_room_donation_message.xml index c06e4082..1fd0f667 100644 --- a/app/src/main/res/layout/item_live_room_donation_message.xml +++ b/app/src/main/res/layout/item_live_room_donation_message.xml @@ -21,7 +21,7 @@ android:id="@+id/tv_nickname" android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/white" android:textSize="13.3sp" app:layout_constraintEnd_toStartOf="@+id/iv_delete" @@ -34,7 +34,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/white" android:textSize="13.3sp" app:layout_constraintEnd_toEndOf="parent" @@ -47,7 +47,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/white" android:textSize="13.3sp" app:layout_constraintEnd_toEndOf="parent" 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 468dea75..93c78467 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 @@ -63,7 +63,7 @@ android:layout_marginStart="13.3dp" android:layout_toEndOf="@+id/rl_profile" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lines="1" android:maxLength="12" android:textColor="@color/color_eeeeee" @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="end" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" @@ -100,7 +100,7 @@ android:id="@+id/tv_donation_can_unit" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="end" android:text="@string/screen_live_room_can_unit" android:textColor="@color/color_eeeeee" @@ -120,7 +120,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_7_fedc00" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="end" android:paddingHorizontal="3.33dp" android:paddingVertical="2.67dp" @@ -134,7 +134,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="4dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="end" android:textColor="@color/color_fedc00" android:textSize="13.3sp" @@ -143,7 +143,7 @@ diff --git a/app/src/main/res/layout/item_notice.xml b/app/src/main/res/layout/item_notice.xml index 3ff86319..befac2d8 100644 --- a/app/src/main/res/layout/item_notice.xml +++ b/app/src/main/res/layout/item_notice.xml @@ -16,7 +16,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" tools:text="보이스온 App 오픈 관련 공지사항입니다." /> @@ -26,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_525252" android:textSize="12sp" tools:text="2021.07.01" /> diff --git a/app/src/main/res/layout/item_playlist_add_content.xml b/app/src/main/res/layout/item_playlist_add_content.xml index ec72e166..ee2f953b 100644 --- a/app/src/main/res/layout/item_playlist_add_content.xml +++ b/app/src/main/res/layout/item_playlist_add_content.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:background="@drawable/bg_round_corner_2_6_28312b" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:padding="2.6dp" android:textColor="@color/color_3bac6a" android:textSize="10sp" @@ -35,7 +35,7 @@ android:layout_height="0dp" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_2_6_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:padding="2.6dp" android:textColor="@color/color_777777" android:textSize="10sp" @@ -53,7 +53,7 @@ android:layout_marginTop="2.6dp" android:layout_marginEnd="40dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_d2d2d2" android:textSize="12sp" diff --git a/app/src/main/res/layout/item_playlist_content.xml b/app/src/main/res/layout/item_playlist_content.xml index 15fc5536..577a7660 100644 --- a/app/src/main/res/layout/item_playlist_content.xml +++ b/app/src/main/res/layout/item_playlist_content.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:background="@drawable/bg_round_corner_2_6_28312b" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_3bac6a" @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_2_6_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_777777" @@ -52,7 +52,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.6dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="9sp" app:layout_constraintStart_toStartOf="@+id/tv_theme" @@ -66,7 +66,7 @@ android:layout_marginVertical="2.6dp" android:layout_marginEnd="13.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="3" android:textColor="@color/color_d2d2d2" android:textSize="12sp" diff --git a/app/src/main/res/layout/item_playlist_create_content.xml b/app/src/main/res/layout/item_playlist_create_content.xml index fdeaf50c..7ef2c93e 100644 --- a/app/src/main/res/layout/item_playlist_create_content.xml +++ b/app/src/main/res/layout/item_playlist_create_content.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:background="@drawable/bg_round_corner_2_6_28312b" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_3bac6a" @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_2_6_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_777777" @@ -53,7 +53,7 @@ android:layout_marginVertical="6.7dp" android:layout_marginEnd="13.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="3" android:textColor="@color/color_d2d2d2" android:textSize="12sp" diff --git a/app/src/main/res/layout/item_playlist_list.xml b/app/src/main/res/layout/item_playlist_list.xml index 346f3e3d..64b55b4e 100644 --- a/app/src/main/res/layout/item_playlist_list.xml +++ b/app/src/main/res/layout/item_playlist_list.xml @@ -40,7 +40,7 @@ android:layout_height="wrap_content" android:layout_marginTop="7dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="1" android:textColor="@color/color_909090" android:textSize="12sp" @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:layout_marginTop="7dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="1" android:textColor="@color/color_909090" android:textSize="12sp" diff --git a/app/src/main/res/layout/item_playlist_modify_content.xml b/app/src/main/res/layout/item_playlist_modify_content.xml index fdeaf50c..7ef2c93e 100644 --- a/app/src/main/res/layout/item_playlist_modify_content.xml +++ b/app/src/main/res/layout/item_playlist_modify_content.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:background="@drawable/bg_round_corner_2_6_28312b" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_3bac6a" @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_2_6_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_777777" @@ -53,7 +53,7 @@ android:layout_marginVertical="6.7dp" android:layout_marginEnd="13.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="3" android:textColor="@color/color_d2d2d2" android:textSize="12sp" 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 ae0cb254..adb126a6 100644 --- a/app/src/main/res/layout/item_point_use_status.xml +++ b/app/src/main/res/layout/item_point_use_status.xml @@ -13,7 +13,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" app:layout_constraintStart_toStartOf="parent" @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_search.xml b/app/src/main/res/layout/item_search.xml index 85e3e132..dd227bd4 100644 --- a/app/src/main/res/layout/item_search.xml +++ b/app/src/main/res/layout/item_search.xml @@ -38,7 +38,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:text="slefjeiwok" /> @@ -48,7 +48,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="10sp" tools:ignore="SmallSp" diff --git a/app/src/main/res/layout/item_select_recipient.xml b/app/src/main/res/layout/item_select_recipient.xml index 0b1b35bc..a461e4c8 100644 --- a/app/src/main/res/layout/item_select_recipient.xml +++ b/app/src/main/res/layout/item_select_recipient.xml @@ -18,7 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:text="slefjeiwok" /> diff --git a/app/src/main/res/layout/item_series_content.xml b/app/src/main/res/layout/item_series_content.xml index f364164e..e1390503 100644 --- a/app/src/main/res/layout/item_series_content.xml +++ b/app/src/main/res/layout/item_series_content.xml @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="2.7dp" android:background="@drawable/bg_round_corner_2_6_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:padding="2.7dp" android:textColor="@color/color_777777" android:textSize="10sp" @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_2_6_7849bc" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:padding="2.6dp" android:text="@string/audio_content_badge_point" @@ -60,7 +60,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_d2d2d2" android:textSize="12sp" tools:text="The 야한남친 1화" /> @@ -78,7 +78,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="5.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_909090" android:textSize="13.3sp" android:visibility="gone" @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_6_cf5c37" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" android:text="@string/audio_content_price_free" @@ -105,7 +105,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_6_b1ef2c" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" android:text="@string/audio_content_badge_owned" @@ -119,7 +119,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_6_660fd4" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" android:text="@string/audio_content_badge_rented" diff --git a/app/src/main/res/layout/item_series_list.xml b/app/src/main/res/layout/item_series_list.xml index 8df8a3d4..00114973 100644 --- a/app/src/main/res/layout/item_series_list.xml +++ b/app/src/main/res/layout/item_series_list.xml @@ -40,7 +40,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_13_3_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.7dp" android:text="@string/screen_home_series_new" @@ -54,7 +54,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_13_3_002abd" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.7dp" android:text="@string/screen_home_series_complete" @@ -68,7 +68,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_13_3_ec6033" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.7dp" android:text="@string/screen_home_series_popular" @@ -85,7 +85,7 @@ android:layout_marginEnd="3.3dp" android:layout_marginBottom="3.3dp" android:background="@drawable/bg_round_corner_13_3_b3333333" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" android:textColor="@color/white" @@ -102,7 +102,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_eeeeee" android:textSize="12sp" @@ -128,7 +128,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lines="1" android:maxLines="1" android:textColor="@color/color_777777" @@ -142,7 +142,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="11sp" tools:text="매주 수, 토요일" /> diff --git a/app/src/main/res/layout/item_series_list_big.xml b/app/src/main/res/layout/item_series_list_big.xml index 9a505d17..bc2822ec 100644 --- a/app/src/main/res/layout/item_series_list_big.xml +++ b/app/src/main/res/layout/item_series_list_big.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_marginStart="3.3dp" android:background="@drawable/bg_round_corner_13_3_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.7dp" android:text="@string/screen_home_series_new" @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_marginStart="3.3dp" android:background="@drawable/bg_round_corner_13_3_002abd" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.7dp" android:text="@string/screen_home_series_complete" @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_marginStart="3.3dp" android:background="@drawable/bg_round_corner_13_3_ec6033" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.7dp" android:text="@string/screen_home_series_popular" @@ -78,7 +78,7 @@ android:layout_marginEnd="3.3dp" android:layout_marginBottom="3.3dp" android:background="@drawable/bg_round_corner_13_3_b3333333" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" android:textColor="@color/white" @@ -93,7 +93,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_eeeeee" android:textSize="12sp" @@ -125,7 +125,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lines="1" android:maxLines="1" android:textColor="@color/color_777777" @@ -139,7 +139,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="11sp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/item_series_original_audio_drama.xml b/app/src/main/res/layout/item_series_original_audio_drama.xml index 39af84c6..eec68a17 100644 --- a/app/src/main/res/layout/item_series_original_audio_drama.xml +++ b/app/src/main/res/layout/item_series_original_audio_drama.xml @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_13_3_3bb9f1" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.7dp" android:text="@string/screen_home_series_new" @@ -45,7 +45,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_13_3_002abd" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.7dp" android:text="@string/screen_home_series_complete" @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_13_3_ec6033" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.7dp" android:text="@string/screen_home_series_popular" @@ -76,7 +76,7 @@ android:layout_marginTop="3.3dp" android:layout_marginEnd="3.3dp" android:background="@drawable/bg_round_corner_13_3_b3333333" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" android:textColor="@color/white" @@ -92,7 +92,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_eeeeee" android:textSize="12sp" diff --git a/app/src/main/res/layout/item_text_message.xml b/app/src/main/res/layout/item_text_message.xml index ad97949e..fa7a9e05 100644 --- a/app/src/main/res/layout/item_text_message.xml +++ b/app/src/main/res/layout/item_text_message.xml @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="1" android:textColor="@color/color_eeeeee" android:textSize="13.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 1ced4549..da51ff86 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 @@ -62,7 +62,7 @@ android:layout_centerVertical="true" android:layout_toEndOf="@+id/tv_rank" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:lines="1" android:maxLength="12" android:textColor="@color/color_eeeeee" @@ -76,7 +76,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_toEndOf="@+id/tv_nickname" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="end" 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 e6a2bc3e..a7628527 100644 --- a/app/src/main/res/layout/item_user_profile_live.xml +++ b/app/src/main/res/layout/item_user_profile_live.xml @@ -38,7 +38,7 @@ android:id="@+id/tv_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_ffd300" android:textSize="9.3sp" tools:ignore="SmallSp" @@ -49,7 +49,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_bbbbbb" android:textSize="11.3sp" tools:text="사냥꾼 1004" /> @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4.3dp" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:maxLines="2" android:textColor="@color/color_e2e2e2" android:textSize="15.3sp" @@ -72,7 +72,7 @@ android:id="@+id/tv_status" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingHorizontal="9dp" android:paddingVertical="4dp" android:textSize="11.3sp" diff --git a/app/src/main/res/layout/item_user_profile_similar_creator.xml b/app/src/main/res/layout/item_user_profile_similar_creator.xml index 810f0991..49f0f772 100644 --- a/app/src/main/res/layout/item_user_profile_similar_creator.xml +++ b/app/src/main/res/layout/item_user_profile_similar_creator.xml @@ -20,7 +20,7 @@ android:id="@+id/tv_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="11sp" /> diff --git a/app/src/main/res/layout/item_voice_message.xml b/app/src/main/res/layout/item_voice_message.xml index 46ccf03c..ef92d0f9 100644 --- a/app/src/main/res/layout/item_voice_message.xml +++ b/app/src/main/res/layout/item_voice_message.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_marginEnd="35.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" app:layout_constraintBottom_toBottomOf="@+id/iv_profile" @@ -72,7 +72,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/voice_message_time_placeholder" android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" @@ -84,7 +84,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_marginEnd="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:text="@string/voice_message_time_placeholder" android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" diff --git a/app/src/main/res/layout/layout_roulette_option.xml b/app/src/main/res/layout/layout_roulette_option.xml index 5e68559e..8e18214b 100644 --- a/app/src/main/res/layout/layout_roulette_option.xml +++ b/app/src/main/res/layout/layout_roulette_option.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:gravity="center" android:text="@string/screen_roulette_config_option_delete" android:textColor="@color/color_ff5c49" @@ -48,7 +48,7 @@ android:layout_marginEnd="8dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_roulette_config_option_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -76,7 +76,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@null" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:hint="@string/screen_roulette_config_option_percentage_hint" android:importantForAutofill="no" android:lines="1" @@ -90,7 +90,7 @@ 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 fbb79609..edbdc105 100644 --- a/app/src/main/res/layout/layout_roulette_preview_item.xml +++ b/app/src/main/res/layout/layout_roulette_preview_item.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_e2e2e2" android:textSize="14.7sp" tools:text="힝구 (40%)" /> diff --git a/app/src/main/res/layout/layout_user_profile.xml b/app/src/main/res/layout/layout_user_profile.xml index eebb19f6..c6aaa958 100644 --- a/app/src/main/res/layout/layout_user_profile.xml +++ b/app/src/main/res/layout/layout_user_profile.xml @@ -110,7 +110,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_3bb9f1" android:textSize="12sp" app:layout_constraintStart_toStartOf="@+id/iv_profile" diff --git a/app/src/main/res/layout/layout_user_profile_fan_talk.xml b/app/src/main/res/layout/layout_user_profile_fan_talk.xml index 1ff7d146..9939d89d 100644 --- a/app/src/main/res/layout/layout_user_profile_fan_talk.xml +++ b/app/src/main/res/layout/layout_user_profile_fan_talk.xml @@ -46,7 +46,7 @@ @@ -56,7 +56,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="14sp" tools:text="3" /> 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 af840c4b..a138a808 100644 --- a/app/src/main/res/layout/layout_user_profile_introduce.xml +++ b/app/src/main/res/layout/layout_user_profile_introduce.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16.7dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:textColor="@color/color_777777" android:textSize="13.3sp" /> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 874ff409..2c2b6b1d 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -31,12 +31,12 @@ @@ -62,7 +62,7 @@ @color/white @color/color_3bb9f1 @color/black - @font/gmarket_sans_medium + @font/pretendard_medium