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 e34a9184..d41353de 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 @@ -469,7 +469,7 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl val fontRes = if (isSelected) { R.font.pretendard_bold } else { - R.font.gmarket_sans_light + R.font.pretendard_light } binding.tvTab.typeface = ResourcesCompat.getFont(applicationContext, fontRes) } 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 8df52684..a55a3ecb 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.gmarket_sans_light), + ResourcesCompat.getFont(applicationContext, R.font.pretendard_light), currencyUnit ) diff --git a/app/src/main/res/font/gmarket_sans_light.ttf b/app/src/main/res/font/gmarket_sans_light.ttf deleted file mode 100755 index f315bd35..00000000 Binary files a/app/src/main/res/font/gmarket_sans_light.ttf and /dev/null differ diff --git a/app/src/main/res/layout/activity_audio_content_detail.xml b/app/src/main/res/layout/activity_audio_content_detail.xml index 9a9c4389..171e9803 100644 --- a/app/src/main/res/layout/activity_audio_content_detail.xml +++ b/app/src/main/res/layout/activity_audio_content_detail.xml @@ -795,7 +795,7 @@ android:id="@+id/tv_unit" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:text="@string/screen_audio_content_detail_purchase_unit_can" android:textColor="@color/white" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/activity_audio_content_ranking_all.xml b/app/src/main/res/layout/activity_audio_content_ranking_all.xml index 433fe20e..e424d4de 100644 --- a/app/src/main/res/layout/activity_audio_content_ranking_all.xml +++ b/app/src/main/res/layout/activity_audio_content_ranking_all.xml @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_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_can_status.xml b/app/src/main/res/layout/activity_can_status.xml index e688f1d7..a4cbf169 100644 --- a/app/src/main/res/layout/activity_can_status.xml +++ b/app/src/main/res/layout/activity_can_status.xml @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:text="@string/screen_can_status_label_paid" android:textColor="@color/color_777777" android:textSize="12sp" /> @@ -109,7 +109,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:text="@string/screen_can_status_label_reward" android:textColor="@color/color_777777" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/activity_live_reservation_cancel.xml b/app/src/main/res/layout/activity_live_reservation_cancel.xml index 3dfb705a..04b23510 100644 --- a/app/src/main/res/layout/activity_live_reservation_cancel.xml +++ b/app/src/main/res/layout/activity_live_reservation_cancel.xml @@ -230,7 +230,7 @@ android:layout_height="wrap_content" android:background="@null" android:button="@null" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:hint="입력해 주세요" android:importantForAutofill="no" android:inputType="textWebEditText" diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml index b63dbade..f0d42c7e 100644 --- a/app/src/main/res/layout/activity_live_room.xml +++ b/app/src/main/res/layout/activity_live_room.xml @@ -116,7 +116,7 @@ android:id="@+id/tv_notice" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:lineSpacingExtra="4dp" 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/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:lineSpacingExtra="4dp" android:textColor="@color/white" android:textSize="11.3sp" diff --git a/app/src/main/res/layout/activity_sign_out.xml b/app/src/main/res/layout/activity_sign_out.xml index b6dbb7c5..ab47086e 100644 --- a/app/src/main/res/layout/activity_sign_out.xml +++ b/app/src/main/res/layout/activity_sign_out.xml @@ -201,7 +201,7 @@ android:layout_height="wrap_content" android:background="@null" android:button="@null" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:hint="@string/screen_sign_out_reason_hint" android:importantForAutofill="no" android:inputType="textWebEditText" 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 fc4740bf..7cb18b82 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 @@ -107,7 +107,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginVertical="60dp" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:gravity="center" android:visibility="gone" android:text="@string/screen_user_profile_cheer_empty" diff --git a/app/src/main/res/layout/activity_user_profile_live_all.xml b/app/src/main/res/layout/activity_user_profile_live_all.xml index ce6fe5b5..afefa1db 100644 --- a/app/src/main/res/layout/activity_user_profile_live_all.xml +++ b/app/src/main/res/layout/activity_user_profile_live_all.xml @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:text="@string/screen_user_profile_donation_can_unit_with_space" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -125,7 +125,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:text="@string/screen_user_profile_donation_can_unit_with_space" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -159,7 +159,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:text="@string/screen_user_profile_donation_can_unit_with_space" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> 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 63db1d67..dfb7c8f4 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 @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:text="@string/screen_live_room_close" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/fragment_audio_content_main.xml b/app/src/main/res/layout/fragment_audio_content_main.xml index 66582797..af4fb5c3 100644 --- a/app/src/main/res/layout/fragment_audio_content_main.xml +++ b/app/src/main/res/layout/fragment_audio_content_main.xml @@ -135,7 +135,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:text="@string/screen_explorer_creator_rank_notice" android:textColor="@color/color_bbbbbb" android:textSize="13.3sp" /> @@ -356,7 +356,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_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/fragment_audio_content_main_tab_home.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_home.xml index c65f7ac2..40f3dba0 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 @@ -396,7 +396,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:text="@string/audio_content_main_popular_notice" android:textColor="@color/color_bbbbbb" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/fragment_audio_content_order.xml b/app/src/main/res/layout/fragment_audio_content_order.xml index 545850b1..93eb9c5a 100644 --- a/app/src/main/res/layout/fragment_audio_content_order.xml +++ b/app/src/main/res/layout/fragment_audio_content_order.xml @@ -27,7 +27,7 @@ @@ -88,7 +88,7 @@ android:id="@+id/tv_keep_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:text="@string/audio_content_order_keep_period_default" android:textColor="@color/white" android:textSize="12sp" /> 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 14550800..e1154192 100644 --- a/app/src/main/res/layout/fragment_series_detail_home.xml +++ b/app/src/main/res/layout/fragment_series_detail_home.xml @@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="2.3dp" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:textColor="@color/color_3bb9f1" android:textSize="16sp" tools:text="(30)" /> diff --git a/app/src/main/res/layout/fragment_voice_message_write.xml b/app/src/main/res/layout/fragment_voice_message_write.xml index ea384765..0bf54ed3 100644 --- a/app/src/main/res/layout/fragment_voice_message_write.xml +++ b/app/src/main/res/layout/fragment_voice_message_write.xml @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_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/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:text="@string/screen_audio_content_detail_time_default" android:textColor="@color/white" android:textSize="33.3sp" /> 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 09a912a2..0cc485e8 100644 --- a/app/src/main/res/layout/item_creator_community_all.xml +++ b/app/src/main/res/layout/item_creator_community_all.xml @@ -44,7 +44,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="3dp" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:textColor="@color/color_777777" android:textSize="13.3sp" tools:text="3시간전" /> diff --git a/app/src/main/res/layout/item_explorer.xml b/app/src/main/res/layout/item_explorer.xml index 0472c17e..aa5934cb 100644 --- a/app/src/main/res/layout/item_explorer.xml +++ b/app/src/main/res/layout/item_explorer.xml @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_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_live_room_chat.xml b/app/src/main/res/layout/item_live_room_chat.xml index 78c03551..824ec009 100644 --- a/app/src/main/res/layout/item_live_room_chat.xml +++ b/app/src/main/res/layout/item_live_room_chat.xml @@ -83,7 +83,7 @@ android:id="@+id/tv_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:textColor="@color/white" android:textSize="12sp" tools:ignore="SmallSp" diff --git a/app/src/main/res/layout/item_main_tab.xml b/app/src/main/res/layout/item_main_tab.xml index 94826918..e0689c63 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/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" tools:ignore="SmallSp" tools:text="라이브" /> diff --git a/app/src/main/res/layout/item_text_message.xml b/app/src/main/res/layout/item_text_message.xml index fa7a9e05..4f0a1d8e 100644 --- a/app/src/main/res/layout/item_text_message.xml +++ b/app/src/main/res/layout/item_text_message.xml @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_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/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:gravity="center" android:textColor="@color/color_525252" android:textSize="12sp" diff --git a/app/src/main/res/layout/item_voice_message.xml b/app/src/main/res/layout/item_voice_message.xml index ef92d0f9..9931ba6e 100644 --- a/app/src/main/res/layout/item_voice_message.xml +++ b/app/src/main/res/layout/item_voice_message.xml @@ -33,7 +33,7 @@ android:id="@+id/tv_date" android:layout_width="wrap_content" android:layout_height="0dp" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:gravity="center" android:textColor="@color/color_525252" android:textSize="12sp" diff --git a/app/src/main/res/layout/layout_user_profile.xml b/app/src/main/res/layout/layout_user_profile.xml index c6aaa958..6d44b543 100644 --- a/app/src/main/res/layout/layout_user_profile.xml +++ b/app/src/main/res/layout/layout_user_profile.xml @@ -97,7 +97,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_light" android:textColor="@color/color_bbbbbb" android:textSize="10sp" tools:ignore="SmallSp"