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 0a5f51d6..015811a5 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.pretendard_medium) + chip.typeface = ResourcesCompat.getFont(applicationContext, R.font.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 d0bc97cb..2d1fa6da 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 15.6dp diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt index 600bf78b..e2c3563a 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt @@ -1,6 +1,5 @@ package kr.co.vividnext.sodalive.live.room.chat -import android.annotation.SuppressLint import android.content.Context import android.graphics.Typeface import android.text.SpannableString @@ -225,7 +224,7 @@ data class LiveRoomDonationChat( CustomTypefaceSpan( ResourcesCompat.getFont( context, - R.font.pretendard_medium + R.font.medium ) ), 0, diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateActivity.kt index 9738e5c6..d35651bc 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateActivity.kt @@ -768,7 +768,7 @@ class LiveRoomCreateActivity : BaseActivity( ) priceView.typeface = ResourcesCompat.getFont( applicationContext, - R.font.pretendard_medium + R.font.medium ) } @@ -782,7 +782,7 @@ class LiveRoomCreateActivity : BaseActivity( ) priceView.typeface = ResourcesCompat.getFont( applicationContext, - R.font.pretendard_bold + R.font.bold ) } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt index d41353de..072046a8 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt @@ -467,9 +467,9 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl binding.ivTab.isSelected = isSelected val fontRes = if (isSelected) { - R.font.pretendard_bold + R.font.bold } else { - R.font.pretendard_light + R.font.light } binding.tvTab.typeface = ResourcesCompat.getFont(applicationContext, fontRes) } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageWriteFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageWriteFragment.kt index ae659d7b..c5c532b5 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageWriteFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageWriteFragment.kt @@ -111,7 +111,7 @@ class VoiceMessageWriteFragment( binding.tvNickname.text = nickname binding.tvNickname.typeface = ResourcesCompat.getFont( requireContext(), - R.font.pretendard_bold + R.font.bold ) binding.tvNickname.setTextColor( ContextCompat.getColor( 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 de6bf08c..671dd806 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.pretendard_medium) + val typeface = ResourcesCompat.getFont(context, R.font.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 222c4a15..c937c4cb 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.pretendard_medium) + val typeface = ResourcesCompat.getFont(context, R.font.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 a2f4b9c6..61247d1a 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.pretendard_medium + R.font.medium ) view.setTextColor(ContextCompat.getColor(applicationContext, R.color.color_eeeeee)) @@ -175,7 +175,7 @@ class CanPaymentActivity : BaseActivity( private fun paymentMethodSelect(view: TextView) { view.typeface = ResourcesCompat.getFont( applicationContext, - R.font.pretendard_bold + R.font.bold ) view.setTextColor(ContextCompat.getColor(applicationContext, R.color.color_3bb9f1)) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt index a55a3ecb..f2e04380 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 @@ -77,7 +77,7 @@ class CanPaymentTempActivity : BaseActivity( binding.tvPrice.text = (can * 110).moneyFormat() val currencyUnit = getString(R.string.screen_can_payment_currency_unit) binding.tvPaymentPrice.text = "${(can * 110).moneyFormat()}$currencyUnit".fontSpan( - ResourcesCompat.getFont(applicationContext, R.font.pretendard_light), + ResourcesCompat.getFont(applicationContext, R.font.light), currencyUnit ) @@ -119,7 +119,7 @@ class CanPaymentTempActivity : BaseActivity( private fun paymentMethodSelectFalse(view: TextView) { view.typeface = ResourcesCompat.getFont( applicationContext, - R.font.pretendard_medium + R.font.medium ) view.setTextColor(ContextCompat.getColor(applicationContext, R.color.color_eeeeee)) @@ -129,7 +129,7 @@ class CanPaymentTempActivity : BaseActivity( private fun paymentMethodSelect(view: TextView) { view.typeface = ResourcesCompat.getFont( applicationContext, - R.font.pretendard_bold + R.font.bold ) view.setTextColor(ContextCompat.getColor(applicationContext, R.color.color_3bb9f1)) diff --git a/app/src/main/res/font/pretendard_bold.otf b/app/src/main/res/font/bold.otf similarity index 100% rename from app/src/main/res/font/pretendard_bold.otf rename to app/src/main/res/font/bold.otf diff --git a/app/src/main/res/font/pretendard_light.otf b/app/src/main/res/font/light.otf similarity index 100% rename from app/src/main/res/font/pretendard_light.otf rename to app/src/main/res/font/light.otf diff --git a/app/src/main/res/font/pretendard_medium.otf b/app/src/main/res/font/medium.otf similarity index 100% rename from app/src/main/res/font/pretendard_medium.otf rename to app/src/main/res/font/medium.otf diff --git a/app/src/main/res/font/pretendard_regular.otf b/app/src/main/res/font/regular.otf similarity index 100% rename from app/src/main/res/font/pretendard_regular.otf rename to app/src/main/res/font/regular.otf diff --git a/app/src/main/res/layout/activity_add_alarm.xml b/app/src/main/res/layout/activity_add_alarm.xml index 0fb35c4e..8377f78e 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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/white" android:textSize="12sp" /> @@ -128,7 +128,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_7_transparent_555555" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/alarm_add_name_hint" android:importantForAutofill="no" android:inputType="text" @@ -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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/alarm_add_volume_label" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -212,7 +212,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_transparent_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/cancel" @@ -226,7 +226,7 @@ android:layout_marginStart="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/alarm_add_save" diff --git a/app/src/main/res/layout/activity_alarm.xml b/app/src/main/res/layout/activity_alarm.xml index e5bfb02f..1fdc8e15 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 102b7e8a..c1d2963a 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/pretendard_medium" + android:fontFamily="@font/medium" android:paddingHorizontal="13.3dp" android:paddingVertical="8dp" android:text="@string/screen_alarm_content_all_notice" @@ -40,7 +40,7 @@ + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/activity_audio_content_all_by_theme.xml b/app/src/main/res/layout/activity_audio_content_all_by_theme.xml index fb6f309d..a677d281 100644 --- a/app/src/main/res/layout/activity_audio_content_all_by_theme.xml +++ b/app/src/main/res/layout/activity_audio_content_all_by_theme.xml @@ -23,7 +23,7 @@ android:id="@+id/tv_sort_newest" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:text="@string/screen_audio_content_sort_newest" android:textColor="@color/color_88e2e2e2" @@ -34,7 +34,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:text="@string/screen_audio_content_sort_price_high" android:textColor="@color/color_88e2e2e2" @@ -44,7 +44,7 @@ android:id="@+id/tv_sort_price_low" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:text="@string/screen_audio_content_sort_price_low" android:textColor="@color/color_88e2e2e2" @@ -62,7 +62,7 @@ @@ -158,7 +158,7 @@ android:text="@string/screen_audio_content_detail_preview_available" android:textColor="@color/white" android:textSize="16.7sp" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -198,7 +198,7 @@ android:text="@string/screen_audio_content_detail_preview_unavailable" android:textColor="#444446" android:textSize="16.7sp" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -369,7 +369,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_audio_content_detail_next" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> @@ -417,7 +417,7 @@ android:text="@string/audio_content_badge_scheduled" android:textColor="@color/color_3bb9f1" android:visibility="gone" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> @@ -532,7 +532,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_audio_content_detail_remaining" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" /> @@ -641,7 +641,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="5.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" tools:text="10" /> @@ -650,7 +650,7 @@ android:id="@+id/tv_total_count" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" tools:text=" / 10" /> @@ -663,7 +663,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_detail_buyer_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" @@ -697,14 +697,14 @@ android:textSize="12sp" android:visibility="gone" tools:text="#커버곡 #라이브 #연애 #썸" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> @@ -795,7 +795,7 @@ android:id="@+id/tv_unit" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/screen_audio_content_detail_purchase_unit_can" android:textColor="@color/white" android:textSize="12sp" /> @@ -805,7 +805,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_detail_action_buy" android:textColor="@color/white" android:textSize="14.7sp" /> @@ -816,7 +816,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/white" android:textSize="13.3sp" @@ -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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:text="@string/screen_audio_content_detail_comment_secret" android:textColor="@color/color_selected_secret" @@ -916,7 +916,7 @@ android:textCursorDrawable="@drawable/edit_text_cursor" android:textSize="13.3sp" tools:ignore="LabelFor" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> @@ -956,7 +956,7 @@ @@ -987,7 +987,7 @@ @@ -1043,7 +1043,7 @@ + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/activity_audio_content_main.xml b/app/src/main/res/layout/activity_audio_content_main.xml index b58c93a9..7432a9a5 100644 --- a/app/src/main/res/layout/activity_audio_content_main.xml +++ b/app/src/main/res/layout/activity_audio_content_main.xml @@ -78,7 +78,7 @@ android:textColor="@color/color_eeeeee" android:textSize="13sp" tools:text="JFLA 커버곡 Avicii for your self" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> @@ -84,7 +84,7 @@ @@ -95,7 +95,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:hint="제목을 입력하세요." android:importantForAutofill="no" android:inputType="textWebEditText" @@ -124,7 +124,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_content_label" android:textColor="@color/color_eeeeee" @@ -139,7 +139,7 @@ android:id="@+id/tv_number_of_characters" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/audio_content_modify_char_count_initial" android:textColor="@color/color_ff5c49" android:textSize="13.3sp" /> @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="top" android:hint="내용을 입력하세요" android:importantForAutofill="no" @@ -184,7 +184,7 @@ @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:hint="예 : #연애 #커버곡 #태그" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -221,7 +221,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="30dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_point_section_title" android:textColor="@color/color_eeeeee" @@ -257,7 +257,7 @@ android:id="@+id/tv_available_point" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_point_available" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -286,7 +286,7 @@ android:id="@+id/tv_not_available_point" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_point_unavailable" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -305,7 +305,7 @@ @@ -368,7 +368,7 @@ android:id="@+id/tv_age_19" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_age_19" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -379,7 +379,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_audio_content_upload_age_notice" android:textColor="@color/color_dd4500" android:textSize="13.3sp" /> @@ -396,7 +396,7 @@ @@ -459,7 +459,7 @@ android:id="@+id/tv_comment_no" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_comment_disallow" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -482,7 +482,7 @@ android:layout_marginEnd="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/cancel" android:textColor="@color/color_3bb9f1" @@ -495,7 +495,7 @@ android:layout_marginStart="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/audio_content_playlist_modify_save" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_audio_content_new_all.xml b/app/src/main/res/layout/activity_audio_content_new_all.xml index 4ec0e617..ba28b7df 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/pretendard_medium" + android:fontFamily="@font/medium" android:paddingHorizontal="13.3dp" android:paddingVertical="8dp" android:text="@string/screen_audio_content_new_all_notice" @@ -42,7 +42,7 @@ + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/screen_audio_content_ranking_notice" android:textColor="@color/color_bbbbbb" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/activity_audio_content_upload.xml b/app/src/main/res/layout/activity_audio_content_upload.xml index 9f077af1..df8bdc4a 100644 --- a/app/src/main/res/layout/activity_audio_content_upload.xml +++ b/app/src/main/res/layout/activity_audio_content_upload.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_thumbnail_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -80,7 +80,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_section_upload" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -92,7 +92,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_5_3_13181b_3bb9f1" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:paddingVertical="8dp" android:text="@string/screen_audio_content_upload_select_file" @@ -115,7 +115,7 @@ @@ -126,7 +126,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/screen_audio_content_upload_title_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -155,7 +155,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_content_label" android:textColor="@color/color_eeeeee" @@ -170,7 +170,7 @@ android:id="@+id/tv_number_of_characters" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_audio_content_upload_char_count_format" android:textColor="@color/color_ff5c49" android:textSize="13.3sp" /> @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="top" android:hint="@string/screen_audio_content_upload_content_hint" android:importantForAutofill="no" @@ -215,7 +215,7 @@ @@ -242,7 +242,7 @@ android:id="@+id/tv_theme" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_theme_select" android:textColor="@color/color_80d8ff" android:textSize="16.7sp" /> @@ -259,7 +259,7 @@ @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/screen_audio_content_upload_tag_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -294,7 +294,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_price_section_title" android:textColor="@color/color_eeeeee" @@ -330,7 +330,7 @@ android:id="@+id/tv_price_free" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_price_free" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -359,7 +359,7 @@ android:id="@+id/tv_price_paid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_price_paid" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -372,7 +372,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="26.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_keep_section_title" android:textColor="@color/color_eeeeee" @@ -408,7 +408,7 @@ android:id="@+id/tv_both" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_purchase_option_both" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -437,7 +437,7 @@ android:id="@+id/tv_buy_only" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_purchase_option_buy_only" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -465,7 +465,7 @@ android:id="@+id/tv_rent_only" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_purchase_option_rent_only" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -485,7 +485,7 @@ android:id="@+id/tv_price_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_audio_content_upload_price_title_keep" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" /> @@ -505,7 +505,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@+id/tv_price_unit" android:background="@null" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:importantForAutofill="no" android:inputType="numberSigned" android:paddingVertical="13.3dp" @@ -523,7 +523,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_audio_content_upload_price_min_notice" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -569,7 +569,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="30dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_limited_section_title" android:textColor="@color/color_eeeeee" @@ -605,7 +605,7 @@ android:id="@+id/tv_not_limited" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_limited_unlimited" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -634,7 +634,7 @@ android:id="@+id/tv_limited" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_limited_limited" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -648,7 +648,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:hint="@string/screen_audio_content_upload_limited_hint" android:importantForAutofill="no" android:inputType="numberSigned" @@ -667,7 +667,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="30dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_audio_content_upload_point_section_title" android:textColor="@color/color_eeeeee" @@ -703,7 +703,7 @@ android:id="@+id/tv_available_point" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_point_available" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -732,7 +732,7 @@ android:id="@+id/tv_not_available_point" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_point_unavailable" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -750,7 +750,7 @@ @@ -813,7 +813,7 @@ android:id="@+id/tv_preview_no" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_preview_not_generate" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -830,7 +830,7 @@ @@ -860,7 +860,7 @@ @@ -871,7 +871,7 @@ android:layout_height="wrap_content" android:layout_marginTop="5.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:hint="@string/screen_audio_content_upload_preview_start_time_default" android:importantForAutofill="no" @@ -896,7 +896,7 @@ @@ -907,7 +907,7 @@ android:layout_height="wrap_content" android:layout_marginTop="5.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:hint="@string/screen_audio_content_upload_preview_end_time_default" android:importantForAutofill="no" @@ -936,7 +936,7 @@ @@ -999,7 +999,7 @@ android:id="@+id/tv_age_19" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_age_19" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -1010,7 +1010,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_audio_content_upload_age_notice" android:textColor="@color/color_dd4500" android:textSize="13.3sp" /> @@ -1027,7 +1027,7 @@ @@ -1090,7 +1090,7 @@ android:id="@+id/tv_comment_no" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_comment_disallow" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -1109,7 +1109,7 @@ @@ -1172,7 +1172,7 @@ android:id="@+id/tv_active_reservation" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_active_reservation" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:paddingVertical="15.3dp" android:textColor="@color/color_eeeeee" @@ -1265,7 +1265,7 @@ android:layout_marginEnd="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_audio_content_upload_cancel" android:textColor="@color/color_3bb9f1" @@ -1278,7 +1278,7 @@ android:layout_marginStart="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_audio_content_upload_submit" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_audition_detail.xml b/app/src/main/res/layout/activity_audition_detail.xml index 950d7103..9577b769 100644 --- a/app/src/main/res/layout/activity_audition_detail.xml +++ b/app/src/main/res/layout/activity_audition_detail.xml @@ -46,7 +46,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="15dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audition_detail_info_title" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_marginTop="15dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:text="@string/screen_audition_detail_expand" android:textColor="@color/color_bbbbbb" @@ -88,7 +88,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audition_detail_roles_title" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/activity_audition_role_detail.xml b/app/src/main/res/layout/activity_audition_role_detail.xml index 3762a9be..142d28a0 100644 --- a/app/src/main/res/layout/activity_audition_role_detail.xml +++ b/app/src/main/res/layout/activity_audition_role_detail.xml @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_transparent_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="12dp" android:text="@string/screen_audition_role_original_work" @@ -66,7 +66,7 @@ android:layout_marginStart="14dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_transparent_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="12dp" android:text="@string/screen_audition_role_script" @@ -80,7 +80,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="15dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audition_role_info_title" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" @@ -95,7 +95,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="15dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:text="@string/screen_audition_no_applicant" android:textColor="@color/color_bbbbbb" @@ -233,7 +233,7 @@ android:layout_marginEnd="19dp" android:layout_marginBottom="19dp" android:background="@drawable/bg_round_corner_44_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:padding="14dp" android:text="@string/screen_audition_apply" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_block_member.xml b/app/src/main/res/layout/activity_block_member.xml index 6fa40f74..823d1847 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 56d4d970..4a6a1b6b 100644 --- a/app/src/main/res/layout/activity_can_coupon.xml +++ b/app/src/main/res/layout/activity_can_coupon.xml @@ -23,7 +23,7 @@ @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/screen_can_coupon_input_hint" android:importantForAutofill="no" android:inputType="textCapCharacters" @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_marginTop="21.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_can_coupon_submit" @@ -73,7 +73,7 @@ @@ -82,7 +82,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:lineSpacingExtra="5sp" android:paddingHorizontal="10dp" android:text="@string/screen_can_coupon_guide_description" @@ -98,7 +98,7 @@ @@ -107,7 +107,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 f23574c2..76467d43 100644 --- a/app/src/main/res/layout/activity_can_payment.xml +++ b/app/src/main/res/layout/activity_can_payment.xml @@ -53,7 +53,7 @@ android:id="@+id/tv_charge_can_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" @@ -64,7 +64,7 @@ android:id="@+id/tv_price" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" app:layout_constraintBottom_toBottomOf="parent" @@ -78,7 +78,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="26.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_can_payment_select_method" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_can_payment_notice" android:textColor="@color/color_777777" android:textSize="12sp" /> @@ -194,7 +194,7 @@ @@ -204,7 +204,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="23.3sp" tools:text="3,300원" /> @@ -217,7 +217,7 @@ android:layout_height="wrap_content" android:layout_marginStart="31dp" android:background="@drawable/bg_round_corner_10_80d8ff" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_can_payment_pay" diff --git a/app/src/main/res/layout/activity_can_status.xml b/app/src/main/res/layout/activity_can_status.xml index a4cbf169..7fde7559 100644 --- a/app/src/main/res/layout/activity_can_status.xml +++ b/app/src/main/res/layout/activity_can_status.xml @@ -36,7 +36,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/screen_can_status_label_paid" android:textColor="@color/color_777777" android:textSize="12sp" /> @@ -76,7 +76,7 @@ android:id="@+id/tv_paid_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" tools:text="20,000" /> @@ -85,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_can_status_unit" android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" @@ -109,7 +109,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/screen_can_status_label_reward" android:textColor="@color/color_777777" android:textSize="12sp" /> @@ -126,7 +126,7 @@ android:id="@+id/tv_reward_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" tools:text="20,000" /> @@ -135,7 +135,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_can_status_unit" android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" @@ -187,7 +187,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:drawablePadding="6.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_can_status_charge_action" android:textColor="@color/color_1313bc" diff --git a/app/src/main/res/layout/activity_chat_room.xml b/app/src/main/res/layout/activity_chat_room.xml index 2afbdc0a..5e1134a6 100644 --- a/app/src/main/res/layout/activity_chat_room.xml +++ b/app/src/main/res/layout/activity_chat_room.xml @@ -79,7 +79,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:maxLines="1" android:textColor="#FFFFFFFF" android:textSize="12sp" @@ -93,7 +93,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:background="@drawable/bg_character_status_clone" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="4dp" android:paddingVertical="2dp" android:textColor="#FFFFFFFF" @@ -129,7 +129,7 @@ android:id="@+id/tv_can_badge" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:textColor="#FFFFFFFF" android:textSize="16sp" @@ -188,7 +188,7 @@ app:layout_constraintEnd_toStartOf="@id/iv_collapse" app:layout_constraintStart_toEndOf="@id/iv_notice_icon" app:layout_constraintTop_toTopOf="parent" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -72,7 +72,7 @@ android:layout_weight="1" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 75a559d5..e5f12c9e 100644 --- a/app/src/main/res/layout/activity_creator_community_modify.xml +++ b/app/src/main/res/layout/activity_creator_community_modify.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_creator_community_write_image_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_creator_community_write_image_optional_desc" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -121,7 +121,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_creator_community_write_content_label" android:textColor="@color/color_eeeeee" @@ -136,7 +136,7 @@ android:id="@+id/tv_number_of_characters" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="top" android:hint="@string/screen_creator_community_write_content_hint" android:importantForAutofill="no" @@ -182,7 +182,7 @@ @@ -245,7 +245,7 @@ android:id="@+id/tv_comment_no" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_creator_community_write_comment_disabled" android:textColor="@color/color_80d8ff" android:textSize="14.7sp" /> @@ -264,7 +264,7 @@ @@ -327,7 +327,7 @@ android:id="@+id/tv_age_19" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_creator_community_write_age_19_plus" android:textColor="@color/color_80d8ff" android:textSize="14.7sp" /> @@ -350,7 +350,7 @@ android:layout_marginEnd="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_creator_community_write_close" android:textColor="@color/color_3bb9f1" @@ -363,7 +363,7 @@ android:layout_marginStart="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_creator_community_modify_submit" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_creator_community_write.xml b/app/src/main/res/layout/activity_creator_community_write.xml index ec40e801..e750ef1a 100644 --- a/app/src/main/res/layout/activity_creator_community_write.xml +++ b/app/src/main/res/layout/activity_creator_community_write.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_creator_community_write_image_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_creator_community_write_image_optional_desc" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -119,7 +119,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_creator_community_write_record_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:paddingVertical="8dp" android:text="@string/screen_creator_community_write_record_action" @@ -148,7 +148,7 @@ @@ -156,7 +156,7 @@ @@ -178,7 +178,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_creator_community_write_content_label" android:textColor="@color/color_eeeeee" @@ -193,7 +193,7 @@ android:id="@+id/tv_number_of_characters" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="top" android:hint="@string/screen_creator_community_write_content_hint" android:importantForAutofill="no" @@ -239,7 +239,7 @@ @@ -302,7 +302,7 @@ android:id="@+id/tv_comment_no" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_creator_community_write_comment_disabled" android:textColor="@color/color_80d8ff" android:textSize="14.7sp" /> @@ -321,7 +321,7 @@ @@ -384,7 +384,7 @@ android:id="@+id/tv_age_19" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_creator_community_write_age_19_plus" android:textColor="@color/color_80d8ff" android:textSize="14.7sp" /> @@ -403,7 +403,7 @@ @@ -467,7 +467,7 @@ android:id="@+id/tv_price_paid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_creator_community_write_price_paid" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -490,7 +490,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_toStartOf="@+id/tv_can" android:background="@null" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:importantForAutofill="no" android:inputType="numberDecimal" @@ -508,7 +508,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_creator_community_write_can_unit" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> @@ -530,7 +530,7 @@ android:layout_marginEnd="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_creator_community_write_close" android:textColor="@color/color_3bb9f1" @@ -543,7 +543,7 @@ android:layout_marginStart="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_creator_community_write_submit" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_event_detail.xml b/app/src/main/res/layout/activity_event_detail.xml index 2436876a..e94204f8 100644 --- a/app/src/main/res/layout/activity_event_detail.xml +++ b/app/src/main/res/layout/activity_event_detail.xml @@ -34,7 +34,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_10_3e737c" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_event_participate" diff --git a/app/src/main/res/layout/activity_find_password.xml b/app/src/main/res/layout/activity_find_password.xml index 8695d319..26cd8175 100644 --- a/app/src/main/res/layout/activity_find_password.xml +++ b/app/src/main/res/layout/activity_find_password.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="26.7dp" android:layout_marginTop="40dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:lineSpacingExtra="6dp" android:text="@string/find_password_description_primary" @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="26.7dp" android:layout_marginTop="40dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/find_password_email_hint" android:importantForAutofill="no" android:inputType="textEmailAddress" @@ -81,7 +81,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="60dp" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/find_password_submit" @@ -101,7 +101,7 @@ android:text="@string/find_password_contact_support" android:textColor="@color/color_3bb9f1" app:drawableStartCompat="@drawable/ic_headphones_blue" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/activity_following_creator.xml b/app/src/main/res/layout/activity_following_creator.xml index 869272fa..24808b9c 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:text="@string/following_creator_empty" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/activity_language_settings.xml b/app/src/main/res/layout/activity_language_settings.xml index 0bfb8880..bd2f9479 100644 --- a/app/src/main/res/layout/activity_language_settings.xml +++ b/app/src/main/res/layout/activity_language_settings.xml @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/settings_language_korean" android:textColor="@color/color_eeeeee" android:textSize="15sp" /> @@ -70,7 +70,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/settings_language_english" android:textColor="@color/color_eeeeee" android:textSize="15sp" /> @@ -102,7 +102,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/settings_language_japanese" android:textColor="@color/color_eeeeee" android:textSize="15sp" /> @@ -125,7 +125,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="20dp" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/settings_language_apply" android:textAllCaps="false" 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 cce3e893..e064a966 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/pretendard_medium" + android:fontFamily="@font/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 612efd39..23d8622b 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_7fe2e2e2" android:textSize="12sp" tools:text="300캔" /> @@ -128,7 +128,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/live_reservation_cancel_question" android:textColor="@color/color_a285eb" android:textSize="20sp" /> @@ -137,7 +137,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/live_reservation_cancel_reason_other" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -230,7 +230,7 @@ android:layout_height="wrap_content" android:background="@null" android:button="@null" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:hint="입력해 주세요" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -258,7 +258,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="23.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/live_reservation_cancel_notice" android:textColor="@color/color_ff5c49" /> @@ -270,7 +270,7 @@ android:layout_marginTop="90dp" android:layout_marginBottom="13.3dp" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/live_reservation_cancel_action" @@ -290,7 +290,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/live_reservation_cancel_done" android:textColor="@color/color_a285eb" android:textSize="20sp" /> @@ -301,7 +301,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="20dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_eeeeee" android:textSize="20sp" tools:text="결제한 500캔이\n환불처리 되었습니다." /> @@ -320,7 +320,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/live_reservation_cancel_other_reservation" @@ -333,7 +333,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/live_reservation_cancel_check_history" diff --git a/app/src/main/res/layout/activity_live_reservation_complete.xml b/app/src/main/res/layout/activity_live_reservation_complete.xml index b66c8626..4dc0d17f 100644 --- a/app/src/main/res/layout/activity_live_reservation_complete.xml +++ b/app/src/main/res/layout/activity_live_reservation_complete.xml @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_reservation_complete_message" android:textColor="@color/color_3bb9f1" android:textSize="20sp" /> @@ -41,7 +41,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="26.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_reservation_complete_info_title" android:textColor="@color/color_eeeeee" @@ -56,7 +56,7 @@ + android:fontFamily="@font/medium" /> @@ -116,7 +116,7 @@ android:id="@+id/tv_notice" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:lineSpacingExtra="4dp" android:textColor="@color/white" android:textSize="11.3sp" @@ -160,7 +160,7 @@ android:id="@+id/tv_menu_pan_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_menu_prefix" android:textColor="@color/white" android:textSize="11.3sp" /> @@ -169,7 +169,7 @@ android:id="@+id/tv_menu_pan_detail" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:lineSpacingExtra="4dp" android:textColor="@color/white" android:textSize="11.3sp" @@ -200,7 +200,7 @@ android:layout_height="wrap_content" android:layout_alignParentStart="true" android:background="@drawable/bg_round_corner_5_3_transparent_ff5c49" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:paddingHorizontal="8dp" android:paddingVertical="4.7dp" android:text="@string/screen_live_room_leave" @@ -223,7 +223,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="8dp" android:background="@drawable/bg_round_corner_5_3_transparent_bbbbbb" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:paddingHorizontal="8dp" android:paddingVertical="4.7dp" @@ -239,7 +239,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="8dp" android:background="@drawable/bg_round_corner_5_3_transparent_bbbbbb" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:paddingHorizontal="8dp" android:paddingVertical="4.7dp" @@ -254,7 +254,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="8dp" android:background="@drawable/bg_round_corner_5_3_transparent_bbbbbb" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:paddingHorizontal="8dp" android:paddingVertical="4.7dp" @@ -348,7 +348,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="2.7dp" android:background="@drawable/bg_circle_ea3a25" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:padding="2.7dp" android:text="@string/screen_live_room_age_badge" android:textColor="@color/white" @@ -360,7 +360,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lines="1" android:textColor="@color/color_eeeeee" android:textSize="12sp" @@ -379,7 +379,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:lines="1" android:textColor="@color/color_777777" android:textSize="12sp" @@ -419,7 +419,7 @@ android:layout_alignParentStart="true" android:layout_centerVertical="true" android:background="@drawable/bg_round_corner_5_3_transparent_bbbbbb" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:paddingHorizontal="8dp" android:paddingVertical="5.3dp" android:text="@string/screen_live_room_notice" @@ -435,7 +435,7 @@ android:layout_marginStart="5.3dp" android:layout_toEndOf="@+id/tv_notification" android:background="@drawable/bg_round_corner_5_3_transparent_bbbbbb" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:paddingHorizontal="8dp" android:paddingVertical="5.3dp" android:text="@string/screen_live_room_menu" @@ -471,7 +471,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center_vertical" android:textColor="@color/color_bbbbbb" android:textSize="11sp" @@ -501,7 +501,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center_vertical" android:textColor="@color/color_bbbbbb" android:textSize="11sp" @@ -523,7 +523,7 @@ + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> @@ -106,7 +106,7 @@ @@ -117,7 +117,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@drawable/edittext_underline" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/screen_live_room_title_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -146,7 +146,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_notice" android:textColor="@color/color_eeeeee" @@ -161,7 +161,7 @@ android:id="@+id/tv_number_of_characters" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_live_room_create_notice_char_count_placeholder" android:textColor="@color/color_ff5c49" android:textSize="13.3sp" /> @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="top" android:hint="@string/screen_live_room_notice_hint" android:importantForAutofill="no" @@ -208,7 +208,7 @@ @@ -222,7 +222,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_menu_activate_question" android:textColor="@color/color_eeeeee" @@ -273,7 +273,7 @@ android:id="@+id/tv_select_menu_1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_menu_preset_1" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -302,7 +302,7 @@ android:id="@+id/tv_select_menu_2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_menu_preset_2" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -331,7 +331,7 @@ android:id="@+id/tv_select_menu_3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_menu_preset_3" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="top" android:hint="@string/screen_live_room_menu_hint" android:importantForAutofill="no" @@ -371,7 +371,7 @@ @@ -382,7 +382,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_24_3_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="13.7dp" android:text="@string/screen_profile_update_interest_select" @@ -403,7 +403,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_time_label" android:textColor="@color/color_eeeeee" @@ -439,7 +439,7 @@ android:id="@+id/tv_time_now" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_create_time_now" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -468,7 +468,7 @@ android:id="@+id/tv_time_reservation" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_create_time_reservation" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:paddingVertical="15.3dp" android:textColor="@color/color_eeeeee" @@ -550,7 +550,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_capacity_label" 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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:hint="@string/screen_live_room_create_capacity_hint" android:importantForAutofill="no" @@ -580,7 +580,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_visibility_label" android:textColor="@color/color_eeeeee" @@ -615,7 +615,7 @@ android:id="@+id/tv_open" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_create_open_label" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -644,7 +644,7 @@ android:id="@+id/tv_private" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_create_private_label" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -663,7 +663,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_password_label" android:textColor="@color/color_eeeeee" @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:hint="@string/screen_live_room_create_password_hint" android:importantForAutofill="no" @@ -694,7 +694,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_creator_join_label" android:textColor="@color/color_eeeeee" @@ -729,7 +729,7 @@ android:id="@+id/tv_available_join_creator_y" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_create_creator_join_available" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -758,7 +758,7 @@ android:id="@+id/tv_available_join_creator_n" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_create_creator_join_unavailable" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -777,7 +777,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_age_label" android:textColor="@color/color_eeeeee" @@ -812,7 +812,7 @@ android:id="@+id/tv_age_all" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_create_age_all" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -841,7 +841,7 @@ android:id="@+id/tv_age_19" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_age_limit_adult" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -862,7 +862,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_price_label" android:textColor="@color/color_eeeeee" @@ -881,7 +881,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_live_room_price_select" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_live_room_create_price_free" @@ -895,7 +895,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_weight="1" android:background="@drawable/bg_live_room_price_select" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_live_room_create_price_100" @@ -908,7 +908,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_live_room_price_select" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_live_room_create_price_300" @@ -929,7 +929,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_live_room_price_select" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_live_room_create_price_500" @@ -943,7 +943,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_weight="1" android:background="@drawable/bg_live_room_price_select" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_live_room_create_price_1000" @@ -956,7 +956,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_live_room_price_select" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16.7dp" android:text="@string/screen_live_room_create_price_2000" @@ -980,7 +980,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_toStartOf="@+id/tv_can" android:background="@null" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:importantForAutofill="no" android:inputType="numberDecimal" @@ -998,7 +998,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_live_room_create_price_unit" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> @@ -1017,7 +1017,7 @@ android:layout_height="50dp" android:layout_margin="13.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_live_room_create_submit" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_live_room_edit.xml b/app/src/main/res/layout/activity_live_room_edit.xml index fc61fdd4..18e66b33 100644 --- a/app/src/main/res/layout/activity_live_room_edit.xml +++ b/app/src/main/res/layout/activity_live_room_edit.xml @@ -34,7 +34,7 @@ @@ -44,7 +44,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/edittext_underline" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/screen_live_room_title_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -73,7 +73,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_notice" android:textColor="@color/color_eeeeee" @@ -88,7 +88,7 @@ android:id="@+id/tv_number_of_characters" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="top" android:hint="@string/screen_live_room_notice_hint" android:importantForAutofill="no" @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_time_label" android:textColor="@color/color_eeeeee" @@ -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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:paddingVertical="15.3dp" android:text="@string/screen_live_room_create_reservation_time_placeholder" @@ -211,7 +211,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="33.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_create_capacity_label" android:textColor="@color/color_eeeeee" @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:hint="@string/screen_live_room_create_capacity_hint" android:importantForAutofill="no" @@ -253,7 +253,7 @@ android:layout_height="50dp" android:layout_margin="13.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_live_room_profile_edit_title" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 2d3fdeee..28c988d0 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -41,7 +41,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/hint_email" android:importantForAutofill="no" android:inputType="textEmailAddress" @@ -71,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/hint_password" android:imeOptions="actionDone" android:importantForAutofill="no" @@ -89,7 +89,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="40dp" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/title_login" @@ -101,7 +101,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="30dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:paddingVertical="10dp" android:text="@string/forgot_password" android:textColor="@color/color_bbbbbb" @@ -112,7 +112,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:paddingVertical="10dp" android:text="@string/signup_prompt" android:textColor="@color/color_bbbbbb" diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index dd16453f..8d8ea7ba 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -49,7 +49,7 @@ android:textColor="@color/color_eeeeee" android:textSize="13sp" tools:text="JFLA 커버곡 Avicii for your self" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> @@ -77,7 +77,7 @@ android:id="@+id/tv_select_menu_2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_menu_preset_2" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -106,7 +106,7 @@ android:id="@+id/tv_select_menu_3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_menu_preset_3" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="top" android:hint="@string/screen_live_room_menu_hint" android:importantForAutofill="no" @@ -140,7 +140,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_menu_config_save" diff --git a/app/src/main/res/layout/activity_modify_password.xml b/app/src/main/res/layout/activity_modify_password.xml index f1ff6647..f921249f 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_modify_password_requirement" android:textColor="@color/color_dd4500" android:textSize="12sp" /> @@ -166,7 +166,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginVertical="13.7dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_modify_password_submit" 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 f2e83a1b..539ad15e 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/screen_nickname_update_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -78,7 +78,7 @@ android:layout_marginHorizontal="20dp" android:layout_marginTop="21.3dp" android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="13.3dp" android:text="@string/screen_nickname_update_check" @@ -100,7 +100,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_nickname_update_submit" diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml index 495c4de9..87830cce 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_525252" android:textSize="12sp" tools:text="2021.07.01" /> diff --git a/app/src/main/res/layout/activity_notification_settings.xml b/app/src/main/res/layout/activity_notification_settings.xml index 55a74dee..61914a4a 100644 --- a/app/src/main/res/layout/activity_notification_settings.xml +++ b/app/src/main/res/layout/activity_notification_settings.xml @@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/notification_settings_live" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -61,7 +61,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/notification_settings_upload" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -93,7 +93,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/notification_settings_message" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/activity_original_work_detail.xml b/app/src/main/res/layout/activity_original_work_detail.xml index 3e23382b..a9727c3c 100644 --- a/app/src/main/res/layout/activity_original_work_detail.xml +++ b/app/src/main/res/layout/activity_original_work_detail.xml @@ -90,7 +90,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/white" android:textSize="26sp" @@ -109,7 +109,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_4_263238_ffffff" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="7dp" android:paddingVertical="3dp" android:textColor="#B0BEC5" @@ -122,7 +122,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:background="@drawable/bg_round_corner_4_263238_3bb9f1" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="7dp" android:paddingVertical="3dp" android:textColor="#3bb9f1" @@ -135,7 +135,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:background="@drawable/bg_round_corner_4_263238_ff5c49" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="7dp" android:paddingVertical="3dp" android:text="@string/screen_original_work_age_badge" @@ -150,7 +150,7 @@ android:layout_height="wrap_content" android:layout_marginTop="14dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:textColor="@color/color_3bb9f1" android:textSize="14sp" diff --git a/app/src/main/res/layout/activity_point_status.xml b/app/src/main/res/layout/activity_point_status.xml index 1b28c6f3..a55e9568 100644 --- a/app/src/main/res/layout/activity_point_status.xml +++ b/app/src/main/res/layout/activity_point_status.xml @@ -35,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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 f0a69f3b..5bd174ab 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center_vertical" android:text="@string/screen_profile_update_password_mask" android:textColor="@color/color_777777" @@ -136,7 +136,7 @@ android:layout_alignParentEnd="true" android:layout_marginStart="13.3dp" android:background="@drawable/bg_round_corner_8_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:paddingHorizontal="22.7dp" android:paddingVertical="13.3dp" android:text="@string/screen_profile_update_change_password" @@ -167,7 +167,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center_vertical" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -204,7 +204,7 @@ android:layout_alignParentEnd="true" android:layout_marginStart="13.3dp" android:background="@drawable/bg_round_corner_8_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:paddingHorizontal="22.7dp" android:paddingVertical="13.3dp" android:text="@string/screen_profile_update_change_nickname" @@ -223,7 +223,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_profile_update_gender_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -242,7 +242,7 @@ android:layout_weight="1" android:button="@null" android:drawablePadding="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/screen_profile_update_blog_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -438,7 +438,7 @@ @@ -449,7 +449,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_24_3_333bb9f1_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="13.7dp" android:text="@string/screen_profile_update_interest_select" @@ -483,7 +483,7 @@ @@ -105,7 +105,7 @@ android:id="@+id/tv_select_roulette_2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_roulette_config_preset_2" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -134,7 +134,7 @@ android:id="@+id/tv_select_roulette_3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_roulette_config_preset_3" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -153,7 +153,7 @@ android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_roulette_config_activate_question" android:textColor="@color/color_eeeeee" android:textSize="16sp" /> @@ -172,7 +172,7 @@ android:layout_height="wrap_content" android:layout_marginTop="26.7dp" android:layout_marginBottom="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_roulette_config_price_label" android:textColor="@color/color_eeeeee" android:textSize="16sp" /> @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/screen_roulette_config_price_hint" android:importantForAutofill="no" android:inputType="numberSigned" @@ -209,7 +209,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_create_price_unit" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -219,7 +219,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="26.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_roulette_config_option_label" android:textColor="@color/color_eeeeee" android:textSize="16sp" /> @@ -234,7 +234,7 @@ android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_roulette_config_option_limit" android:textColor="@color/color_ff5c49" android:textSize="13.3sp" /> @@ -262,7 +262,7 @@ android:textColor="@color/color_eeeeee" android:textSize="14.7sp" tools:ignore="RelativeOverlap" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -110,7 +110,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginBottom="30dp" android:background="@color/color_cc333333" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:paddingVertical="10dp" android:text="@string/screen_search_more" @@ -122,7 +122,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_search_content_title" android:textColor="@color/color_eeeeee" android:textSize="16sp" /> @@ -141,7 +141,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginBottom="30dp" android:background="@color/color_cc333333" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:paddingVertical="10dp" android:text="@string/screen_search_more" @@ -153,7 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_search_series_title" android:textColor="@color/color_eeeeee" android:textSize="16sp" /> @@ -172,7 +172,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginBottom="13.3dp" android:background="@color/color_cc333333" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 77d1d581..3f68063f 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/pretendard_medium" + android:fontFamily="@font/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 921e37c3..32115945 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 dcc0de3a..514f35ff 100644 --- a/app/src/main/res/layout/activity_series_detail.xml +++ b/app/src/main/res/layout/activity_series_detail.xml @@ -75,7 +75,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="27dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" tools:text="The 야한 남친" /> @@ -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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_909090" android:textSize="13.3sp" tools:text="청령" /> diff --git a/app/src/main/res/layout/activity_service_center.xml b/app/src/main/res/layout/activity_service_center.xml index f1dd19df..7c3cf103 100644 --- a/app/src/main/res/layout/activity_service_center.xml +++ b/app/src/main/res/layout/activity_service_center.xml @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_service_center_logo_label" android:textColor="@color/color_eeeeee" android:textSize="20sp" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_service_center_kakao" android:textColor="@color/black" android:textSize="13.3sp" @@ -67,7 +67,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_service_center_faq_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 60191746..4fa52af3 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_settings_notification" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -73,7 +73,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_settings_content" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -106,7 +106,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_settings_language" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -141,7 +141,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_settings_terms" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -174,7 +174,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_settings_privacy" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -207,7 +207,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_settings_oss_license" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -236,7 +236,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_settings_app_version" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -247,7 +247,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/company_info" android:textColor="@color/color_777777" android:textSize="11sp" /> @@ -272,7 +272,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="46.7dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="19.3dp" android:text="@string/screen_settings_logout" @@ -285,7 +285,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="26.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 ab47086e..89a6bdab 100644 --- a/app/src/main/res/layout/activity_sign_out.xml +++ b/app/src/main/res/layout/activity_sign_out.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_sign_out_question" android:textColor="@color/color_3bb9f1" android:textSize="20sp" /> @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_sign_out_reason_etc" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -201,7 +201,7 @@ android:layout_height="wrap_content" android:background="@null" android:button="@null" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:hint="@string/screen_sign_out_reason_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -229,7 +229,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="26.7dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_sign_out_social_hint" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -286,7 +286,7 @@ android:layout_marginTop="53.3dp" android:layout_marginBottom="13.3dp" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_sign_out_submit" diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml index 60dffc35..3fbb252f 100644 --- a/app/src/main/res/layout/activity_signup.xml +++ b/app/src/main/res/layout/activity_signup.xml @@ -42,7 +42,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/hint_email" android:importantForAutofill="no" android:inputType="textEmailAddress" @@ -72,7 +72,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/hint_password" android:imeOptions="actionDone" android:importantForAutofill="no" @@ -111,7 +111,7 @@ android:id="@+id/tv_terms_of_service" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/terms_of_service" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -120,7 +120,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/required_label" android:textColor="@color/color_3bb9f1" android:textSize="12sp" /> @@ -155,7 +155,7 @@ android:id="@+id/tv_privacy_policy" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/privacy_policy" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -164,7 +164,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/required_label" android:textColor="@color/color_3bb9f1" android:textSize="12sp" /> @@ -178,7 +178,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="26.7dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/title_signup" diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index bad173ed..65a68124 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -30,7 +30,7 @@ @@ -48,7 +48,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="52dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_splash_brand_name" android:textColor="@color/white" android:textSize="21sp" /> 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 19046da6..1664046b 100644 --- a/app/src/main/res/layout/activity_text_message_detail.xml +++ b/app/src/main/res/layout/activity_text_message_detail.xml @@ -34,7 +34,7 @@ android:id="@+id/tv_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" tools:text="이재형 대표님" /> @@ -45,7 +45,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_eeeeee" android:textSize="15sp" /> @@ -91,7 +91,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_message_detail_action_reply" android:textColor="@color/color_eeeeee" @@ -104,7 +104,7 @@ android:layout_marginHorizontal="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_message_detail_action_keep" android:textColor="@color/color_3bb9f1" @@ -116,7 +116,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_message_detail_action_delete" android:textColor="@color/color_3bb9f1" diff --git a/app/src/main/res/layout/activity_text_message_write.xml b/app/src/main/res/layout/activity_text_message_write.xml index 868374f2..ca6a52c8 100644 --- a/app/src/main/res/layout/activity_text_message_write.xml +++ b/app/src/main/res/layout/activity_text_message_write.xml @@ -16,7 +16,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_message_write_title_new" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -28,7 +28,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="top" android:hint="@string/screen_message_write_input_hint" android:importantForAutofill="no" @@ -118,7 +118,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginBottom="13.3dp" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_message_write_button_send" android:textColor="@color/color_eeeeee" diff --git a/app/src/main/res/layout/activity_user_follower_list.xml b/app/src/main/res/layout/activity_user_follower_list.xml index 4f874cc4..6168fc21 100644 --- a/app/src/main/res/layout/activity_user_follower_list.xml +++ b/app/src/main/res/layout/activity_user_follower_list.xml @@ -16,7 +16,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_marginTop="26.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_user_follower_list_total_label" android:textColor="@color/white" android:textSize="18.3sp" @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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.xml b/app/src/main/res/layout/activity_user_profile.xml index e314420a..3755d57e 100644 --- a/app/src/main/res/layout/activity_user_profile.xml +++ b/app/src/main/res/layout/activity_user_profile.xml @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:maxLines="1" android:textColor="@color/color_eeeeee" android:textSize="32sp" @@ -79,7 +79,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/white" android:textSize="16sp" android:visibility="gone" @@ -91,7 +91,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:background="@drawable/bg_round_corner_999_white" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="8dp" android:text="@string/screen_user_profile_follower_list" @@ -133,7 +133,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_4_263238_3bb9f1" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:paddingHorizontal="7dp" android:paddingVertical="4dp" android:text="@string/latest_content" @@ -157,7 +157,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="8dp" android:background="@drawable/bg_round_corner_2_6_003851" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:padding="2.6dp" android:text="@string/screen_user_profile_latest_content_scheduled" android:textColor="@color/color_3bb9f1" @@ -170,7 +170,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_2_6_28312b" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_3bac6a" @@ -183,7 +183,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_2_6_222222" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:padding="2.6dp" android:textColor="@color/color_777777" @@ -196,7 +196,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_round_corner_2_6_7849bc" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:padding="2.6dp" android:text="@string/screen_user_profile_latest_content_point" @@ -212,7 +212,7 @@ android:layout_marginTop="2.6dp" android:layout_marginBottom="6.7dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:maxLines="2" android:textColor="@color/white" android:textSize="18sp" @@ -240,7 +240,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:textColor="@color/color_777777" android:textSize="18sp" @@ -266,7 +266,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:textColor="@color/color_777777" android:textSize="18sp" @@ -347,7 +347,7 @@ android:layout_height="match_parent" android:layout_centerVertical="true" android:drawablePadding="6.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center_vertical" android:textColor="@color/white" android:textSize="20sp" 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 7cb18b82..613cad64 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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_777777" android:textSize="12sp" tools:text="3" /> @@ -73,7 +73,7 @@ android:textSize="13.3sp" android:theme="@style/EditTextStyle" tools:ignore="LabelFor" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="end" android:text="@string/screen_user_profile_donation_toggle_desc" android:textColor="@color/color_555555" @@ -71,7 +71,7 @@ @@ -81,7 +81,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toStartOf="@+id/tv_unit_today" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="12sp" tools:ignore="RelativeOverlap" /> @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/screen_user_profile_donation_can_unit_with_space" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -105,7 +105,7 @@ @@ -115,7 +115,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toStartOf="@+id/tv_unit_last_week" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="12sp" tools:ignore="RelativeOverlap" /> @@ -125,7 +125,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/screen_user_profile_donation_can_unit_with_space" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -139,7 +139,7 @@ @@ -149,7 +149,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toStartOf="@+id/tv_unit_this_month" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="12sp" tools:ignore="RelativeOverlap" /> @@ -159,7 +159,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/screen_user_profile_donation_can_unit_with_space" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_80d8ff" android:textSize="12sp" tools:text="56" /> @@ -194,7 +194,7 @@ diff --git a/app/src/main/res/layout/detail_toolbar.xml b/app/src/main/res/layout/detail_toolbar.xml index 3046c7cc..11a18c94 100644 --- a/app/src/main/res/layout/detail_toolbar.xml +++ b/app/src/main/res/layout/detail_toolbar.xml @@ -14,7 +14,7 @@ android:layout_centerVertical="true" android:drawablePadding="6.7dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:minHeight="48dp" android:textColor="@color/color_eeeeee" diff --git a/app/src/main/res/layout/dialog_application_method.xml b/app/src/main/res/layout/dialog_application_method.xml index f2674f65..a7461caf 100644 --- a/app/src/main/res/layout/dialog_application_method.xml +++ b/app/src/main/res/layout/dialog_application_method.xml @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="33.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/dialog_audition_method_title" android:textColor="@color/color_bbbbbb" @@ -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/pretendard_medium" + android:fontFamily="@font/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 07339839..a4cf1614 100644 --- a/app/src/main/res/layout/dialog_audio_content_delete.xml +++ b/app/src/main/res/layout/dialog_audio_content_delete.xml @@ -13,7 +13,7 @@ + android:fontFamily="@font/medium" /> @@ -89,7 +89,7 @@ android:layout_centerVertical="true" android:layout_marginHorizontal="4.3dp" android:layout_toEndOf="@+id/iv_profile" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -143,7 +143,7 @@ android:id="@+id/tv_point" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" android:visibility="gone" @@ -153,7 +153,7 @@ android:id="@+id/tv_plus" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/audio_content_order_plus" android:visibility="gone" android:layout_marginHorizontal="10dp" @@ -172,7 +172,7 @@ android:id="@+id/tv_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:text="300" /> @@ -190,7 +190,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_transparent_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="15.7dp" android:text="@string/cancel" @@ -204,7 +204,7 @@ android:layout_marginStart="12dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="15.7dp" android:text="@string/confirm" diff --git a/app/src/main/res/layout/dialog_audio_content_report.xml b/app/src/main/res/layout/dialog_audio_content_report.xml index 79c9cbb5..709be5c9 100644 --- a/app/src/main/res/layout/dialog_audio_content_report.xml +++ b/app/src/main/res/layout/dialog_audio_content_report.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_detail_report_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_9970ff" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:text="@string/screen_audio_content_detail_report_desc" android:textColor="@color/color_dd4500" @@ -120,7 +120,7 @@ android:layout_marginEnd="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_transparent_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="15.7dp" android:text="@string/cancel" @@ -134,7 +134,7 @@ android:layout_marginStart="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="15.7dp" android:text="@string/report_button" diff --git a/app/src/main/res/layout/dialog_character_comment_more.xml b/app/src/main/res/layout/dialog_character_comment_more.xml index 0c17b1f2..352374ba 100644 --- a/app/src/main/res/layout/dialog_character_comment_more.xml +++ b/app/src/main/res/layout/dialog_character_comment_more.xml @@ -26,7 +26,7 @@ android:text="@string/report_title" android:textColor="@color/white" android:textSize="18sp" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/dialog_character_comment_report.xml b/app/src/main/res/layout/dialog_character_comment_report.xml index 21fdc424..60b91f3c 100644 --- a/app/src/main/res/layout/dialog_character_comment_report.xml +++ b/app/src/main/res/layout/dialog_character_comment_report.xml @@ -20,7 +20,7 @@ android:textSize="16sp" android:textStyle="bold" tools:ignore="RelativeOverlap" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> 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 dc95dd1b..d27ae079 100644 --- a/app/src/main/res/layout/dialog_community_post_report.xml +++ b/app/src/main/res/layout/dialog_community_post_report.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/dialog_community_post_report_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:buttonTint="@color/color_3bb9f1" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/report_reason_misinformation" android:textColor="@color/color_eeeeee" android:textSize="14sp" /> @@ -120,7 +120,7 @@ android:layout_marginEnd="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="15.7dp" android:text="@string/cancel" @@ -134,7 +134,7 @@ android:layout_marginStart="6.7dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="15.7dp" android:text="@string/report_button" diff --git a/app/src/main/res/layout/dialog_live.xml b/app/src/main/res/layout/dialog_live.xml index 0ef9a903..fbefeb4a 100644 --- a/app/src/main/res/layout/dialog_live.xml +++ b/app/src/main/res/layout/dialog_live.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/color_bbbbbb" android:textSize="18.3sp" @@ -26,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:textColor="@color/color_bbbbbb" android:textSize="15sp" @@ -54,7 +54,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/color_3bb9f1" @@ -67,7 +67,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/white" diff --git a/app/src/main/res/layout/dialog_live_input.xml b/app/src/main/res/layout/dialog_live_input.xml index 74bb5992..b3b8f348 100644 --- a/app/src/main/res/layout/dialog_live_input.xml +++ b/app/src/main/res/layout/dialog_live_input.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/color_bbbbbb" android:textSize="18.3sp" @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="top" android:hint="취소사유를 입력해 주세요" android:importantForAutofill="no" @@ -63,7 +63,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/color_3bb9f1" @@ -76,7 +76,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/white" diff --git a/app/src/main/res/layout/dialog_live_no_chatting.xml b/app/src/main/res/layout/dialog_live_no_chatting.xml index 3d1449b5..89ee32fa 100644 --- a/app/src/main/res/layout/dialog_live_no_chatting.xml +++ b/app/src/main/res/layout/dialog_live_no_chatting.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_live_room_dialog_title_no_chat" android:textColor="@color/color_bbbbbb" @@ -47,7 +47,7 @@ android:textColor="@color/color_bbbbbb" android:textSize="16.7sp" tools:text="델1002" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -60,7 +60,7 @@ android:id="@+id/tv_start_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:lineSpacingExtra="4sp" android:textColor="@color/color_bbbbbb" android:textSize="15sp" @@ -117,7 +117,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/color_3bb9f1" @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:layout_weight="2" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/white" diff --git a/app/src/main/res/layout/dialog_live_room.xml b/app/src/main/res/layout/dialog_live_room.xml index 4ce1eff2..0963da52 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 84d576ed..adece5ca 100644 --- a/app/src/main/res/layout/dialog_live_room_donation.xml +++ b/app/src/main/res/layout/dialog_live_room_donation.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:drawablePadding="6.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center_vertical" android:text="@string/screen_live_room_donation_title" android:textColor="@color/color_eeeeee" @@ -41,7 +41,7 @@ android:layout_marginEnd="6.7dp" android:layout_toStartOf="@+id/tv_charge" android:drawablePadding="6.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="16sp" @@ -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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/screen_live_room_donation_input_min" android:importantForAutofill="no" android:inputType="numberSigned" @@ -122,7 +122,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="12.7dp" android:text="@string/screen_live_room_donation_plus_10" @@ -136,7 +136,7 @@ android:layout_marginStart="8dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="12.7dp" android:text="@string/screen_live_room_donation_plus_100" @@ -150,7 +150,7 @@ android:layout_marginStart="8dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="12.7dp" android:text="@string/screen_live_room_donation_plus_1000" @@ -164,7 +164,7 @@ android:layout_marginStart="8dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="12.7dp" android:text="@string/screen_live_room_donation_plus_10000" @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/screen_live_room_donation_message_hint" android:importantForAutofill="no" android:inputType="text" @@ -224,7 +224,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_cancel" @@ -237,7 +237,7 @@ android:layout_height="wrap_content" android:layout_weight="1.5" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_donation_title" diff --git a/app/src/main/res/layout/dialog_live_room_donation_message.xml b/app/src/main/res/layout/dialog_live_room_donation_message.xml index dfb7c8f4..7aa5ae68 100644 --- a/app/src/main/res/layout/dialog_live_room_donation_message.xml +++ b/app/src/main/res/layout/dialog_live_room_donation_message.xml @@ -18,7 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_donation_history_title" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toEndOf="@+id/tv_title" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" tools:ignore="RelativeOverlap" @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/screen_live_room_close" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -53,7 +53,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="30dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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 8f49990d..51792184 100644 --- a/app/src/main/res/layout/dialog_live_room_donation_ranking.xml +++ b/app/src/main/res/layout/dialog_live_room_donation_ranking.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:layout_marginStart="20dp" android:layout_marginTop="20dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_donation_ranking_title" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -52,7 +52,7 @@ @@ -68,7 +68,7 @@ @@ -76,7 +76,7 @@ @@ -84,7 +84,7 @@ @@ -92,7 +92,7 @@ @@ -100,7 +100,7 @@ @@ -120,7 +120,7 @@ android:id="@+id/tv_total_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_80d8ff" android:textSize="12sp" tools:text="56" /> @@ -192,7 +192,7 @@ @@ -45,7 +45,7 @@ android:id="@+id/tv_total_heart_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_total_label" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" /> @@ -57,7 +57,7 @@ android:layout_marginEnd="2.7dp" android:layout_toStartOf="@+id/tv_total_can_unit" android:layout_toEndOf="@+id/tv_total_heart_title" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="end" android:textColor="@color/color_80d8ff" android:textSize="14sp" @@ -69,7 +69,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_live_room_heart_label" android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" @@ -88,7 +88,7 @@ @@ -98,7 +98,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_80d8ff" android:textSize="12sp" tools:text="56" /> @@ -106,7 +106,7 @@ @@ -76,7 +76,7 @@ @@ -86,7 +86,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/edittext_underline" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/screen_live_room_title_hint" android:importantForAutofill="no" android:inputType="textWebEditText" @@ -110,7 +110,7 @@ @@ -163,7 +163,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_age_limit_adult" android:textColor="@color/color_eeeeee" @@ -190,7 +190,7 @@ @@ -204,7 +204,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_menu_activate_question" android:textColor="@color/color_eeeeee" @@ -255,7 +255,7 @@ android:id="@+id/tv_select_menu_1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_menu_preset_1" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -284,7 +284,7 @@ android:id="@+id/tv_select_menu_2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_menu_preset_2" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -313,7 +313,7 @@ android:id="@+id/tv_select_menu_3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_room_menu_preset_3" android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -326,7 +326,7 @@ android:layout_height="200dp" android:layout_marginTop="13.3dp" android:background="@drawable/bg_round_corner_6_7_222222" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="top" android:hint="@string/screen_live_room_menu_hint" android:importantForAutofill="no" @@ -353,7 +353,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingExtra="5sp" android:text="@string/screen_live_room_entry_message_label" android:textColor="@color/color_eeeeee" @@ -384,7 +384,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_cancel" @@ -397,7 +397,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_update_action" diff --git a/app/src/main/res/layout/dialog_live_room_password.xml b/app/src/main/res/layout/dialog_live_room_password.xml index 1738212c..7d8d40be 100644 --- a/app/src/main/res/layout/dialog_live_room_password.xml +++ b/app/src/main/res/layout/dialog_live_room_password.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_live_room_password_title" android:textColor="@color/color_bbbbbb" @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="6dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:text="@string/screen_live_room_password_description" android:textColor="@color/color_bbbbbb" @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_live_room_password_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -62,7 +62,7 @@ android:layout_height="wrap_content" android:background="@drawable/edittext_underline" android:digits="0123456789" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:hint="@string/screen_live_room_password_hint" android:importantForAutofill="no" android:inputType="number" @@ -96,7 +96,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_cancel" @@ -117,7 +117,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/white" android:textSize="18.3sp" @@ -128,7 +128,7 @@ android:id="@+id/tv_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/white" android:textSize="18.3sp" diff --git a/app/src/main/res/layout/dialog_live_room_profile.xml b/app/src/main/res/layout/dialog_live_room_profile.xml index 5394bb83..e79a16fc 100644 --- a/app/src/main/res/layout/dialog_live_room_profile.xml +++ b/app/src/main/res/layout/dialog_live_room_profile.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center_vertical" android:text="@string/screen_live_room_participants" android:textColor="@color/color_eeeeee" @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_marginStart="6.7dp" android:layout_toStartOf="@+id/tv_total_peoples" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 ab6674c5..2085b50b 100644 --- a/app/src/main/res/layout/dialog_live_room_user_profile.xml +++ b/app/src/main/res/layout/dialog_live_room_user_profile.xml @@ -19,7 +19,7 @@ @@ -59,7 +59,7 @@ android:id="@+id/tv_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" tools:text="닉네임" /> @@ -75,7 +75,7 @@ android:textColor="@color/white" android:textSize="11.3sp" tools:text="여" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -189,7 +189,7 @@ android:textColor="@color/color_909090" android:textSize="12sp" tools:text="매주 일요일 밤 12시 사냥꾼의 연애상담소를 오픈합니다. 많은 관심 부탁드립니다~매주 일요일 밤 12시 사냥꾼의 연애상담소를 오픈합니다. 많은 관심 부탁드립니다~" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/dialog_loading.xml b/app/src/main/res/layout/dialog_loading.xml index 1671096d..6b268d9b 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/pretendard_medium" + android:fontFamily="@font/medium" android:textSize="13sp" tools:text="로딩중 입니다..." /> diff --git a/app/src/main/res/layout/dialog_member_profile.xml b/app/src/main/res/layout/dialog_member_profile.xml index d521a692..d772bec6 100644 --- a/app/src/main/res/layout/dialog_member_profile.xml +++ b/app/src/main/res/layout/dialog_member_profile.xml @@ -19,7 +19,7 @@ @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="21.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" tools:text="닉네임" /> @@ -63,7 +63,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="13dp" android:text="@string/screen_live_room_block_title" @@ -76,7 +76,7 @@ android:layout_marginHorizontal="8dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="13dp" android:text="@string/dialog_user_report_title" @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="13dp" android:text="@string/dialog_member_profile_report_profile" diff --git a/app/src/main/res/layout/dialog_notification_settings.xml b/app/src/main/res/layout/dialog_notification_settings.xml index 11f12d5d..54e4f2f8 100644 --- a/app/src/main/res/layout/dialog_notification_settings.xml +++ b/app/src/main/res/layout/dialog_notification_settings.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_notification_settings_title" android:textColor="@color/color_eeeeee" @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/notification_settings_live" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -61,7 +61,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/notification_settings_upload" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -94,7 +94,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/notification_settings_message" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -117,7 +117,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="26.7dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/notification_settings_confirm" diff --git a/app/src/main/res/layout/dialog_profile_report.xml b/app/src/main/res/layout/dialog_profile_report.xml index f2c42004..7ac50b66 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 211746ba..9c2ecbac 100644 --- a/app/src/main/res/layout/dialog_purchase_community_post.xml +++ b/app/src/main/res/layout/dialog_purchase_community_post.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/dialog_purchase_community_post_title" android:textColor="@color/color_bbbbbb" @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:text="@string/dialog_purchase_community_post_desc" android:textColor="@color/color_bbbbbb" @@ -55,7 +55,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/cancel" @@ -69,7 +69,7 @@ android:layout_weight="2" android:background="@drawable/bg_round_corner_10_3bb9f1" android:paddingVertical="16dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/white" android:textSize="18.3sp" diff --git a/app/src/main/res/layout/dialog_review_report.xml b/app/src/main/res/layout/dialog_review_report.xml index 03ab22de..0be964f6 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:padding="6.7dp" android:text="@string/report_button" android:textColor="@color/color_9970ff" diff --git a/app/src/main/res/layout/dialog_roulette_preview.xml b/app/src/main/res/layout/dialog_roulette_preview.xml index 0f1fe343..91f65443 100644 --- a/app/src/main/res/layout/dialog_roulette_preview.xml +++ b/app/src/main/res/layout/dialog_roulette_preview.xml @@ -38,7 +38,7 @@ android:id="@+id/tv_select_roulette_1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_roulette_config_preset_1" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -67,7 +67,7 @@ android:id="@+id/tv_select_roulette_2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_roulette_config_preset_2" android:textColor="@color/color_ffcb14" android:textSize="14.7sp" /> @@ -97,7 +97,7 @@ android:id="@+id/tv_select_roulette_3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_roulette_config_preset_3" android:textColor="@color/color_ff14d9" android:textSize="14.7sp" /> @@ -114,7 +114,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="18.3sp" /> @@ -124,7 +124,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:drawablePadding="6.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="16sp" @@ -153,7 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_10_transparent_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingHorizontal="18dp" android:paddingVertical="16dp" @@ -168,7 +168,7 @@ android:layout_marginStart="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/white" diff --git a/app/src/main/res/layout/dialog_soda.xml b/app/src/main/res/layout/dialog_soda.xml index db629a82..86a02f70 100644 --- a/app/src/main/res/layout/dialog_soda.xml +++ b/app/src/main/res/layout/dialog_soda.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/color_bbbbbb" android:textSize="18.3sp" @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_bbbbbb" android:textSize="15sp" app:layout_constraintEnd_toEndOf="parent" @@ -53,7 +53,7 @@ android:layout_marginEnd="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/color_3bb9f1" @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:layout_weight="2" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:textColor="@color/white" diff --git a/app/src/main/res/layout/dialog_user_report.xml b/app/src/main/res/layout/dialog_user_report.xml index 9fc12b0a..a3b9d8c3 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 b9aaff72..c348acd3 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:layout_marginHorizontal="13.3dp" android:text="@string/screen_audio_content_detail_comment_secret" @@ -120,7 +120,7 @@ android:textCursorDrawable="@drawable/edit_text_cursor" android:textSize="13.3sp" tools:ignore="LabelFor" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> @@ -88,7 +88,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@null" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center_vertical" android:paddingHorizontal="54.67dp" android:text="@string/audio_content_search_channel_placeholder" @@ -108,7 +108,7 @@ android:id="@+id/tv_creator_rank_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:paddingHorizontal="13.3dp" android:text="@string/audio_content_creator_rank_title" android:textColor="@color/color_eeeeee" @@ -127,7 +127,7 @@ android:id="@+id/tv_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -135,7 +135,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/screen_explorer_creator_rank_notice" android:textColor="@color/color_bbbbbb" android:textSize="13.3sp" /> @@ -161,7 +161,7 @@ @@ -221,7 +221,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="2.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/audio_content_morning_call_title" android:textColor="@color/color_0057ff" @@ -243,7 +243,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="2.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_short_play_title" android:textColor="@color/color_dd158d" android:textSize="16.7sp" @@ -266,7 +266,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_new_content_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -320,7 +320,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_ranking_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -348,7 +348,7 @@ android:id="@+id/tv_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -356,7 +356,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/screen_audio_content_ranking_notice" android:textColor="@color/color_bbbbbb" android:textSize="13.3sp" /> @@ -396,7 +396,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="16.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/company_info" android:textColor="@color/color_777777" android:textSize="11sp" /> @@ -425,7 +425,7 @@ diff --git a/app/src/main/res/layout/fragment_audio_content_main_tab_alarm.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_alarm.xml index 8992e024..a59cd913 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_alarm.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_alarm.xml @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_alarm_new_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/fragment_audio_content_main_tab_asmr.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_asmr.xml index 73230faf..39b97d01 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_asmr.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_asmr.xml @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_asmr_new_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_asmr_channel_recommend_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -117,7 +117,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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 69e190bb..3158c62e 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_content.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_content.xml @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_content_new_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -85,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_content_daily_ranking_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -118,7 +118,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_content_channel_recommend_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -160,7 +160,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:lineSpacingExtra="8dp" android:text="@string/common_auth_request_mypage" @@ -196,7 +196,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_content_tag_recommend_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/fragment_audio_content_main_tab_free.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_free.xml index a3b126fd..178548c9 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_free.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_free.xml @@ -40,7 +40,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_free_creator_intro_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -76,7 +76,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_free_recommend_series_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -106,7 +106,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_free_new_content_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -150,7 +150,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_free_channel_recommend_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -192,7 +192,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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 40f3dba0..f73dd072 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_home.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_home.xml @@ -28,7 +28,7 @@ android:layout_alignParentStart="true" android:layout_centerVertical="true" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center_vertical" android:text="@string/app_name" android:textColor="@color/white" @@ -59,7 +59,7 @@ android:id="@+id/tv_notice_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/audio_content_home_tab_audio_toon" android:textColor="@color/color_777777" android:textSize="12sp" @@ -387,7 +387,7 @@ android:id="@+id/tv_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" tools:text="2023년 10월 16일~10월 22일" /> @@ -396,7 +396,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/audio_content_main_popular_notice" android:textColor="@color/color_bbbbbb" android:textSize="13.3sp" /> @@ -407,7 +407,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="30dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:paddingHorizontal="13.3dp" android:text="@string/audio_content_home_creator_title" android:textColor="@color/color_eeeeee" @@ -433,7 +433,7 @@ @@ -521,7 +521,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_home_channel_content_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -563,7 +563,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/company_info" android:textColor="@color/color_777777" android:textSize="11sp" /> @@ -608,7 +608,7 @@ diff --git a/app/src/main/res/layout/fragment_audio_content_main_tab_replay.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_replay.xml index 610e130e..4fa97b38 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_replay.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_replay.xml @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_replay_new_live_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_replay_channel_live_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -117,7 +117,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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 013e5cd6..e9d96b38 100644 --- a/app/src/main/res/layout/fragment_audio_content_main_tab_series.xml +++ b/app/src/main/res/layout/fragment_audio_content_main_tab_series.xml @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_series_original_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -77,7 +77,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_series_daily_ranking_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -103,7 +103,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_series_genre_recommend_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -145,7 +145,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:lineSpacingExtra="8dp" android:text="@string/common_auth_request_mypage" @@ -167,7 +167,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_series_new_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -197,7 +197,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_series_complete_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -233,7 +233,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_series_channel_recommend_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -276,7 +276,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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.xml b/app/src/main/res/layout/fragment_audio_content_order.xml index 93eb9c5a..c2e03d2e 100644 --- a/app/src/main/res/layout/fragment_audio_content_order.xml +++ b/app/src/main/res/layout/fragment_audio_content_order.xml @@ -19,7 +19,7 @@ @@ -27,7 +27,7 @@ @@ -57,7 +57,7 @@ android:id="@+id/tv_rental" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:text="300" /> @@ -79,7 +79,7 @@ @@ -88,7 +88,7 @@ android:id="@+id/tv_keep_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/audio_content_order_keep_period_default" android:textColor="@color/white" android:textSize="12sp" /> @@ -118,7 +118,7 @@ android:id="@+id/tv_keep" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:text="500" /> 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 ce0e9461..5a7a466e 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_909090" android:textSize="12sp" tools:text="2개" /> @@ -81,7 +81,7 @@ @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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_audio_content_theme.xml b/app/src/main/res/layout/fragment_audio_content_theme.xml index af86daa1..515967ef 100644 --- a/app/src/main/res/layout/fragment_audio_content_theme.xml +++ b/app/src/main/res/layout/fragment_audio_content_theme.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:layout_marginStart="26.7dp" android:layout_marginTop="26.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audio_content_upload_theme_select" android:textColor="@color/white" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/fragment_audition.xml b/app/src/main/res/layout/fragment_audition.xml index 312993e2..ca797f72 100644 --- a/app/src/main/res/layout/fragment_audition.xml +++ b/app/src/main/res/layout/fragment_audition.xml @@ -14,7 +14,7 @@ android:layout_marginStart="13.3dp" android:drawablePadding="6.7dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:minHeight="48dp" android:text="@string/screen_audition_title" @@ -54,7 +54,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 bfa31c90..9ea55063 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/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/dialog_audition_apply_title" android:textColor="@color/white" android:textSize="18.3sp" /> @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/dialog_audition_apply_audio_file_title" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -62,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" /> @@ -71,7 +71,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/dialog_audition_apply_phone_title" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:lineSpacingMultiplier="1.25" android:text="@string/dialog_audition_apply_agreement" android:textColor="@color/color_eeeeee" @@ -128,7 +128,7 @@ android:layout_height="wrap_content" android:layout_marginTop="35dp" android:background="@drawable/bg_round_corner_8_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="13.3dp" android:text="@string/dialog_audition_apply_submit" 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 c8dc0f2a..f6114ea5 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_909090" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/iv_close" @@ -90,7 +90,7 @@ android:layout_marginHorizontal="8dp" android:layout_weight="1" android:background="@android:color/transparent" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:hint="@string/character_comment_input_hint" android:imeOptions="actionSend" android:importantForAutofill="no" 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 801cd362..1be35861 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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center_vertical" android:text="@string/character_comment_reply_title" android:textColor="@color/white" @@ -78,7 +78,7 @@ android:layout_marginHorizontal="8dp" android:layout_weight="1" android:background="@android:color/transparent" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:hint="@string/character_comment_input_hint" android:imeOptions="actionSend" android:importantForAutofill="no" diff --git a/app/src/main/res/layout/fragment_character_detail.xml b/app/src/main/res/layout/fragment_character_detail.xml index ce7ce0e9..07884908 100644 --- a/app/src/main/res/layout/fragment_character_detail.xml +++ b/app/src/main/res/layout/fragment_character_detail.xml @@ -70,7 +70,7 @@ android:id="@+id/tv_gender" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="7dp" android:paddingVertical="3dp" android:textSize="14sp" /> @@ -81,7 +81,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="4dp" android:background="@drawable/bg_character_info" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="7dp" android:paddingVertical="3dp" android:textColor="#B0BEC5" @@ -93,7 +93,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_character_info" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="7dp" android:paddingVertical="3dp" android:textColor="#B0BEC5" @@ -113,7 +113,7 @@ android:id="@+id/tv_character_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="26sp" tools:text="캐릭터명" /> @@ -124,7 +124,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:background="@drawable/bg_character_status_clone" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="5dp" android:paddingVertical="1dp" android:textColor="@color/white" @@ -138,7 +138,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/color_b0bec5" android:textSize="18sp" tools:text="캐릭터 한줄 소개" /> @@ -149,7 +149,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/color_3bb9f1" android:textSize="14sp" tools:text="#커버곡 #라이브 #연애 #썸 #채팅 #라방" /> @@ -169,7 +169,7 @@ android:id="@+id/tv_worldview_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/character_detail_worldview_title" android:textColor="@color/white" android:textSize="16sp" /> @@ -180,7 +180,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:lineSpacingExtra="4dp" android:textColor="@color/color_b0bec5" android:textSize="16sp" @@ -208,7 +208,7 @@ android:id="@+id/tv_worldview_expand" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/read_more" android:textColor="@color/color_607d8b" android:textSize="14sp" /> @@ -229,7 +229,7 @@ android:id="@+id/tv_original_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/character_detail_original_title" android:textColor="@color/white" android:textSize="16sp" /> @@ -241,7 +241,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="3" android:textColor="@color/color_b0bec5" android:textSize="16sp" @@ -254,7 +254,7 @@ android:layout_height="54dp" android:layout_marginTop="8dp" android:background="@drawable/bg_round_corner_16_stroke_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/character_detail_original_link" android:textColor="@color/color_3bb9f1" @@ -275,7 +275,7 @@ android:id="@+id/tv_personality_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/character_detail_personality_title" android:textColor="@color/white" android:textSize="16sp" /> @@ -286,7 +286,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:lineSpacingExtra="4dp" android:textColor="@color/color_b0bec5" android:textSize="16sp" @@ -314,7 +314,7 @@ android:id="@+id/tv_personality_expand" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/read_more" android:textColor="@color/color_607d8b" android:textSize="14sp" /> @@ -338,7 +338,7 @@ android:id="@+id/tv_chat_guide_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/character_detail_chat_guide_title" android:textColor="@color/color_b0bec5" android:textSize="16sp" /> @@ -349,7 +349,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:lineSpacingExtra="4dp" android:text="@string/character_detail_chat_guide_desc" android:textColor="@color/color_7c7c80" @@ -361,7 +361,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:lineSpacingExtra="4dp" android:text="@string/character_detail_chat_guide_notice" android:textColor="@color/color_7c7c80" @@ -392,7 +392,7 @@ android:id="@+id/tv_comments_label" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/character_detail_comments_label" android:textColor="@color/color_b0bec5" android:textSize="16sp" /> @@ -402,7 +402,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_b0bec5" android:textSize="16sp" tools:text="0" /> @@ -439,7 +439,7 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_weight="1" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/white" android:textSize="16sp" tools:text="가장 최근 댓글 내용이 여기에 표시됩니다." /> @@ -478,7 +478,7 @@ android:layout_marginEnd="4dp" android:layout_weight="1" android:background="@android:color/transparent" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:hint="@string/character_detail_comment_input_hint" android:imeOptions="actionSend" android:importantForAutofill="no" @@ -522,7 +522,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/character_detail_other_characters_title" android:textColor="@color/white" android:textSize="26sp" /> @@ -548,7 +548,7 @@ android:layout_marginHorizontal="24dp" android:layout_marginBottom="10dp" android:background="@drawable/bg_round_corner_16_solid_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/character_detail_chat_button" android:textColor="@color/white" diff --git a/app/src/main/res/layout/fragment_character_gallery.xml b/app/src/main/res/layout/fragment_character_gallery.xml index e57bb33d..f8dbd394 100644 --- a/app/src/main/res/layout/fragment_character_gallery.xml +++ b/app/src/main/res/layout/fragment_character_gallery.xml @@ -37,7 +37,7 @@ android:id="@+id/tv_ratio_left" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="18sp" app:layout_constraintStart_toStartOf="parent" @@ -48,7 +48,7 @@ android:id="@+id/tv_ratio_right" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/white" android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" @@ -77,7 +77,7 @@ android:layout_gravity="center_horizontal" android:layout_marginTop="24dp" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/character_gallery_empty" android:textColor="@color/white" diff --git a/app/src/main/res/layout/fragment_character_tab.xml b/app/src/main/res/layout/fragment_character_tab.xml index a32c3f56..153b731b 100644 --- a/app/src/main/res/layout/fragment_character_tab.xml +++ b/app/src/main/res/layout/fragment_character_tab.xml @@ -54,7 +54,7 @@ @@ -64,7 +64,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_fdca2f" android:textSize="20sp" tools:text="14" /> @@ -102,7 +102,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_character_tab_popular_title" android:textColor="@color/white" android:textSize="24sp" /> @@ -111,7 +111,7 @@ android:id="@+id/tv_popular_character_all" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/view_all" android:textColor="#90A4AE" android:textSize="14sp" @@ -148,7 +148,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_character_tab_new_title" android:textColor="@color/white" android:textSize="24sp" /> @@ -157,7 +157,7 @@ android:id="@+id/tv_new_character_all" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/view_all" android:textColor="#90A4AE" android:textSize="14sp" /> @@ -196,7 +196,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_character_tab_recommend_title" android:textColor="@color/white" android:textSize="24sp" /> diff --git a/app/src/main/res/layout/fragment_chat_background_picker.xml b/app/src/main/res/layout/fragment_chat_background_picker.xml index 7c1619cd..1a32e6e3 100644 --- a/app/src/main/res/layout/fragment_chat_background_picker.xml +++ b/app/src/main/res/layout/fragment_chat_background_picker.xml @@ -30,7 +30,7 @@ android:layout_marginStart="12dp" android:layout_weight="1" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:maxLines="1" android:text="@string/chat_background_picker_title" android:textColor="#FFFFFFFF" diff --git a/app/src/main/res/layout/fragment_chat_room_more_dialog.xml b/app/src/main/res/layout/fragment_chat_room_more_dialog.xml index 44ede99a..3c6d4ea7 100644 --- a/app/src/main/res/layout/fragment_chat_room_more_dialog.xml +++ b/app/src/main/res/layout/fragment_chat_room_more_dialog.xml @@ -32,7 +32,7 @@ android:layout_marginStart="12dp" android:layout_weight="1" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:maxLines="1" android:text="@string/chat_more_title" android:textColor="#FFFFFFFF" @@ -68,7 +68,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/chat_more_background_label" android:textColor="#B0BEC5" android:textSize="18sp" /> @@ -97,7 +97,7 @@ @@ -130,7 +130,7 @@ @@ -145,7 +145,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/chat_reset_warning_prefix" android:textColor="#B3FFFFFF" android:textSize="16sp" /> @@ -153,7 +153,7 @@ @@ -181,7 +181,7 @@ diff --git a/app/src/main/res/layout/fragment_content_main.xml b/app/src/main/res/layout/fragment_content_main.xml index 4c9e20f5..b5afed40 100644 --- a/app/src/main/res/layout/fragment_content_main.xml +++ b/app/src/main/res/layout/fragment_content_main.xml @@ -12,6 +12,6 @@ app:layout_constraintStart_toStartOf="parent" android:text="@string/screen_content_main_title" app:layout_constraintTop_toTopOf="parent" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> 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 725301d3..58fde9bc 100644 --- a/app/src/main/res/layout/fragment_creator_follow_notify.xml +++ b/app/src/main/res/layout/fragment_creator_follow_notify.xml @@ -9,7 +9,7 @@ @@ -32,7 +32,7 @@ @@ -56,7 +56,7 @@ @@ -80,7 +80,7 @@ diff --git a/app/src/main/res/layout/fragment_creator_tag.xml b/app/src/main/res/layout/fragment_creator_tag.xml index f16fb42e..7f344922 100644 --- a/app/src/main/res/layout/fragment_creator_tag.xml +++ b/app/src/main/res/layout/fragment_creator_tag.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:layout_marginStart="26.7dp" android:layout_marginTop="26.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_member_tag_title" android:textColor="@color/white" android:textSize="18.3sp" /> @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_margin="13.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_member_tag_confirm" 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 5189e68d..3c4436c8 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 6b7f6daf..be6d57f8 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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center_vertical" android:hint="채널명을 입력해보세요" android:importantForAutofill="no" @@ -92,6 +92,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/fl_search_channel" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 422fe239..7a5f81f0 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -77,7 +77,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/live_now" android:textColor="@color/white" android:textSize="24sp" /> @@ -104,7 +104,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/famous_creator" android:textColor="@color/white" android:textSize="24sp" /> @@ -135,7 +135,7 @@ android:id="@+id/tv_new_content" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/latest_content" android:textColor="@color/color_eeeeee" android:textSize="24sp" /> @@ -146,7 +146,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/view_all" android:textColor="@color/color_607d8b" /> @@ -212,7 +212,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/voiceon_original_only" android:textColor="@color/white" android:textSize="24sp" /> @@ -221,7 +221,7 @@ android:id="@+id/tv_series_original_all" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/view_all" android:textColor="#90A4AE" android:textSize="14sp" /> @@ -265,7 +265,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/series_by_weekday" android:textColor="@color/white" android:textSize="24sp" /> @@ -274,7 +274,7 @@ android:id="@+id/tv_series_day_of_week_all" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/view_all" android:textColor="#90A4AE" android:textSize="14sp" /> @@ -318,7 +318,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/popular_character_chat" android:textColor="@color/white" android:textSize="24sp" /> @@ -327,7 +327,7 @@ android:id="@+id/tv_popular_character_all" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/view_all" android:textColor="#90A4AE" android:textSize="14sp" /> @@ -355,7 +355,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/weekly_chart" android:textColor="@color/white" android:textSize="24sp" /> @@ -392,7 +392,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/recommend_channel" android:textColor="@color/white" android:textSize="24sp" /> @@ -426,7 +426,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/free_content" android:textColor="@color/white" android:textSize="24sp" /> @@ -435,7 +435,7 @@ android:id="@+id/tv_free_content_all" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/view_all" android:textColor="#90A4AE" android:textSize="14sp" /> @@ -471,7 +471,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/point_rental_content" android:textColor="@color/white" android:textSize="24sp" /> @@ -480,7 +480,7 @@ android:id="@+id/tv_point_content_all" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/view_all" android:textColor="#90A4AE" android:textSize="14sp" /> @@ -516,7 +516,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/recommend_content" android:textColor="@color/white" android:textSize="24sp" /> @@ -542,7 +542,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/company_info" android:textColor="@color/color_777777" android:textSize="11sp" @@ -580,7 +580,7 @@ diff --git a/app/src/main/res/layout/fragment_live.xml b/app/src/main/res/layout/fragment_live.xml index cc1d45f1..7e557b02 100644 --- a/app/src/main/res/layout/fragment_live.xml +++ b/app/src/main/res/layout/fragment_live.xml @@ -90,7 +90,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" android:layout_marginBottom="14dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_community_title" android:textColor="@color/color_3bb9f1" android:textSize="24sp" @@ -124,7 +124,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="4dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_latest_finished_prefix" android:textColor="@color/color_3bb9f1" android:textSize="24sp" /> @@ -132,7 +132,7 @@ @@ -159,7 +159,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="4dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_live_replay_prefix" android:textColor="@color/color_3bb9f1" android:textSize="24sp" /> @@ -167,7 +167,7 @@ @@ -213,7 +213,7 @@ 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 1e5b70a9..8953eaeb 100644 --- a/app/src/main/res/layout/fragment_live_room_detail.xml +++ b/app/src/main/res/layout/fragment_live_room_detail.xml @@ -47,13 +47,13 @@ android:text="@string/screen_live_room_age_badge" android:textColor="@color/color_e33621" android:visibility="gone" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -71,7 +71,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_bbbbbb" android:textSize="12sp" tools:text="2021.06.20 SUN 10p.m" /> @@ -83,7 +83,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:drawablePadding="6.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" @@ -119,7 +119,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:lineSpacingExtra="3.3sp" android:textColor="@color/color_777777" android:textSize="13.3sp" @@ -372,7 +372,7 @@ android:layout_marginStart="13.3dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_transparent_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_modify" @@ -386,7 +386,7 @@ android:layout_marginStart="13.3dp" android:layout_weight="2" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_start" @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:padding="5.3dp" android:text="@string/screen_live_room_cancel_reservation" @@ -431,7 +431,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:background="@drawable/bg_round_corner_10_525252" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_reservation_done" @@ -445,7 +445,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_reserve" @@ -459,7 +459,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:background="@drawable/bg_round_corner_10_ff5c49" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_room_join_now" diff --git a/app/src/main/res/layout/fragment_live_tag.xml b/app/src/main/res/layout/fragment_live_tag.xml index 659e850c..d6a25714 100644 --- a/app/src/main/res/layout/fragment_live_tag.xml +++ b/app/src/main/res/layout/fragment_live_tag.xml @@ -23,7 +23,7 @@ @@ -31,7 +31,7 @@ @@ -62,7 +62,7 @@ android:layout_alignParentBottom="true" android:layout_margin="13.3dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="16dp" android:text="@string/screen_live_tag_confirm" diff --git a/app/src/main/res/layout/fragment_my.xml b/app/src/main/res/layout/fragment_my.xml index cfe35e97..b4784b79 100644 --- a/app/src/main/res/layout/fragment_my.xml +++ b/app/src/main/res/layout/fragment_my.xml @@ -61,7 +61,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#B0BEC5" android:textSize="16sp" tools:text="[업데이트] 1.23.0 버전 업데이트" /> @@ -70,7 +70,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="2dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/screen_my_notice_more" android:textColor="#B0BEC5" android:textSize="16sp" @@ -105,7 +105,7 @@ android:id="@+id/tv_login" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center_vertical" android:text="@string/screen_my_login" android:textColor="#777777" @@ -141,7 +141,7 @@ android:layout_toStartOf="@+id/tv_edit_profile" android:layout_toEndOf="@+id/iv_profile" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:maxLines="1" android:textColor="#FFFFFF" android:textSize="18sp" @@ -155,7 +155,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:background="@drawable/bg_round_corner_999_263238" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="12dp" android:paddingVertical="6dp" android:text="@string/screen_my_edit_profile" @@ -170,7 +170,7 @@ android:layout_marginHorizontal="24dp" android:layout_marginBottom="32dp" android:background="@drawable/bg_round_corner_16_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="12dp" android:text="@string/screen_my_view_channel" @@ -202,7 +202,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:drawablePadding="8dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="#FFFFFF" android:textSize="18sp" app:drawableEndCompat="@drawable/ic_arrow_right" @@ -217,7 +217,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:background="@drawable/bg_round_corner_999_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:paddingHorizontal="16dp" android:paddingVertical="10dp" android:text="@string/screen_my_charge_can" @@ -240,7 +240,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:drawablePadding="8dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="#FFFFFF" android:textSize="18sp" app:drawableEndCompat="@drawable/ic_arrow_right" @@ -255,7 +255,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:background="@drawable/bg_round_corner_999_fc8f0f" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:paddingHorizontal="16dp" android:paddingVertical="10dp" android:text="@string/screen_my_point_reward" @@ -397,7 +397,7 @@ @@ -406,7 +406,7 @@ android:id="@+id/tv_recent_count" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="#FDC118" android:textSize="16sp" tools:text="5" /> diff --git a/app/src/main/res/layout/fragment_original_work_info.xml b/app/src/main/res/layout/fragment_original_work_info.xml index d9874105..bba015fa 100644 --- a/app/src/main/res/layout/fragment_original_work_info.xml +++ b/app/src/main/res/layout/fragment_original_work_info.xml @@ -18,7 +18,7 @@ @@ -28,7 +28,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#B0BEC5" android:textSize="14sp" app:animDuration="500" @@ -54,7 +54,7 @@ @@ -84,7 +84,7 @@ @@ -107,7 +107,7 @@ android:id="@+id/tv_label_writer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/original_work_info_label_writer" android:textColor="#B0BEC5" android:textSize="14sp" @@ -119,7 +119,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/white" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@id/tv_label_writer" @@ -134,7 +134,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/original_work_info_label_studio" android:textColor="#B0BEC5" android:textSize="14sp" @@ -146,7 +146,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/white" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@id/tv_label_studio" @@ -161,7 +161,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/original_work_info_label_original" android:textColor="#B0BEC5" android:textSize="14sp" @@ -173,7 +173,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/white" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@id/tv_label_original" 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 acff9e7b..89dc5d46 100644 --- a/app/src/main/res/layout/fragment_playlist_add_content.xml +++ b/app/src/main/res/layout/fragment_playlist_add_content.xml @@ -16,7 +16,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_playlist_create_add_content" android:textColor="@color/color_eeeeee" android:textSize="18sp" @@ -31,7 +31,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="13dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 5eea98a5..3fb28bac 100644 --- a/app/src/main/res/layout/fragment_recording_voice.xml +++ b/app/src/main/res/layout/fragment_recording_voice.xml @@ -12,7 +12,7 @@ @@ -100,7 +100,7 @@ android:layout_centerVertical="true" android:layout_marginStart="60dp" android:layout_toEndOf="@+id/iv_record_play" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_creator_community_record_delete" android:textColor="@color/color_bbbbbb" android:textSize="15.3sp" /> @@ -123,7 +123,7 @@ android:layout_height="50dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_creator_community_record_retry" android:textColor="@color/color_3bb9f1" @@ -136,7 +136,7 @@ android:layout_marginStart="13.3dp" android:layout_weight="2" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_creator_community_record_complete" android:textColor="@color/white" diff --git a/app/src/main/res/layout/fragment_series_detail_home.xml b/app/src/main/res/layout/fragment_series_detail_home.xml index e1154192..c2e562b2 100644 --- a/app/src/main/res/layout/fragment_series_detail_home.xml +++ b/app/src/main/res/layout/fragment_series_detail_home.xml @@ -19,7 +19,7 @@ @@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="2.3dp" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:textColor="@color/color_3bb9f1" android:textSize="16sp" tools:text="(30)" /> 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 6eb1101d..fe7c74d8 100644 --- a/app/src/main/res/layout/fragment_series_detail_introduction.xml +++ b/app/src/main/res/layout/fragment_series_detail_introduction.xml @@ -10,7 +10,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="16dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_series_detail_section_keywords" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="16dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_series_detail_section_introduction" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -45,7 +45,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="16dp" android:lineSpacingExtra="4dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_777777" android:textSize="14.7sp" /> @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="16dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_series_detail_section_info" android:textColor="@color/color_eeeeee" 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/white" android:textSize="14.7sp" tools:text="2024.04.11" /> @@ -205,7 +205,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" android:layout_marginTop="18.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_series_detail_section_price" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" tools:text="무료 ~ 500캔" /> diff --git a/app/src/main/res/layout/fragment_series_main_home.xml b/app/src/main/res/layout/fragment_series_main_home.xml index 4e8e475f..2784ae7b 100644 --- a/app/src/main/res/layout/fragment_series_main_home.xml +++ b/app/src/main/res/layout/fragment_series_main_home.xml @@ -54,7 +54,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_series_main_completed_title" android:textColor="@color/white" android:textSize="24sp" /> @@ -63,7 +63,7 @@ android:id="@+id/tv_completed_series_all" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/screen_series_main_completed_all" android:textColor="#90A4AE" android:textSize="14sp" /> @@ -101,7 +101,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_series_main_recommend_title" android:textColor="@color/white" android:textSize="24sp" /> diff --git a/app/src/main/res/layout/fragment_talk_tab.xml b/app/src/main/res/layout/fragment_talk_tab.xml index e3eff6a6..ddf2a6f1 100644 --- a/app/src/main/res/layout/fragment_talk_tab.xml +++ b/app/src/main/res/layout/fragment_talk_tab.xml @@ -22,7 +22,7 @@ android:text="@string/screen_chat_talk_empty" android:textColor="@android:color/white" android:textSize="20sp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:visibility="gone" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/fragment_text_message.xml b/app/src/main/res/layout/fragment_text_message.xml index c082c032..aa75c86e 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:paddingHorizontal="25dp" android:paddingVertical="10.7dp" android:text="@string/screen_message_filter_keep" @@ -91,7 +91,7 @@ @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/screen_voice_message_write_recipient_placeholder" android:textColor="@color/color_bbbbbb" android:textSize="16.7sp" /> @@ -105,7 +105,7 @@ android:id="@+id/tv_timer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/screen_audio_content_detail_time_default" android:textColor="@color/white" android:textSize="33.3sp" /> @@ -159,7 +159,7 @@ android:layout_centerVertical="true" android:layout_marginStart="60dp" android:layout_toEndOf="@+id/iv_record_play" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_message_detail_action_delete" android:textColor="@color/color_bbbbbb" android:textSize="15.3sp" /> @@ -182,7 +182,7 @@ android:layout_height="50dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_voice_message_write_retry" android:textColor="@color/color_3bb9f1" @@ -195,7 +195,7 @@ android:layout_marginStart="13.3dp" android:layout_weight="2" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_message_write_button_send" android:textColor="@color/white" diff --git a/app/src/main/res/layout/item_alarm.xml b/app/src/main/res/layout/item_alarm.xml index 03b63386..4321dc8e 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 c2835bd9..4700ab7a 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 c007ebe5..4ded74bf 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_555555" android:textSize="10.3sp" app:layout_constraintEnd_toEndOf="parent" @@ -105,7 +105,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="12sp" tools:text="1,000" /> @@ -116,7 +116,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:lineSpacingExtra="8dp" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -147,7 +147,7 @@ android:textSize="13.3sp" android:theme="@style/EditTextStyle" tools:ignore="LabelFor" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -167,7 +167,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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 ecd07c8c..4bbc78b8 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_555555" android:textSize="10.3sp" app:layout_constraintEnd_toEndOf="@+id/tv_comment_nickname" @@ -83,7 +83,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="12sp" tools:text="1,000" /> @@ -94,7 +94,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:lineSpacingExtra="8dp" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -125,7 +125,7 @@ android:textSize="13.3sp" android:theme="@style/EditTextStyle" tools:ignore="LabelFor" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> 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 0b16d2e0..48bbf84a 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/pretendard_medium" + android:fontFamily="@font/medium" android:maxLines="2" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" @@ -66,6 +66,6 @@ app:layout_constraintTop_toTopOf="@+id/iv_audio_content_creator" tools:ignore="SmallSp" tools:text="pgwkil" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> 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 5a7c7549..0d8a1590 100644 --- a/app/src/main/res/layout/item_audio_content_main_curation.xml +++ b/app/src/main/res/layout/item_audio_content_main_curation.xml @@ -8,7 +8,7 @@ android:id="@+id/tv_title" android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:paddingHorizontal="13.3dp" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" @@ -33,7 +33,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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 895a2189..673d9371 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/pretendard_medium" + android:fontFamily="@font/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_content_theme.xml b/app/src/main/res/layout/item_audio_content_main_new_content_theme.xml index a8d64b8b..59f7fbed 100644 --- a/app/src/main/res/layout/item_audio_content_main_new_content_theme.xml +++ b/app/src/main/res/layout/item_audio_content_main_new_content_theme.xml @@ -10,7 +10,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:background="@drawable/bg_round_corner_16_7_transparent_777777" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:paddingHorizontal="12dp" android:paddingVertical="8dp" 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 31765854..979df7e4 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 f814c031..bb5d86c8 100644 --- a/app/src/main/res/layout/item_audio_content_main_ranking.xml +++ b/app/src/main/res/layout/item_audio_content_main_ranking.xml @@ -18,7 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="12dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_3bb9f1" android:textSize="16.7sp" tools:text="1" /> @@ -32,7 +32,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 bf97b034..28e6f06d 100644 --- a/app/src/main/res/layout/item_audio_content_main_series_ranking.xml +++ b/app/src/main/res/layout/item_audio_content_main_series_ranking.xml @@ -18,7 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="12dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_3bb9f1" android:textSize="16.7sp" tools:text="1" /> @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 62e82327..ca2ad1e2 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 75672e08..c64e6afa 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:maxLines="2" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" @@ -121,5 +121,5 @@ app:layout_constraintTop_toTopOf="@+id/iv_audio_content_creator" tools:ignore="SmallSp" tools:text="pgwkil" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> 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 56d257b1..c53b3403 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" android:text="@string/alarm_select_badge_owned" @@ -173,7 +173,7 @@ android:textSize="10.3sp" android:visibility="gone" tools:ignore="SmallSp" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> 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 a9b7783b..10db4870 100644 --- a/app/src/main/res/layout/item_audio_content_ranking_all.xml +++ b/app/src/main/res/layout/item_audio_content_ranking_all.xml @@ -18,7 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="11dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_3bb9f1" android:textSize="16.7sp" app:layout_constraintBottom_toBottomOf="@+id/iv_cover" @@ -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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 0d4bb664..01ca4b9d 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/pretendard_medium" + android:fontFamily="@font/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 adf8ab0e..5bde2f97 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/pretendard_medium" + android:fontFamily="@font/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 62628da5..292c0ecb 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 03bf9264..8b2ac81a 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/pretendard_medium" + android:fontFamily="@font/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_list_completed_header.xml b/app/src/main/res/layout/item_audition_list_completed_header.xml index 44ecfecc..a41d7123 100644 --- a/app/src/main/res/layout/item_audition_list_completed_header.xml +++ b/app/src/main/res/layout/item_audition_list_completed_header.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="30dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audition_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audition_off" android:textColor="@color/color_bbbbbb" android:textSize="18.3sp" @@ -50,5 +50,5 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/tv_audition_title" tools:text="총 3개" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/item_audition_list_in_progress_header.xml b/app/src/main/res/layout/item_audition_list_in_progress_header.xml index 30a0f933..000eff4e 100644 --- a/app/src/main/res/layout/item_audition_list_in_progress_header.xml +++ b/app/src/main/res/layout/item_audition_list_in_progress_header.xml @@ -9,7 +9,7 @@ android:id="@+id/tv_audition_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audition_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_audition_on" android:textColor="@color/color_ff5c49" android:textSize="18.3sp" @@ -39,5 +39,5 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/tv_audition_title" tools:text="총 3개" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/item_audition_role.xml b/app/src/main/res/layout/item_audition_role.xml index a372220d..5061c749 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 03016fa0..177a0d2d 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 21e3710a..1930d030 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 15888d04..c31b2345 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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:textColor="@android:color/white" android:textSize="11.3sp" /> @@ -22,7 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@android:color/white" android:textSize="15.3sp" /> diff --git a/app/src/main/res/layout/item_can_charge.xml b/app/src/main/res/layout/item_can_charge.xml index fb05cdd8..1f8320a7 100644 --- a/app/src/main/res/layout/item_can_charge.xml +++ b/app/src/main/res/layout/item_can_charge.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" app:layout_constraintBottom_toBottomOf="parent" @@ -25,7 +25,7 @@ android:id="@+id/tv_price" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/item_can_charge_status.xml b/app/src/main/res/layout/item_can_charge_status.xml index 88bebeef..8a8f9bf6 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 4f64795b..94bafafa 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_777777" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" diff --git a/app/src/main/res/layout/item_character.xml b/app/src/main/res/layout/item_character.xml index 1e22f6fe..2d747ffc 100644 --- a/app/src/main/res/layout/item_character.xml +++ b/app/src/main/res/layout/item_character.xml @@ -22,7 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:includeFontPadding="false" android:maxLines="1" android:textColor="@color/white" @@ -37,7 +37,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:background="@drawable/bg_circle_3bb9f1" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:includeFontPadding="false" android:maxLines="1" @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="@color/color_b0bec5" android:textSize="18sp" /> @@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="#78909C" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/item_character_comment.xml b/app/src/main/res/layout/item_character_comment.xml index 03ce9f77..2acee0df 100644 --- a/app/src/main/res/layout/item_character_comment.xml +++ b/app/src/main/res/layout/item_character_comment.xml @@ -28,7 +28,7 @@ android:id="@+id/tv_comment_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="14sp" tools:text="닉네임" /> @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/color_b0bec5" android:textSize="12sp" tools:text="2시간전" /> @@ -58,7 +58,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:lineSpacingExtra="4dp" android:textColor="@color/white" android:textSize="16sp" @@ -72,7 +72,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/character_comment_write_reply" android:textColor="@color/color_3bb9f1" android:textSize="14sp" diff --git a/app/src/main/res/layout/item_character_comment_reply.xml b/app/src/main/res/layout/item_character_comment_reply.xml index 45acc4f3..de243ad2 100644 --- a/app/src/main/res/layout/item_character_comment_reply.xml +++ b/app/src/main/res/layout/item_character_comment_reply.xml @@ -29,7 +29,7 @@ android:id="@+id/tv_comment_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="14sp" tools:text="닉네임" /> @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/color_b0bec5" android:textSize="12sp" tools:text="2시간전" /> @@ -59,7 +59,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:lineSpacingExtra="4dp" android:textColor="@color/white" android:textSize="16sp" diff --git a/app/src/main/res/layout/item_character_gallery.xml b/app/src/main/res/layout/item_character_gallery.xml index 3da825a7..785a4027 100644 --- a/app/src/main/res/layout/item_character_gallery.xml +++ b/app/src/main/res/layout/item_character_gallery.xml @@ -56,7 +56,7 @@ android:id="@+id/tv_price" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="#263238" android:textSize="16sp" tools:text="0" /> diff --git a/app/src/main/res/layout/item_chat_ai_message.xml b/app/src/main/res/layout/item_chat_ai_message.xml index 281df1c0..6fc9f039 100644 --- a/app/src/main/res/layout/item_chat_ai_message.xml +++ b/app/src/main/res/layout/item_chat_ai_message.xml @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="2dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:includeFontPadding="false" android:maxLines="1" android:textColor="@android:color/white" @@ -62,7 +62,7 @@ android:layout_height="wrap_content" android:breakStrategy="balanced" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:hyphenationFrequency="normal" android:includeFontPadding="false" android:lineSpacingExtra="2dp" @@ -127,7 +127,7 @@ android:id="@+id/tv_price" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="#263238" android:textSize="16sp" /> @@ -136,7 +136,7 @@ android:id="@+id/tv_unlock" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/chat_unlock_image_hint" android:textColor="@android:color/white" android:textSize="18sp" /> @@ -157,7 +157,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:includeFontPadding="false" android:textColor="@color/color_777777" android:textSize="12sp" diff --git a/app/src/main/res/layout/item_chat_background_image.xml b/app/src/main/res/layout/item_chat_background_image.xml index 97375a3b..0c1c5034 100644 --- a/app/src/main/res/layout/item_chat_background_image.xml +++ b/app/src/main/res/layout/item_chat_background_image.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:layout_margin="6dp" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="6dp" android:paddingVertical="2dp" android:includeFontPadding="false" diff --git a/app/src/main/res/layout/item_chat_quota_notice.xml b/app/src/main/res/layout/item_chat_quota_notice.xml index ea947c46..c89fb85b 100644 --- a/app/src/main/res/layout/item_chat_quota_notice.xml +++ b/app/src/main/res/layout/item_chat_quota_notice.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="18sp" tools:text="--:--:--" /> @@ -34,7 +34,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/chat_quota_notice_message" android:textColor="@color/white" android:textSize="18sp" /> @@ -61,7 +61,7 @@ + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/item_chat_user_message.xml b/app/src/main/res/layout/item_chat_user_message.xml index 3e83ee8d..bdf07cc3 100644 --- a/app/src/main/res/layout/item_chat_user_message.xml +++ b/app/src/main/res/layout/item_chat_user_message.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:includeFontPadding="false" android:textColor="@color/color_777777" android:textSize="12sp" @@ -44,7 +44,7 @@ android:layout_height="wrap_content" android:breakStrategy="balanced" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:hyphenationFrequency="normal" android:includeFontPadding="false" android:lineSpacingExtra="2dp" 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 5586daa6..02d43b8c 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:lineSpacingExtra="8dp" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -118,7 +118,7 @@ android:textSize="13.3sp" android:theme="@style/EditTextStyle" tools:ignore="LabelFor" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -138,7 +138,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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 170ae1b5..0debe542 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:text="내용내용내용내용내용내용내용내용내용내용내용내용내용 내용내용내용내용내용내용내용내용내용내용 내용내용내용내용" /> @@ -95,7 +95,7 @@ android:textSize="13.3sp" android:theme="@style/EditTextStyle" tools:ignore="LabelFor" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/item_content_category.xml b/app/src/main/res/layout/item_content_category.xml index 2acc7443..4d9c7b8f 100644 --- a/app/src/main/res/layout/item_content_category.xml +++ b/app/src/main/res/layout/item_content_category.xml @@ -14,5 +14,5 @@ android:textColor="@color/color_777777" android:textSize="14.7sp" tools:text="남공여수" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/item_content_main_tab_content_tag.xml b/app/src/main/res/layout/item_content_main_tab_content_tag.xml index 97ab3f46..942ac247 100644 --- a/app/src/main/res/layout/item_content_main_tab_content_tag.xml +++ b/app/src/main/res/layout/item_content_main_tab_content_tag.xml @@ -15,5 +15,5 @@ android:textColor="@color/color_777777" android:textSize="12sp" tools:text="자작곡" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> 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 73d10f2d..2db46b7c 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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:maxLines="1" android:textColor="@color/color_bbbbbb" diff --git a/app/src/main/res/layout/item_creator_community.xml b/app/src/main/res/layout/item_creator_community.xml index f32ef2dc..bef5070c 100644 --- a/app/src/main/res/layout/item_creator_community.xml +++ b/app/src/main/res/layout/item_creator_community.xml @@ -34,7 +34,7 @@ android:id="@+id/tv_creator_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="18sp" tools:text="민하나" /> @@ -43,7 +43,7 @@ android:id="@+id/tv_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#78909C" android:textSize="14sp" tools:text="3일전" /> @@ -64,7 +64,7 @@ android:layout_marginEnd="10dp" android:layout_toStartOf="@+id/iv_post_image" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="start" android:maxLines="3" android:textColor="#B0BEC5" @@ -98,7 +98,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#78909C" android:textSize="18sp" tools:text="10" /> @@ -115,7 +115,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#78909C" android:textSize="18sp" tools:text="0" /> 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 0cc485e8..52e4e57c 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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" tools:text="민하나" /> @@ -44,7 +44,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="3dp" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:textColor="@color/color_777777" android:textSize="13.3sp" tools:text="3시간전" /> @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_marginTop="13.3dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:text="@string/screen_audio_content_detail_comment_secret" android:textColor="@color/color_selected_secret" @@ -224,7 +224,7 @@ android:textCursorDrawable="@drawable/edit_text_cursor" android:textSize="13.3sp" tools:ignore="LabelFor" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> @@ -276,7 +276,7 @@ android:layout_height="wrap_content" android:layout_marginTop="26.7dp" android:background="@drawable/bg_round_corner_26_7_transparent_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:paddingHorizontal="21dp" android:paddingVertical="11dp" android:textColor="@color/color_3bb9f1" diff --git a/app/src/main/res/layout/item_creator_profile_live_card.xml b/app/src/main/res/layout/item_creator_profile_live_card.xml index 26922d72..3908342c 100644 --- a/app/src/main/res/layout/item_creator_profile_live_card.xml +++ b/app/src/main/res/layout/item_creator_profile_live_card.xml @@ -55,7 +55,7 @@ android:id="@+id/tv_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#FFFFFF" android:textSize="18sp" tools:text="우기라스" /> @@ -74,7 +74,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="8dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="#B0BEC5" android:textSize="14sp" @@ -91,7 +91,7 @@ android:id="@+id/tv_day_of_week" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#78909C" android:textSize="14sp" tools:text="월" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/common_vertical_divider" android:textColor="#78909C" android:textSize="14sp" /> @@ -109,7 +109,7 @@ android:id="@+id/tv_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#98A2F6" android:textSize="14sp" tools:text="오후 03:30" /> @@ -129,7 +129,7 @@ android:layout_width="52dp" android:layout_height="52dp" android:background="@drawable/bg_round_corner_999_ff5c49" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:text="@string/screen_user_profile_on_air_badge" android:textColor="@color/white" @@ -155,7 +155,7 @@ android:id="@+id/tv_month" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingMultiplier="1.2" android:textColor="#FFFFFF" android:textSize="14sp" @@ -176,7 +176,7 @@ android:id="@+id/tv_day" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingMultiplier="1.2" android:textColor="#263238" android:textSize="16sp" @@ -212,7 +212,7 @@ android:id="@+id/tv_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#FFFFFF" android:textSize="14sp" tools:text="300" /> @@ -223,7 +223,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/reservation_complete_background" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:minWidth="52dp" android:padding="4dp" android:text="@string/live_reservation_complete" @@ -238,7 +238,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/payment_free_background" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:minWidth="52dp" android:padding="4dp" diff --git a/app/src/main/res/layout/item_curation_section.xml b/app/src/main/res/layout/item_curation_section.xml index 7dd1b55f..3027e329 100644 --- a/app/src/main/res/layout/item_curation_section.xml +++ b/app/src/main/res/layout/item_curation_section.xml @@ -17,7 +17,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="24sp" /> diff --git a/app/src/main/res/layout/item_day_of_week.xml b/app/src/main/res/layout/item_day_of_week.xml index 12faa798..41e9a512 100644 --- a/app/src/main/res/layout/item_day_of_week.xml +++ b/app/src/main/res/layout/item_day_of_week.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_selectable_day_of_week" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:paddingHorizontal="10dp" android:paddingVertical="6dp" diff --git a/app/src/main/res/layout/item_explorer.xml b/app/src/main/res/layout/item_explorer.xml index aa5934cb..38b99279 100644 --- a/app/src/main/res/layout/item_explorer.xml +++ b/app/src/main/res/layout/item_explorer.xml @@ -9,7 +9,7 @@ android:id="@+id/tv_title" android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:paddingHorizontal="13.3dp" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" @@ -35,7 +35,7 @@ android:id="@+id/tv_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/screen_explorer_creator_rank_notice" android:textColor="@color/color_bbbbbb" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/item_explorer_section.xml b/app/src/main/res/layout/item_explorer_section.xml index 4f2423e8..98a5437d 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 9597bfa9..83a1a814 100644 --- a/app/src/main/res/layout/item_faq.xml +++ b/app/src/main/res/layout/item_faq.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginHorizontal="6.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/faq_question_label" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> @@ -29,7 +29,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@+id/iv_dropdown" android:layout_toEndOf="@+id/tv_q" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" tools:text="댓보이스는 어떻게 사용하는 건가요?" /> @@ -68,7 +68,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="7.5dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/faq_answer_label" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/item_faq_category.xml b/app/src/main/res/layout/item_faq_category.xml index 43c37db3..a142e1dd 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/pretendard_medium" + android:fontFamily="@font/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 94b6476b..e34ed76c 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/pretendard_medium" + android:fontFamily="@font/medium" android:textSize="16.7sp" tools:text="상남자" /> diff --git a/app/src/main/res/layout/item_function_button.xml b/app/src/main/res/layout/item_function_button.xml index df14bd69..3b9baaa5 100644 --- a/app/src/main/res/layout/item_function_button.xml +++ b/app/src/main/res/layout/item_function_button.xml @@ -24,7 +24,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:textColor="#FFFFFF" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/item_home_content.xml b/app/src/main/res/layout/item_home_content.xml index b8f04f57..72c42705 100644 --- a/app/src/main/res/layout/item_home_content.xml +++ b/app/src/main/res/layout/item_home_content.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="@color/white" android:textSize="18sp" @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="#78909C" android:textSize="13.3sp" diff --git a/app/src/main/res/layout/item_home_content_ranking.xml b/app/src/main/res/layout/item_home_content_ranking.xml index 70e38b70..cbb7ff2b 100644 --- a/app/src/main/res/layout/item_home_content_ranking.xml +++ b/app/src/main/res/layout/item_home_content_ranking.xml @@ -12,7 +12,7 @@ android:layout_width="30dp" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="#B5E7FA" android:textSize="24sp" @@ -35,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="@color/white" android:textSize="18sp" @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#78909C" android:textSize="14sp" tools:text="J Fla" /> diff --git a/app/src/main/res/layout/item_home_content_theme.xml b/app/src/main/res/layout/item_home_content_theme.xml index fc57cc1e..3b54da0c 100644 --- a/app/src/main/res/layout/item_home_content_theme.xml +++ b/app/src/main/res/layout/item_home_content_theme.xml @@ -10,7 +10,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:background="@drawable/bg_round_corner_999_263238" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:paddingHorizontal="24dp" android:paddingVertical="12dp" diff --git a/app/src/main/res/layout/item_home_creator.xml b/app/src/main/res/layout/item_home_creator.xml index 006581f1..6beaea91 100644 --- a/app/src/main/res/layout/item_home_creator.xml +++ b/app/src/main/res/layout/item_home_creator.xml @@ -36,7 +36,7 @@ android:id="@+id/tv_nickname" android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:textColor="@color/white" android:textSize="16sp" @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:background="@drawable/bg_round_corner_999_white" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:paddingVertical="4dp" android:text="@string/screen_home_follow" diff --git a/app/src/main/res/layout/item_home_curation.xml b/app/src/main/res/layout/item_home_curation.xml index 9d20e503..025db95e 100644 --- a/app/src/main/res/layout/item_home_curation.xml +++ b/app/src/main/res/layout/item_home_curation.xml @@ -9,7 +9,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="24sp" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_home_live.xml b/app/src/main/res/layout/item_home_live.xml index c479dd80..86bef93e 100644 --- a/app/src/main/res/layout/item_home_live.xml +++ b/app/src/main/res/layout/item_home_live.xml @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="2" android:textColor="@android:color/white" android:textSize="18sp" @@ -57,7 +57,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="#B0BEC5" android:textSize="14sp" diff --git a/app/src/main/res/layout/item_home_recommend_channel.xml b/app/src/main/res/layout/item_home_recommend_channel.xml index 8d00d41e..7f694e58 100644 --- a/app/src/main/res/layout/item_home_recommend_channel.xml +++ b/app/src/main/res/layout/item_home_recommend_channel.xml @@ -32,7 +32,7 @@ android:id="@+id/tv_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="24sp" app:layout_constraintStart_toEndOf="@+id/iv_creator_profile" @@ -48,7 +48,7 @@ @@ -58,7 +58,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="18sp" tools:text="55" /> @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="@color/white" android:textSize="18sp" @@ -108,7 +108,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/white" android:textSize="18sp" app:drawableStartCompat="@drawable/ic_heart_white" @@ -120,7 +120,7 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:drawablePadding="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/white" android:textSize="18sp" app:drawableStartCompat="@drawable/ic_comment_white" @@ -155,7 +155,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="@color/white" android:textSize="18sp" @@ -172,7 +172,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/white" android:textSize="18sp" app:drawableStartCompat="@drawable/ic_heart_white" @@ -184,7 +184,7 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:drawablePadding="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/white" android:textSize="18sp" app:drawableStartCompat="@drawable/ic_comment_white" @@ -219,7 +219,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="@color/white" android:textSize="18sp" @@ -236,7 +236,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/white" android:textSize="18sp" app:drawableStartCompat="@drawable/ic_heart_white" @@ -248,7 +248,7 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:drawablePadding="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/white" android:textSize="18sp" app:drawableStartCompat="@drawable/ic_comment_white" diff --git a/app/src/main/res/layout/item_home_series.xml b/app/src/main/res/layout/item_home_series.xml index 34fb204f..124b255b 100644 --- a/app/src/main/res/layout/item_home_series.xml +++ b/app/src/main/res/layout/item_home_series.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_left_top_right_bottom_round_corner_16_ef5247" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="10dp" android:paddingVertical="3dp" android:text="@string/screen_home_series_popular" @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_left_top_right_bottom_round_corner_16_gradient" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="10dp" android:paddingVertical="3dp" android:text="@string/screen_home_series_new" @@ -55,7 +55,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_left_top_right_bottom_round_corner_16_black_70" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="10dp" android:paddingVertical="3dp" android:text="@string/screen_home_series_complete" @@ -71,7 +71,7 @@ android:layout_marginEnd="8dp" android:layout_marginBottom="8dp" android:background="@drawable/bg_round_corner_39_transparent_white" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="10dp" android:paddingVertical="3dp" android:textColor="@color/white" @@ -86,7 +86,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="#b0bec5" android:textSize="18sp" @@ -101,7 +101,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="#78909C" android:textSize="14sp" diff --git a/app/src/main/res/layout/item_latest_finished_live.xml b/app/src/main/res/layout/item_latest_finished_live.xml index cd611654..c1463169 100644 --- a/app/src/main/res/layout/item_latest_finished_live.xml +++ b/app/src/main/res/layout/item_latest_finished_live.xml @@ -38,7 +38,7 @@ android:id="@+id/tv_nickname" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:textColor="@color/white" android:textSize="16sp" @@ -49,7 +49,7 @@ android:id="@+id/tv_time_ago" android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:textColor="#78909C" android:textSize="16sp" diff --git a/app/src/main/res/layout/item_live_now.xml b/app/src/main/res/layout/item_live_now.xml index 4cbd7f45..4cab6017 100644 --- a/app/src/main/res/layout/item_live_now.xml +++ b/app/src/main/res/layout/item_live_now.xml @@ -67,7 +67,7 @@ android:id="@+id/tv_nickname" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:textColor="@color/white" android:textSize="16sp" @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:maxLines="1" android:textColor="#B0BEC5" @@ -103,7 +103,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_999_white" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:paddingVertical="4dp" android:text="@string/screen_live_now_all_free" @@ -132,7 +132,7 @@ android:id="@+id/tv_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#FFFFFF" android:textSize="14sp" tools:text="300" /> 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 732d6b4c..5f8dc14d 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 a8b399e4..e5782711 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 9c505b11..9aafb04b 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_7fe2e2e2" android:textSize="12sp" tools:text="300캔" /> @@ -97,7 +97,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_6_7_transparent_9970ff" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:padding="10.7dp" android:text="@string/live_reservation_status_cancel" android:textColor="@color/color_9970ff" diff --git a/app/src/main/res/layout/item_live_room_chat.xml b/app/src/main/res/layout/item_live_room_chat.xml index 824ec009..251f2472 100644 --- a/app/src/main/res/layout/item_live_room_chat.xml +++ b/app/src/main/res/layout/item_live_room_chat.xml @@ -77,13 +77,13 @@ tools:background="@drawable/bg_round_corner_2_4999e3" tools:ignore="SmallSp" tools:text="스탭" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> 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 3381c6d9..4c60584f 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/pretendard_medium" + android:fontFamily="@font/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 1fd0f667..613e56d6 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 93c78467..48946615 100644 --- a/app/src/main/res/layout/item_live_room_donation_ranking.xml +++ b/app/src/main/res/layout/item_live_room_donation_ranking.xml @@ -18,7 +18,7 @@ android:layout_centerVertical="true" android:layout_marginStart="13.3dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:maxLength="10" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -63,7 +63,7 @@ android:layout_marginStart="13.3dp" android:layout_toEndOf="@+id/rl_profile" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="end" android:textColor="@color/color_fedc00" android:textSize="13.3sp" @@ -143,7 +143,7 @@ + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/item_live_room_heart_ranking.xml b/app/src/main/res/layout/item_live_room_heart_ranking.xml index 172cf1bb..43385004 100644 --- a/app/src/main/res/layout/item_live_room_heart_ranking.xml +++ b/app/src/main/res/layout/item_live_room_heart_ranking.xml @@ -19,7 +19,7 @@ android:layout_centerVertical="true" android:layout_marginStart="13.3dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:maxLength="10" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -64,7 +64,7 @@ android:layout_marginStart="13.3dp" android:layout_toEndOf="@+id/rl_profile" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:lines="1" android:maxLength="12" android:textColor="@color/color_eeeeee" @@ -86,7 +86,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="4dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="end" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" @@ -96,7 +96,7 @@ android:id="@+id/tv_donation_can_unit" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="end" android:text="@string/screen_live_room_heart_label" android:textColor="@color/color_eeeeee" diff --git a/app/src/main/res/layout/item_live_room_join_chat.xml b/app/src/main/res/layout/item_live_room_join_chat.xml index 64c72fdf..595b2b5b 100644 --- a/app/src/main/res/layout/item_live_room_join_chat.xml +++ b/app/src/main/res/layout/item_live_room_join_chat.xml @@ -12,6 +12,6 @@ android:layout_height="wrap_content" android:textColor="@color/color_eeeeee" android:textSize="12sp" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/item_live_room_list_profile.xml b/app/src/main/res/layout/item_live_room_list_profile.xml index 1ee60e4c..51d9ce20 100644 --- a/app/src/main/res/layout/item_live_room_list_profile.xml +++ b/app/src/main/res/layout/item_live_room_list_profile.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="10dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center_vertical|start" android:maxLines="2" android:textColor="@color/color_eeeeee" @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:paddingHorizontal="5.5dp" android:paddingVertical="12dp" android:text="@string/screen_live_room_change_to_listener" @@ -60,7 +60,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:paddingHorizontal="5.5dp" android:paddingVertical="12dp" android:text="@string/screen_live_room_invite_speaker" @@ -75,7 +75,7 @@ android:layout_height="wrap_content" android:layout_marginStart="10dp" android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:paddingHorizontal="5.5dp" android:paddingVertical="12dp" android:text="@string/screen_live_room_chat_ban_short" diff --git a/app/src/main/res/layout/item_live_room_profile.xml b/app/src/main/res/layout/item_live_room_profile.xml index 472eed82..9480020a 100644 --- a/app/src/main/res/layout/item_live_room_profile.xml +++ b/app/src/main/res/layout/item_live_room_profile.xml @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:lines="1" android:textColor="@color/color_777777" android:textSize="8.7sp" diff --git a/app/src/main/res/layout/item_live_room_profile_header.xml b/app/src/main/res/layout/item_live_room_profile_header.xml index d84d9095..587c3700 100644 --- a/app/src/main/res/layout/item_live_room_profile_header.xml +++ b/app/src/main/res/layout/item_live_room_profile_header.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_eeeeee" android:textSize="13sp" app:layout_constraintEnd_toEndOf="parent" @@ -24,7 +24,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_3bb9f1" android:textSize="13sp" android:visibility="gone" @@ -37,7 +37,7 @@ android:id="@+id/tv_speaker_total_count" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_bbbbbb" android:textSize="13sp" android:visibility="gone" diff --git a/app/src/main/res/layout/item_live_room_profile_manager.xml b/app/src/main/res/layout/item_live_room_profile_manager.xml index 743d1b71..82b824f8 100644 --- a/app/src/main/res/layout/item_live_room_profile_manager.xml +++ b/app/src/main/res/layout/item_live_room_profile_manager.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16.7dp" android:drawablePadding="4dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_eeeeee" android:textSize="14sp" app:drawableStartCompat="@drawable/ic_badge_manager" diff --git a/app/src/main/res/layout/item_live_room_profile_master.xml b/app/src/main/res/layout/item_live_room_profile_master.xml index 367f1611..f0005ee0 100644 --- a/app/src/main/res/layout/item_live_room_profile_master.xml +++ b/app/src/main/res/layout/item_live_room_profile_master.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16.7dp" android:drawablePadding="4dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_eeeeee" android:textSize="14sp" app:drawableStartCompat="@drawable/ic_crown" diff --git a/app/src/main/res/layout/item_live_tag.xml b/app/src/main/res/layout/item_live_tag.xml index cdc44668..913ab296 100644 --- a/app/src/main/res/layout/item_live_tag.xml +++ b/app/src/main/res/layout/item_live_tag.xml @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:textColor="@color/color_bbbbbb" android:textSize="14.3sp" diff --git a/app/src/main/res/layout/item_live_tag_selected.xml b/app/src/main/res/layout/item_live_tag_selected.xml index 1cc32eb6..ef82badf 100644 --- a/app/src/main/res/layout/item_live_tag_selected.xml +++ b/app/src/main/res/layout/item_live_tag_selected.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="10dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/white" android:textSize="14.7sp" tools:text="19금" /> diff --git a/app/src/main/res/layout/item_main_tab.xml b/app/src/main/res/layout/item_main_tab.xml index e0689c63..a1315065 100644 --- a/app/src/main/res/layout/item_main_tab.xml +++ b/app/src/main/res/layout/item_main_tab.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_marginTop="5dp" android:textSize="10sp" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" tools:ignore="SmallSp" tools:text="라이브" /> diff --git a/app/src/main/res/layout/item_my_live_reservation.xml b/app/src/main/res/layout/item_my_live_reservation.xml index 0eac69f1..160b3f04 100644 --- a/app/src/main/res/layout/item_my_live_reservation.xml +++ b/app/src/main/res/layout/item_my_live_reservation.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:drawablePadding="8dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/live_reservation_my_live" android:textColor="@color/color_80d8ff" android:textSize="18sp" @@ -72,7 +72,7 @@ android:id="@+id/tv_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#FFFFFF" android:textSize="18sp" tools:text="우기라스" /> @@ -91,7 +91,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="8dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="2" android:textColor="#B0BEC5" android:textSize="16sp" @@ -108,7 +108,7 @@ android:id="@+id/tv_day_of_week" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#78909C" android:textSize="16sp" tools:text="월" /> @@ -117,7 +117,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/common_vertical_divider" android:textColor="#78909C" android:textSize="16sp" /> @@ -126,7 +126,7 @@ android:id="@+id/tv_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#98A2F6" android:textSize="16sp" tools:text="오후 03:30" /> @@ -155,7 +155,7 @@ android:id="@+id/tv_month" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingMultiplier="1.2" android:textColor="#FFFFFF" android:textSize="14sp" @@ -176,7 +176,7 @@ android:id="@+id/tv_day" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingMultiplier="1.2" android:textColor="#263238" android:textSize="16sp" @@ -211,7 +211,7 @@ android:id="@+id/tv_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#FFFFFF" android:textSize="14sp" tools:text="1,000" /> @@ -222,7 +222,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/payment_free_background" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:minWidth="52dp" android:padding="4dp" diff --git a/app/src/main/res/layout/item_new_character_all.xml b/app/src/main/res/layout/item_new_character_all.xml index 00992242..0e7ae494 100644 --- a/app/src/main/res/layout/item_new_character_all.xml +++ b/app/src/main/res/layout/item_new_character_all.xml @@ -27,7 +27,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:background="@drawable/bg_circle_3bb9f1" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:includeFontPadding="false" android:maxLines="1" @@ -52,7 +52,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/iv_character" tools:text="캐릭터 이름" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> + android:fontFamily="@font/medium" /> diff --git a/app/src/main/res/layout/item_notice.xml b/app/src/main/res/layout/item_notice.xml index befac2d8..d6b45264 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_525252" android:textSize="12sp" tools:text="2021.07.01" /> diff --git a/app/src/main/res/layout/item_original_detail_character.xml b/app/src/main/res/layout/item_original_detail_character.xml index 78c12113..6d5a85e0 100644 --- a/app/src/main/res/layout/item_original_detail_character.xml +++ b/app/src/main/res/layout/item_original_detail_character.xml @@ -25,7 +25,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:background="@drawable/bg_circle_3bb9f1" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:gravity="center" android:includeFontPadding="false" android:maxLines="1" @@ -42,7 +42,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:maxLines="1" android:textColor="@color/white" android:textSize="18sp" @@ -57,7 +57,7 @@ android:layout_height="wrap_content" android:layout_marginTop="2dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="#78909C" android:textSize="14sp" diff --git a/app/src/main/res/layout/item_original_work.xml b/app/src/main/res/layout/item_original_work.xml index 83f5cc12..d9dbaf1f 100644 --- a/app/src/main/res/layout/item_original_work.xml +++ b/app/src/main/res/layout/item_original_work.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:includeFontPadding="false" android:maxLines="1" android:textColor="@color/white" @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:includeFontPadding="false" android:maxLines="1" android:textColor="#78909C" diff --git a/app/src/main/res/layout/item_other_character.xml b/app/src/main/res/layout/item_other_character.xml index 3e3ff8f8..ade17aac 100644 --- a/app/src/main/res/layout/item_other_character.xml +++ b/app/src/main/res/layout/item_other_character.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:maxLines="1" android:textColor="@color/white" android:textSize="14sp" @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="@color/color_3bb9f1" android:textSize="12sp" 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 ee2f953b..c10885b2 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 577a7660..1e330248 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 7ef2c93e..dfef1a87 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 64b55b4e..365c5e75 100644 --- a/app/src/main/res/layout/item_playlist_list.xml +++ b/app/src/main/res/layout/item_playlist_list.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:maxLines="1" android:textColor="@color/color_d2d2d2" android:textSize="14.7sp" @@ -40,7 +40,7 @@ android:layout_height="wrap_content" android:layout_marginTop="7dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 7ef2c93e..dfef1a87 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 adb126a6..ce83ed0f 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_777777" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6.7dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textColor="@color/color_eeeeee" android:textSize="15.3sp" diff --git a/app/src/main/res/layout/item_recent_character.xml b/app/src/main/res/layout/item_recent_character.xml index aee9900b..35e0bc1c 100644 --- a/app/src/main/res/layout/item_recent_character.xml +++ b/app/src/main/res/layout/item_recent_character.xml @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:maxLines="1" android:textColor="@color/white" diff --git a/app/src/main/res/layout/item_recommend_channel.xml b/app/src/main/res/layout/item_recommend_channel.xml index 9b92122a..caa2ef41 100644 --- a/app/src/main/res/layout/item_recommend_channel.xml +++ b/app/src/main/res/layout/item_recommend_channel.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|center_horizontal" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:paddingHorizontal="5.7dp" android:paddingVertical="2.7dp" android:text="@string/common_label_live" @@ -44,7 +44,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:lines="1" android:textColor="@color/white" android:textSize="14sp" diff --git a/app/src/main/res/layout/item_report_reason.xml b/app/src/main/res/layout/item_report_reason.xml index 5e026e2a..0a5bbec5 100644 --- a/app/src/main/res/layout/item_report_reason.xml +++ b/app/src/main/res/layout/item_report_reason.xml @@ -13,7 +13,7 @@ android:textColor="@color/white" android:textSize="15sp" android:text="" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -48,7 +48,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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 a461e4c8..53bdc61f 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/pretendard_medium" + android:fontFamily="@font/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 e1390503..bcf1e720 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 00114973..234fe6fe 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 bc2822ec..df39ee24 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 eec68a17..52772ad9 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:maxLines="2" android:textColor="@color/color_eeeeee" android:textSize="12sp" diff --git a/app/src/main/res/layout/item_talk.xml b/app/src/main/res/layout/item_talk.xml index 21e22f8d..794512fd 100644 --- a/app/src/main/res/layout/item_talk.xml +++ b/app/src/main/res/layout/item_talk.xml @@ -43,7 +43,7 @@ android:id="@+id/tv_character_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="18sp" tools:text="정인이" /> @@ -55,7 +55,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:background="@drawable/bg_character_type_badge_character" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:paddingHorizontal="5dp" android:paddingVertical="1dp" android:textColor="#D9FCF4" @@ -69,7 +69,7 @@ android:id="@+id/tv_last_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#78909C" android:textSize="12sp" tools:text="6월 15일" /> @@ -82,7 +82,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="2" android:textColor="@color/color_b0bec5" android:textSize="14sp" diff --git a/app/src/main/res/layout/item_text_message.xml b/app/src/main/res/layout/item_text_message.xml index 4f0a1d8e..429d27f9 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/pretendard_medium" + android:fontFamily="@font/medium" android:maxLines="1" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:maxLines="1" android:textColor="@color/color_777777" android:textSize="12sp" @@ -53,7 +53,7 @@ android:id="@+id/tv_date" android:layout_width="wrap_content" android:layout_height="0dp" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:gravity="center" android:textColor="@color/color_525252" android:textSize="12sp" diff --git a/app/src/main/res/layout/item_user_profile_cheers.xml b/app/src/main/res/layout/item_user_profile_cheers.xml index 0499e580..8daca1b8 100644 --- a/app/src/main/res/layout/item_user_profile_cheers.xml +++ b/app/src/main/res/layout/item_user_profile_cheers.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_marginStart="6.7dp" android:layout_marginTop="10dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="16sp" app:layout_constraintStart_toEndOf="@+id/iv_profile" @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginStart="6.7dp" android:layout_marginTop="4dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="#78909C" android:textSize="14sp" app:layout_constraintStart_toEndOf="@+id/iv_profile" @@ -66,7 +66,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:lineSpacingExtra="8dp" android:textColor="@color/color_eeeeee" android:textSize="16sp" @@ -97,7 +97,7 @@ android:textSize="14sp" android:theme="@style/EditTextStyle" tools:ignore="LabelFor" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -134,7 +134,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_16_7_4c3bb9f1" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:paddingHorizontal="13.3dp" android:paddingVertical="6.7dp" android:textColor="@color/white" @@ -150,7 +150,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_555555" android:textSize="12sp" tools:ignore="SmallSp" @@ -166,7 +166,7 @@ android:textSize="12sp" android:visibility="gone" tools:ignore="SmallSp" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -196,7 +196,7 @@ android:textSize="14sp" android:theme="@style/EditTextStyle" tools:ignore="LabelFor" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -217,7 +217,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:layout_marginTop="10dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:text="@string/screen_user_profile_reply_write" android:textColor="@color/color_3bb9f1" android:textSize="12sp" diff --git a/app/src/main/res/layout/item_user_profile_donation.xml b/app/src/main/res/layout/item_user_profile_donation.xml index b2413bee..0f2cd203 100644 --- a/app/src/main/res/layout/item_user_profile_donation.xml +++ b/app/src/main/res/layout/item_user_profile_donation.xml @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6.7dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:lines="1" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> 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 da51ff86..61a269c1 100644 --- a/app/src/main/res/layout/item_user_profile_donation_all.xml +++ b/app/src/main/res/layout/item_user_profile_donation_all.xml @@ -49,7 +49,7 @@ android:layout_marginEnd="13.3dp" android:layout_toEndOf="@+id/rl_profile" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:maxLength="10" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" @@ -62,7 +62,7 @@ android:layout_centerVertical="true" android:layout_toEndOf="@+id/tv_rank" android:ellipsize="end" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 a7628527..d41619c3 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/medium" android:paddingHorizontal="9dp" android:paddingVertical="4dp" android:textSize="11.3sp" @@ -84,7 +84,7 @@ android:layout_width="0dp" android:layout_height="36.7dp" android:layout_marginStart="20dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:textSize="13.3sp" app:layout_constraintBottom_toBottomOf="@+id/rl_cover" 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 49f0f772..8ba68f9c 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/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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 9931ba6e..3644662e 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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" app:layout_constraintBottom_toBottomOf="@+id/iv_profile" @@ -33,7 +33,7 @@ android:id="@+id/tv_date" android:layout_width="wrap_content" android:layout_height="0dp" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:gravity="center" android:textColor="@color/color_525252" android:textSize="12sp" @@ -72,7 +72,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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/pretendard_medium" + android:fontFamily="@font/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_creator_channel_series.xml b/app/src/main/res/layout/layout_creator_channel_series.xml index e4b86b3a..d7c447fb 100644 --- a/app/src/main/res/layout/layout_creator_channel_series.xml +++ b/app/src/main/res/layout/layout_creator_channel_series.xml @@ -8,7 +8,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_user_profile_series_title" android:textColor="@color/white" android:textSize="26sp" @@ -19,7 +19,7 @@ android:id="@+id/tv_all" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:text="@string/view_all" android:textColor="#78909C" android:textSize="14sp" diff --git a/app/src/main/res/layout/layout_creator_community_post.xml b/app/src/main/res/layout/layout_creator_community_post.xml index b99f1278..3b53f40e 100644 --- a/app/src/main/res/layout/layout_creator_community_post.xml +++ b/app/src/main/res/layout/layout_creator_community_post.xml @@ -8,7 +8,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_user_profile_community_title" android:textColor="@color/white" android:textSize="26sp" /> @@ -64,7 +64,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:text="@string/read_more" android:textColor="#B0BEC5" @@ -97,7 +97,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10.3dp" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_user_profile_community_create" android:textColor="@color/color_eeeeee" android:textSize="18sp" /> @@ -106,7 +106,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10.3dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:text="@string/screen_user_profile_community_empty_desc" android:textColor="@color/color_777777" diff --git a/app/src/main/res/layout/layout_live_now.xml b/app/src/main/res/layout/layout_live_now.xml index 4204ea23..0cf64106 100644 --- a/app/src/main/res/layout/layout_live_now.xml +++ b/app/src/main/res/layout/layout_live_now.xml @@ -18,7 +18,7 @@ @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/view_all" android:textColor="#78909C" android:textSize="14sp" /> @@ -76,7 +76,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:lineSpacingExtra="8dp" android:text="@string/screen_live_now_empty_message" @@ -105,7 +105,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/screen_live_now_refresh" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/layout_live_recommend_channel.xml b/app/src/main/res/layout/layout_live_recommend_channel.xml index 16090fbd..afb329be 100644 --- a/app/src/main/res/layout/layout_live_recommend_channel.xml +++ b/app/src/main/res/layout/layout_live_recommend_channel.xml @@ -18,7 +18,7 @@ diff --git a/app/src/main/res/layout/layout_live_reservation.xml b/app/src/main/res/layout/layout_live_reservation.xml index af554dce..ce9daffa 100644 --- a/app/src/main/res/layout/layout_live_reservation.xml +++ b/app/src/main/res/layout/layout_live_reservation.xml @@ -18,7 +18,7 @@ @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/view_all" android:textColor="#78909C" android:textSize="14sp" /> @@ -77,7 +77,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="10dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:lineSpacingExtra="8dp" android:text="@string/screen_live_reservation_empty_message" diff --git a/app/src/main/res/layout/layout_roulette_option.xml b/app/src/main/res/layout/layout_roulette_option.xml index 8e18214b..3b9cab51 100644 --- a/app/src/main/res/layout/layout_roulette_option.xml +++ b/app/src/main/res/layout/layout_roulette_option.xml @@ -20,7 +20,7 @@ android:textSize="14.7sp" tools:ignore="RelativeOverlap" tools:text="옵션1" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> 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 edbdc105..5117b2fa 100644 --- a/app/src/main/res/layout/layout_roulette_preview_item.xml +++ b/app/src/main/res/layout/layout_roulette_preview_item.xml @@ -10,7 +10,7 @@ android:id="@+id/tv_order" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/color_e2e2e2" android:textSize="14.7sp" tools:text="1" /> @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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 6d44b543..ca84dd6c 100644 --- a/app/src/main/res/layout/layout_user_profile.xml +++ b/app/src/main/res/layout/layout_user_profile.xml @@ -44,7 +44,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@+id/iv_share" android:ellipsize="end" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:maxLines="1" android:textColor="@color/color_eeeeee" android:textSize="18sp" @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6.7dp" android:background="@drawable/bg_round_corner_16_7_transparent_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:paddingHorizontal="16dp" android:paddingVertical="8dp" android:text="@string/screen_user_profile_follower_list" @@ -97,7 +97,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:textColor="@color/color_bbbbbb" android:textSize="10sp" tools:ignore="SmallSp" @@ -110,7 +110,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/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_audio_content.xml b/app/src/main/res/layout/layout_user_profile_audio_content.xml index cc0be5aa..358f9298 100644 --- a/app/src/main/res/layout/layout_user_profile_audio_content.xml +++ b/app/src/main/res/layout/layout_user_profile_audio_content.xml @@ -15,7 +15,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentStart="true" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_user_profile_content_title" android:textColor="@color/white" android:textSize="26sp" /> @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:gravity="center" android:text="@string/view_all" android:textColor="#78909C" @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:background="@drawable/bg_round_corner_12_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="17dp" android:text="@string/screen_audio_content_new_content" @@ -76,7 +76,7 @@ android:id="@+id/tv_ratio_left" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:textColor="@color/white" android:textSize="18sp" app:layout_constraintStart_toStartOf="parent" @@ -87,7 +87,7 @@ android:id="@+id/tv_ratio_right" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="@color/white" android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/layout_user_profile_donation.xml b/app/src/main/res/layout/layout_user_profile_donation.xml index ded3b996..091c6c10 100644 --- a/app/src/main/res/layout/layout_user_profile_donation.xml +++ b/app/src/main/res/layout/layout_user_profile_donation.xml @@ -8,7 +8,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_user_profile_donation_title" android:textColor="@color/white" android:textSize="26sp" @@ -19,7 +19,7 @@ android:id="@+id/tv_all" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:gravity="center" android:text="@string/view_all" android:textColor="#78909C" 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 9939d89d..0870167e 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 @@ -13,7 +13,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_user_profile_fan_talk_title" android:textColor="@color/white" android:textSize="26sp" /> @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:fontFamily="@font/pretendard_light" + android:fontFamily="@font/light" android:gravity="center" android:text="@string/view_all" android:textColor="#78909C" @@ -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/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_777777" android:textSize="14sp" tools:text="3" /> @@ -85,7 +85,7 @@ android:textCursorDrawable="@drawable/edit_text_cursor" android:textSize="14sp" tools:ignore="LabelFor" - android:fontFamily="@font/pretendard_medium" /> + android:fontFamily="@font/medium" /> @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16.7dp" - android:fontFamily="@font/pretendard_medium" + android:fontFamily="@font/medium" android:textColor="@color/color_777777" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/layout_user_profile_live.xml b/app/src/main/res/layout/layout_user_profile_live.xml index 6a3ee4f7..46aa3682 100644 --- a/app/src/main/res/layout/layout_user_profile_live.xml +++ b/app/src/main/res/layout/layout_user_profile_live.xml @@ -8,7 +8,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/screen_user_profile_live_title" android:textColor="@color/white" android:textSize="26sp" @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/bg_round_corner_12_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="12dp" android:text="@string/screen_user_profile_live_setting_roulette" @@ -45,7 +45,7 @@ android:layout_marginStart="8dp" android:layout_weight="1" android:background="@drawable/bg_round_corner_12_3bb9f1" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:gravity="center" android:paddingVertical="12dp" android:text="@string/screen_user_profile_live_setting_menu" diff --git a/app/src/main/res/layout/live_booking_card.xml b/app/src/main/res/layout/live_booking_card.xml index c5b926ea..4883e468 100644 --- a/app/src/main/res/layout/live_booking_card.xml +++ b/app/src/main/res/layout/live_booking_card.xml @@ -55,7 +55,7 @@ android:id="@+id/tv_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#FFFFFF" android:textSize="18sp" tools:text="우기라스" /> @@ -74,7 +74,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="8dp" android:ellipsize="end" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:maxLines="1" android:textColor="#B0BEC5" android:textSize="14sp" @@ -91,7 +91,7 @@ android:id="@+id/tv_day_of_week" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#78909C" android:textSize="14sp" tools:text="월" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="4dp" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:text="@string/common_vertical_divider" android:textColor="#78909C" android:textSize="14sp" /> @@ -109,7 +109,7 @@ android:id="@+id/tv_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#98A2F6" android:textSize="14sp" tools:text="오후 03:30" /> @@ -138,7 +138,7 @@ android:id="@+id/tv_month" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingMultiplier="1.2" android:textColor="#FFFFFF" android:textSize="14sp" @@ -159,7 +159,7 @@ android:id="@+id/tv_day" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:lineSpacingMultiplier="1.2" android:textColor="#263238" android:textSize="16sp" @@ -194,7 +194,7 @@ android:id="@+id/tv_can" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:textColor="#FFFFFF" android:textSize="14sp" tools:text="300" /> @@ -205,7 +205,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/reservation_complete_background" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:minWidth="52dp" android:padding="4dp" android:text="@string/live_reservation_complete" @@ -220,7 +220,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/payment_free_background" - android:fontFamily="@font/pretendard_regular" + android:fontFamily="@font/regular" android:gravity="center" android:minWidth="52dp" android:padding="4dp" diff --git a/app/src/main/res/layout/toolbar_audio_content_main.xml b/app/src/main/res/layout/toolbar_audio_content_main.xml index ee4db1b0..10b4924a 100644 --- a/app/src/main/res/layout/toolbar_audio_content_main.xml +++ b/app/src/main/res/layout/toolbar_audio_content_main.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_toStartOf="@+id/iv_alarm" - android:fontFamily="@font/pretendard_bold" + android:fontFamily="@font/bold" android:text="@string/audio_content_market_title" android:textColor="@color/color_3bb9f1" android:textSize="21.3sp" /> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 2c2b6b1d..eabdc510 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -26,17 +26,17 @@ @@ -62,7 +62,7 @@ @color/white @color/color_3bb9f1 @color/black - @font/pretendard_medium + @font/medium