diff --git a/app/src/main/res/font/font.xml b/app/src/main/res/font/font.xml
deleted file mode 100644
index 10c0f321..00000000
--- a/app/src/main/res/font/font.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_add_alarm.xml b/app/src/main/res/layout/activity_add_alarm.xml
index 177ec774..3cbee196 100644
--- a/app/src/main/res/layout/activity_add_alarm.xml
+++ b/app/src/main/res/layout/activity_add_alarm.xml
@@ -128,6 +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:hint="@string/alarm_add_name_hint"
android:importantForAutofill="no"
android:inputType="text"
diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml
index 4f54c199..f8ff6f14 100644
--- a/app/src/main/res/layout/activity_alarm_list.xml
+++ b/app/src/main/res/layout/activity_alarm_list.xml
@@ -41,16 +41,16 @@
android:visibility="gone" />
-
+
+ android:textSize="14sp"
+ android:fontFamily="@font/pretendard_medium" />
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 88b9d53d..170179c3 100644
--- a/app/src/main/res/layout/activity_audio_content_detail.xml
+++ b/app/src/main/res/layout/activity_audio_content_detail.xml
@@ -157,7 +157,8 @@
android:layout_height="wrap_content"
android:text="@string/screen_audio_content_detail_preview_available"
android:textColor="@color/white"
- android:textSize="16.7sp" />
+ android:textSize="16.7sp"
+ android:fontFamily="@font/pretendard_medium" />
@@ -196,7 +197,8 @@
android:layout_height="wrap_content"
android:text="@string/screen_audio_content_detail_preview_unavailable"
android:textColor="#444446"
- android:textSize="16.7sp" />
+ android:textSize="16.7sp"
+ android:fontFamily="@font/pretendard_medium" />
+ android:visibility="gone"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="커버곡"
+ android:fontFamily="@font/pretendard_medium" />
+ android:visibility="gone"
+ android:fontFamily="@font/pretendard_medium" />
+ android:visibility="gone"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="120:30:30"
+ android:fontFamily="@font/pretendard_medium" />
+ android:visibility="gone"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="#커버곡 #라이브 #연애 #썸"
+ android:fontFamily="@font/pretendard_medium" />
+ android:textSize="12sp"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:ignore="LabelFor"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="너무 좋아요!!! 너무 좋아요!!! 너무 좋아요!!! 너무 좋아요!!! 너무 좋아요!!! 너무 좋아요!!!"
+ android:fontFamily="@font/pretendard_medium" />
@@ -1076,7 +1088,8 @@
android:layout_marginTop="21.3dp"
android:text="@string/screen_audio_content_detail_adult_notice"
android:textColor="@color/color_bbbbbb"
- android:textSize="18.7sp" />
+ android:textSize="18.7sp"
+ android:fontFamily="@font/pretendard_medium" />
+ android:textSize="18.7sp"
+ android:fontFamily="@font/pretendard_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 978c55fa..b58c93a9 100644
--- a/app/src/main/res/layout/activity_audio_content_main.xml
+++ b/app/src/main/res/layout/activity_audio_content_main.xml
@@ -77,7 +77,8 @@
android:maxLines="2"
android:textColor="@color/color_eeeeee"
android:textSize="13sp"
- tools:text="JFLA 커버곡 Avicii for your self" />
+ tools:text="JFLA 커버곡 Avicii for your self"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="JFLA 커버곡 Avicii for your self"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="JFLA 커버곡 Avicii for your self"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="JFLA 커버곡 Avicii for your self"
+ android:fontFamily="@font/pretendard_medium" />
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:gravity="center"
+ android:text="@string/common_zero"
+ android:textColor="@color/color_ff5c49"
+ android:textSize="13.3sp" />
+ android:visibility="gone" />
+ tools:text="JFLA 커버곡 Avicii for your self"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="JFLA 커버곡 Avicii for your self"
+ android:fontFamily="@font/pretendard_medium" />
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_audio_content_upload_price_free"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14.7sp" />
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_audio_content_upload_price_paid"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14.7sp" />
@@ -408,10 +408,10 @@
android:id="@+id/tv_both"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:fontFamily="@font/gmarket_sans_bold"
- android:text="@string/screen_audio_content_upload_purchase_option_both"
- android:textColor="@color/color_3bb9f1"
- android:textSize="14.7sp" />
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_audio_content_upload_purchase_option_both"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14.7sp" />
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_audio_content_upload_purchase_option_buy_only"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14.7sp" />
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_audio_content_upload_purchase_option_rent_only"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14.7sp" />
@@ -605,10 +605,10 @@
android:id="@+id/tv_not_limited"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:fontFamily="@font/gmarket_sans_bold"
- android:text="@string/screen_audio_content_upload_limited_unlimited"
- android:textColor="@color/color_3bb9f1"
- android:textSize="14.7sp" />
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_audio_content_upload_limited_unlimited"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14.7sp" />
-
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_audio_content_upload_limited_limited"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14.7sp" />
+
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_audio_content_upload_point_available"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14.7sp" />
-
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_audio_content_upload_point_unavailable"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14.7sp" />
+
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_audio_content_upload_preview_generate"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14.7sp" />
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_audio_content_upload_preview_not_generate"
+ android:textColor="@color/color_3bb9f1"
+ 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 46bd4240..b60149e1 100644
--- a/app/src/main/res/layout/activity_audition_role_detail.xml
+++ b/app/src/main/res/layout/activity_audition_role_detail.xml
@@ -51,13 +51,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:background="@drawable/bg_round_corner_10_transparent_3bb9f1"
- android:fontFamily="@font/gmarket_sans_bold"
- android:gravity="center"
- android:paddingVertical="12dp"
- android:text="@string/screen_audition_role_original_work"
- android:textColor="@color/color_3bb9f1"
- android:textSize="16sp" />
+ android:background="@drawable/bg_round_corner_10_transparent_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center"
+ android:paddingVertical="12dp"
+ android:text="@string/screen_audition_role_original_work"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="16sp" />
+ android:background="@drawable/bg_round_corner_10_transparent_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center"
+ android:paddingVertical="12dp"
+ android:text="@string/screen_audition_role_script"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="16sp" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/screen_audition_role_applicant_prefix"
+ android:textColor="@color/color_bbbbbb"
+ android:textSize="10.7sp" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/screen_audition_role_applicant_suffix"
+ android:textColor="@color/color_bbbbbb"
+ android:textSize="10.7sp" />
+ android:layout_marginVertical="13.7dp"
+ android:layout_weight="2"
+ android:background="@drawable/bg_round_corner_10_80d8ff"
+ android:paddingVertical="16dp">
-
+
diff --git a/app/src/main/res/layout/activity_chat_room.xml b/app/src/main/res/layout/activity_chat_room.xml
index 6a89f5a5..2afbdc0a 100644
--- a/app/src/main/res/layout/activity_chat_room.xml
+++ b/app/src/main/res/layout/activity_chat_room.xml
@@ -187,7 +187,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/iv_collapse"
app:layout_constraintStart_toEndOf="@id/iv_notice_icon"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent"
+ android:fontFamily="@font/pretendard_medium" />
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/screen_creator_community_write_notice_mark"
+ android:textColor="@color/color_777777"
+ android:textSize="13.3sp" />
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/screen_creator_community_write_record_desc"
+ android:textColor="@color/color_777777"
+ android:textSize="13.3sp" />
diff --git a/app/src/main/res/layout/activity_find_password.xml b/app/src/main/res/layout/activity_find_password.xml
index bcfe2913..b33682e7 100644
--- a/app/src/main/res/layout/activity_find_password.xml
+++ b/app/src/main/res/layout/activity_find_password.xml
@@ -100,7 +100,8 @@
android:paddingVertical="10.7dp"
android:text="@string/find_password_contact_support"
android:textColor="@color/color_3bb9f1"
- app:drawableStartCompat="@drawable/ic_headphones_blue" />
+ app:drawableStartCompat="@drawable/ic_headphones_blue"
+ android:fontFamily="@font/pretendard_medium" />
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 ebad1438..2434125e 100644
--- a/app/src/main/res/layout/activity_live_reservation_cancel.xml
+++ b/app/src/main/res/layout/activity_live_reservation_cancel.xml
@@ -96,13 +96,13 @@
android:id="@+id/tv_non_cancellable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_marginTop="15.3dp"
- android:fontFamily="sans-serif-light"
- android:text="@string/live_reservation_cancel_not_allowed"
- android:textColor="@color/color_777777"
- android:textSize="10.7sp"
- android:visibility="gone"
+ android:layout_alignParentEnd="true"
+ android:layout_marginTop="15.3dp"
+ android:fontFamily="sans-serif-light"
+ android:text="@string/live_reservation_cancel_not_allowed"
+ android:textColor="@color/color_777777"
+ android:textSize="10.7sp"
+ android:visibility="gone"
tools:ignore="RelativeOverlap,SmallSp" />
@@ -125,23 +125,23 @@
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="13.3dp"
+ android:layout_marginTop="33.3dp"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/live_reservation_cancel_question"
+ android:textColor="@color/color_a285eb"
+ android:textSize="20sp" />
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="13.3dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:letterSpacing="0"
+ android:text="@string/live_reservation_cancel_reason_title"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="13.3sp" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="23.3dp"
+ android:layout_marginTop="13.3dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/live_reservation_cancel_notice"
+ android:textColor="@color/color_ff5c49" />
+ android:layout_marginBottom="13.3dp"
+ android:background="@drawable/bg_round_corner_6_7_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center"
+ android:paddingVertical="16dp"
+ android:text="@string/live_reservation_cancel_action"
+ android:textColor="@color/white"
+ android:textSize="15sp" />
+ tools:text="@string/screen_live_room_notice_prefix"
+ android:fontFamily="@font/pretendard_medium" />
+ app:layout_constraintStart_toStartOf="parent"
+ android:fontFamily="@font/pretendard_medium" />
+ android:textSize="12sp"
+ android:fontFamily="@font/pretendard_medium" />
+ android:layout_marginHorizontal="13.3dp"
+ android:layout_marginTop="33.3dp"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:lineSpacingExtra="5sp"
+ android:text="@string/screen_live_room_create_password_label"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="16.7sp" />
+ android:layout_marginHorizontal="13.3dp"
+ android:layout_marginTop="33.3dp"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:lineSpacingExtra="5sp"
+ android:text="@string/screen_live_room_create_age_label"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="16.7sp" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_live_room_create_age_all"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14.7sp" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_live_room_age_limit_adult"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14.7sp" />
@@ -859,13 +860,13 @@
+ android:layout_marginHorizontal="13.3dp"
+ android:layout_marginTop="33.3dp"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:lineSpacingExtra="5sp"
+ android:text="@string/screen_live_room_create_price_label"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="16.7sp" />
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/screen_live_room_create_reservation_date_label"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="13.3sp" />
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/screen_live_room_create_reservation_time_label"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="13.3sp" />
+ tools:text="JFLA 커버곡 Avicii for your self"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="JFLA 커버곡 Avicii for your self"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="JFLA 커버곡 Avicii for your self"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="JFLA 커버곡 Avicii for your self"
+ android:fontFamily="@font/pretendard_medium" />
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:gravity="center"
+ android:text="@string/common_zero"
+ android:textColor="@color/color_ff5c49"
+ android:textSize="13.3sp" />
+ tools:ignore="RelativeOverlap"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:ignore="LabelFor"
+ android:fontFamily="@font/pretendard_medium" />
-
+
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:paddingHorizontal="21.3dp"
+ android:paddingVertical="8dp"
+ android:text="@string/screen_audio_content_detail_report"
+ android:textColor="@color/color_e2e2e2"
+ android:textSize="14.7sp" />
diff --git a/app/src/main/res/layout/dialog_audio_content_order_confirm.xml b/app/src/main/res/layout/dialog_audio_content_order_confirm.xml
index 51fdc7d9..89600fc8 100644
--- a/app/src/main/res/layout/dialog_audio_content_order_confirm.xml
+++ b/app/src/main/res/layout/dialog_audio_content_order_confirm.xml
@@ -55,7 +55,8 @@
android:textColor="@color/color_3bac6a"
android:textSize="7sp"
tools:ignore="SmallSp"
- tools:text="커버곡" />
+ tools:text="커버곡"
+ android:fontFamily="@font/pretendard_medium" />
+ android:textSize="18sp"
+ android:fontFamily="@font/pretendard_medium" />
+ android:textSize="18sp"
+ android:fontFamily="@font/pretendard_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 b89749c6..21fdc424 100644
--- a/app/src/main/res/layout/dialog_character_comment_report.xml
+++ b/app/src/main/res/layout/dialog_character_comment_report.xml
@@ -19,7 +19,8 @@
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
- tools:ignore="RelativeOverlap" />
+ tools:ignore="RelativeOverlap"
+ android:fontFamily="@font/pretendard_medium" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_unwanted_commercial"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_pornography"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_child_abuse_spaced"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_hate_or_violence"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_terror"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_harassment_or_violence"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_self_harm"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_misinformation"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="14sp" />
+ tools:text="델1002"
+ android:fontFamily="@font/pretendard_medium" />
+ android:paddingVertical="13.3dp">
+ android:layout_centerVertical="true"
+ android:drawablePadding="6.7dp"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center_vertical"
+ android:text="@string/screen_live_room_donation_title"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="18.3sp"
+ app:drawableStartCompat="@drawable/ic_donation_white" />
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:paddingHorizontal="13.3dp"
+ android:paddingVertical="8dp"
+ android:text="@string/screen_live_room_charge"
+ android:textColor="@color/color_80d8ff"
+ android:textSize="13.3sp" />
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:button="@null"
+ android:drawablePadding="8dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:gravity="center"
+ android:paddingHorizontal="8dp"
+ android:text="@string/screen_live_room_secret_mission"
+ android:textColor="@color/color_check_secret"
+ app:drawableStartCompat="@drawable/ic_select_square" />
+
+ android:layout_weight="1"
+ android:background="@drawable/bg_round_corner_6_7_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center"
+ android:paddingVertical="12.7dp"
+ android:text="@string/screen_live_room_donation_plus_10"
+ android:textColor="@color/white"
+ android:textSize="14.7sp" />
-
+ android:layout_weight="1"
+ android:background="@drawable/bg_round_corner_6_7_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center"
+ android:paddingVertical="12.7dp"
+ android:text="@string/screen_live_room_donation_plus_100"
+ android:textColor="@color/white"
+ android:textSize="14.7sp" />
-
+ android:layout_weight="1"
+ android:background="@drawable/bg_round_corner_6_7_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center"
+ android:paddingVertical="12.7dp"
+ android:text="@string/screen_live_room_donation_plus_1000"
+ android:textColor="@color/white"
+ android:textSize="14.7sp" />
-
-
+ android:layout_weight="1"
+ android:background="@drawable/bg_round_corner_6_7_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center"
+ android:paddingVertical="12.7dp"
+ android:text="@string/screen_live_room_donation_plus_10000"
+ android:textColor="@color/white"
+ android:textSize="14.7sp" />
+
+ android:background="@drawable/bg_round_corner_10_13181b_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center"
+ android:paddingVertical="16dp"
+ android:text="@string/screen_live_room_cancel"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="18.3sp" />
-
-
+ android:layout_weight="1.5"
+ android:background="@drawable/bg_round_corner_10_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center"
+ android:paddingVertical="16dp"
+ android:text="@string/screen_live_room_donation_title"
+ android:textColor="@color/white"
+ android:textSize="18.3sp" />
+
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 dd0366be..ca7f13a7 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
@@ -50,12 +50,12 @@
android:orientation="horizontal">
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_live_room_total_label"
+ android:textColor="@color/color_d2d2d2"
+ android:textSize="13.3sp" />
+ android:id="@+id/tv_total_can_slash"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:gravity="end"
+ android:text="@string/screen_live_room_separator_slash"
+ android:textColor="@color/white"
+ android:textSize="14sp"
+ android:visibility="gone" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_live_room_menu_preset_1"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14.7sp" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_live_room_menu_preset_2"
+ android:textColor="@color/color_555555"
+ android:textSize="14.7sp" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:text="@string/screen_live_room_menu_preset_3"
+ android:textColor="@color/color_555555"
+ android:textSize="14.7sp" />
@@ -379,30 +379,30 @@
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="13.3dp"
+ android:layout_weight="1"
+ android:background="@drawable/bg_round_corner_10_13181b_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center"
+ android:paddingVertical="16dp"
+ android:text="@string/screen_live_room_cancel"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="18.3sp" />
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@drawable/bg_round_corner_10_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center"
+ android:paddingVertical="16dp"
+ android:text="@string/screen_live_room_update_action"
+ android:textColor="@color/white"
+ android:textSize="18.3sp" />
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 ed0f6d98..49e4557a 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
@@ -74,7 +74,8 @@
android:paddingVertical="1.3dp"
android:textColor="@color/white"
android:textSize="11.3sp"
- tools:text="여" />
+ tools:text="여"
+ android:fontFamily="@font/pretendard_medium" />
+ android:background="@drawable/bg_round_corner_8_transparent_3bb9f1"
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center"
+ android:paddingVertical="13dp"
+ android:text="@string/screen_live_room_no_chatting_three_minutes"
+ android:textColor="@color/color_3bb9f1"
+ android:visibility="gone" />
+ tools:text="매주 일요일 밤 12시 사냥꾼의 연애상담소를 오픈합니다. 많은 관심 부탁드립니다~매주 일요일 밤 12시 사냥꾼의 연애상담소를 오픈합니다. 많은 관심 부탁드립니다~"
+ android:fontFamily="@font/pretendard_medium" />
diff --git a/app/src/main/res/layout/dialog_profile_report.xml b/app/src/main/res/layout/dialog_profile_report.xml
index 56ed4944..49942442 100644
--- a/app/src/main/res/layout/dialog_profile_report.xml
+++ b/app/src/main/res/layout/dialog_profile_report.xml
@@ -32,24 +32,24 @@
android:id="@+id/tv_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="16.7dp"
- android:layout_toStartOf="@+id/tv_report"
- android:fontFamily="@font/gmarket_sans_medium"
- android:padding="6.7dp"
- android:text="@string/cancel"
- android:textColor="@color/color_eeeeee"
- android:textSize="14sp" />
+ android:layout_marginEnd="16.7dp"
+ android:layout_toStartOf="@+id/tv_report"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:padding="6.7dp"
+ android:text="@string/cancel"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="14sp" />
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="6.7dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:padding="6.7dp"
+ android:text="@string/report_button"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14sp" />
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 c2b386e5..584ca321 100644
--- a/app/src/main/res/layout/dialog_purchase_community_post.xml
+++ b/app/src/main/res/layout/dialog_purchase_community_post.xml
@@ -55,12 +55,12 @@
android:layout_marginEnd="13.3dp"
android:layout_weight="1"
android:background="@drawable/bg_round_corner_10_13181b_3bb9f1"
- android:fontFamily="@font/gmarket_sans_bold"
- android:gravity="center"
- android:paddingVertical="16dp"
- android:text="@string/cancel"
- android:textColor="@color/color_3bb9f1"
- android:textSize="18.3sp" />
+ android:fontFamily="@font/gmarket_sans_bold"
+ android:gravity="center"
+ android:paddingVertical="16dp"
+ android:text="@string/cancel"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="18.3sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_unwanted_commercial"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_child_abuse_spaced"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_hate_or_violence"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_terror"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_harassment"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_self_harm"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_misinformation"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
@@ -104,24 +104,24 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16.7dp"
- android:layout_toStartOf="@+id/tv_report"
- android:fontFamily="@font/gmarket_sans_medium"
- android:padding="6.7dp"
- android:text="@string/cancel"
- android:textColor="@color/color_eeeeee"
- android:textSize="14sp" />
+ android:layout_toStartOf="@+id/tv_report"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:padding="6.7dp"
+ android:text="@string/cancel"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="14sp" />
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="6.7dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:padding="6.7dp"
+ android:text="@string/report_button"
+ android:textColor="@color/color_9970ff"
+ android:textSize="14sp" />
diff --git a/app/src/main/res/layout/dialog_user_report.xml b/app/src/main/res/layout/dialog_user_report.xml
index c21c0008..3fb439e7 100644
--- a/app/src/main/res/layout/dialog_user_report.xml
+++ b/app/src/main/res/layout/dialog_user_report.xml
@@ -24,82 +24,82 @@
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/screen_audio_content_detail_report_reason_harassment"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/screen_audio_content_detail_report_reason_privacy"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/screen_audio_content_detail_report_reason_impersonation"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/screen_audio_content_detail_report_reason_threat"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_child_abuse_spaced"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/screen_audio_content_detail_report_reason_hate"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/screen_audio_content_detail_report_reason_spam"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
+ android:layout_height="wrap_content"
+ android:buttonTint="@color/color_909090"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/report_reason_none"
+ android:textColor="@color/color_909090"
+ android:textSize="14sp" />
@@ -112,25 +112,25 @@
android:id="@+id/tv_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="16.7dp"
- android:layout_toStartOf="@+id/tv_report"
- android:fontFamily="@font/gmarket_sans_medium"
- android:padding="6.7dp"
- android:text="@string/cancel"
- android:textColor="@color/color_eeeeee"
- android:textSize="14sp" />
+ android:layout_marginEnd="16.7dp"
+ android:layout_toStartOf="@+id/tv_report"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:padding="6.7dp"
+ android:text="@string/cancel"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="14sp" />
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="6.7dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:padding="6.7dp"
+ android:text="@string/report_button"
+ android:textColor="@color/color_3bb9f1"
+ android:textSize="14sp" />
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 e0b6be3b..e6fcdd11 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
@@ -119,7 +119,8 @@
android:textColorHint="@color/color_777777"
android:textCursorDrawable="@drawable/edit_text_cursor"
android:textSize="13.3sp"
- tools:ignore="LabelFor" />
+ tools:ignore="LabelFor"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:ignore="LabelFor"
+ android:fontFamily="@font/pretendard_medium" />
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:fontFamily="@font/gmarket_sans_light"
+ android:text="@string/screen_explorer_creator_rank_notice"
+ android:textColor="@color/color_bbbbbb"
+ android:textSize="13.3sp" />
+ android:layout_marginTop="16.7dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/company_info"
+ android:textColor="@color/color_777777"
+ android:textSize="11sp" />
diff --git a/app/src/main/res/layout/fragment_audio_content_main_tab_home.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_home.xml
index fcf8915c..86f70635 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
@@ -159,13 +159,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_category_series"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="5.3dp"
- android:fontFamily="@font/gmarket_sans_medium"
- android:text="@string/audio_content_home_tab_series"
- android:textColor="@color/color_777777"
- android:textSize="12sp"
- tools:ignore="SmallSp" />
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="5.3dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/audio_content_home_tab_series"
+ android:textColor="@color/color_777777"
+ android:textSize="12sp"
+ tools:ignore="SmallSp" />
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="5.3dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/audio_content_home_tab_content"
+ android:textColor="@color/color_777777"
+ android:textSize="12sp"
+ tools:ignore="SmallSp" />
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="5.3dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/audio_content_home_tab_alarm"
+ android:textColor="@color/color_777777"
+ android:textSize="12sp"
+ tools:ignore="SmallSp" />
+ android:layout_below="@+id/iv_category_asmr"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="5.3dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/audio_content_home_tab_asmr"
+ android:textColor="@color/color_777777"
+ android:textSize="12sp"
+ tools:ignore="SmallSp" />
@@ -575,13 +575,13 @@
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="13.3dp"
+ android:layout_marginTop="30dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:text="@string/company_info"
+ android:textColor="@color/color_777777"
+ android:textSize="11sp" />
diff --git a/app/src/main/res/layout/fragment_audio_content_main_tab_series.xml b/app/src/main/res/layout/fragment_audio_content_main_tab_series.xml
index 477f2ea7..380029c8 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
@@ -193,14 +193,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
+
+ android:layout_height="wrap_content"
+ android:layout_marginStart="13.3dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:lineSpacingMultiplier="1.25"
+ android:text="@string/dialog_audition_apply_agreement"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="13.3sp" />
+ app:layout_constraintTop_toTopOf="parent"
+ android:fontFamily="@font/pretendard_medium" />
diff --git a/app/src/main/res/layout/fragment_explorer.xml b/app/src/main/res/layout/fragment_explorer.xml
index 3d7fbe66..3b139fb7 100644
--- a/app/src/main/res/layout/fragment_explorer.xml
+++ b/app/src/main/res/layout/fragment_explorer.xml
@@ -84,13 +84,14 @@
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginVertical="40dp"
+ android:text="@string/screen_search_no_result"
+ android:visibility="gone"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/fl_search_channel"
+ android:fontFamily="@font/pretendard_medium" />
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 01d92da2..649f737a 100644
--- a/app/src/main/res/layout/fragment_live_room_detail.xml
+++ b/app/src/main/res/layout/fragment_live_room_detail.xml
@@ -46,7 +46,8 @@
android:paddingVertical="3.3dp"
android:text="@string/screen_live_room_age_badge"
android:textColor="@color/color_e33621"
- android:visibility="gone" />
+ android:visibility="gone"
+ android:fontFamily="@font/pretendard_medium" />
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:gravity="center_vertical"
+ android:text="@string/screen_live_room_participant_label"
+ android:textColor="@color/color_eeeeee"
+ android:textSize="12sp"
+ android:visibility="gone" />
+ tools:ignore="LabelFor"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:ignore="LabelFor"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="pgwkil"
+ android:fontFamily="@font/pretendard_medium" />
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 9e95e4e5..f9601f38 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
@@ -120,5 +120,6 @@
app:layout_constraintStart_toEndOf="@+id/iv_audio_content_creator"
app:layout_constraintTop_toTopOf="@+id/iv_audio_content_creator"
tools:ignore="SmallSp"
- tools:text="pgwkil" />
+ tools:text="pgwkil"
+ android:fontFamily="@font/pretendard_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 51e82f20..d2dedd0d 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
@@ -172,7 +172,8 @@
android:textColor="@color/white"
android:textSize="10.3sp"
android:visibility="gone"
- tools:ignore="SmallSp" />
+ tools:ignore="SmallSp"
+ android:fontFamily="@font/pretendard_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 ae576bd1..57c88804 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
@@ -72,14 +72,14 @@
android:id="@+id/tv_point"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:background="@drawable/bg_round_corner_2_6_7849bc"
- android:fontFamily="@font/gmarket_sans_medium"
- android:gravity="center"
- android:padding="2.6dp"
- android:text="@string/audio_content_badge_point"
- android:textColor="@color/white"
- android:textSize="8sp"
+ android:layout_marginStart="8dp"
+ android:background="@drawable/bg_round_corner_2_6_7849bc"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:gravity="center"
+ android:padding="2.6dp"
+ android:text="@string/audio_content_badge_point"
+ android:textColor="@color/white"
+ android:textSize="8sp"
android:visibility="gone"
tools:ignore="SmallSp" />
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 f018e29a..39834222 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
@@ -49,5 +49,6 @@
app:layout_constraintBottom_toBottomOf="@+id/tv_audition_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_audition_title"
- tools:text="총 3개" />
+ tools:text="총 3개"
+ android:fontFamily="@font/pretendard_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 0d125796..5d8f4109 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
@@ -38,5 +38,6 @@
app:layout_constraintBottom_toBottomOf="@+id/tv_audition_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_audition_title"
- tools:text="총 3개" />
+ tools:text="총 3개"
+ android:fontFamily="@font/pretendard_medium" />
diff --git a/app/src/main/res/layout/item_chat_typing_indicator.xml b/app/src/main/res/layout/item_chat_typing_indicator.xml
index f4fe12a3..5bb5ae9e 100644
--- a/app/src/main/res/layout/item_chat_typing_indicator.xml
+++ b/app/src/main/res/layout/item_chat_typing_indicator.xml
@@ -44,7 +44,8 @@
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="@android:color/white"
- android:textSize="12sp" />
+ android:textSize="12sp"
+ android:fontFamily="@font/pretendard_medium" />
+ android:textSize="18sp"
+ android:fontFamily="@font/pretendard_medium" />
+ android:textSize="18sp"
+ android:fontFamily="@font/pretendard_medium" />
+ android:textSize="18sp"
+ android:fontFamily="@font/pretendard_medium" />
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 33aa9a11..4f64a44c 100644
--- a/app/src/main/res/layout/item_community_post_comment.xml
+++ b/app/src/main/res/layout/item_community_post_comment.xml
@@ -38,15 +38,15 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:background="@drawable/bg_round_corner_3_3_553bb9f1"
- android:fontFamily="@font/gmarket_sans_medium"
- android:gravity="center"
- android:paddingHorizontal="4dp"
- android:paddingTop="2dp"
- android:paddingBottom="0dp"
- android:text="@string/screen_audio_content_detail_comment_secret"
- android:textColor="@color/color_selected_secret"
- android:textSize="11sp"
- android:visibility="gone" />
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:gravity="center"
+ android:paddingHorizontal="4dp"
+ android:paddingTop="2dp"
+ android:paddingBottom="0dp"
+ android:text="@string/screen_audio_content_detail_comment_secret"
+ android:textColor="@color/color_selected_secret"
+ android:textSize="11sp"
+ android:visibility="gone" />
+ tools:ignore="LabelFor"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:ignore="LabelFor"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="남공여수"
+ android:fontFamily="@font/pretendard_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 49a29400..97ab3f46 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
@@ -14,5 +14,6 @@
android:paddingVertical="10dp"
android:textColor="@color/color_777777"
android:textSize="12sp"
- tools:text="자작곡" />
+ tools:text="자작곡"
+ android:fontFamily="@font/pretendard_medium" />
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 b3140ec8..10231a81 100644
--- a/app/src/main/res/layout/item_creator_community_all.xml
+++ b/app/src/main/res/layout/item_creator_community_all.xml
@@ -223,7 +223,8 @@
android:textColorHint="@color/color_777777"
android:textCursorDrawable="@drawable/edit_text_cursor"
android:textSize="13.3sp"
- tools:ignore="LabelFor" />
+ tools:ignore="LabelFor"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="너무 좋아요!!! 너무 좋아요!!! 너무 좋아요!!! 너무 좋아요!!! 너무 좋아요!!! 너무 좋아요!!!"
+ android:fontFamily="@font/pretendard_medium" />
diff --git a/app/src/main/res/layout/item_faq.xml b/app/src/main/res/layout/item_faq.xml
index 0bf6134f..6144588c 100644
--- a/app/src/main/res/layout/item_faq.xml
+++ b/app/src/main/res/layout/item_faq.xml
@@ -11,16 +11,16 @@
android:layout_height="wrap_content"
android:paddingVertical="20dp">
-
+
+ tools:text="스탭"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="안녕하세요~!"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="안녕하세요~!"
+ android:fontFamily="@font/pretendard_medium" />
diff --git a/app/src/main/res/layout/item_live_room_donation_status_chat.xml b/app/src/main/res/layout/item_live_room_donation_status_chat.xml
index eb92d373..a20b15b2 100644
--- a/app/src/main/res/layout/item_live_room_donation_status_chat.xml
+++ b/app/src/main/res/layout/item_live_room_donation_status_chat.xml
@@ -11,6 +11,7 @@
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="11sp"
- tools:ignore="SmallSp" />
+ tools:ignore="SmallSp"
+ android:fontFamily="@font/pretendard_medium" />
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 758a9505..64c72fdf 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
@@ -11,6 +11,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_eeeeee"
- android:textSize="12sp" />
+ android:textSize="12sp"
+ android:fontFamily="@font/pretendard_medium" />
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 4a05c5bd..0eac69f1 100644
--- a/app/src/main/res/layout/item_my_live_reservation.xml
+++ b/app/src/main/res/layout/item_my_live_reservation.xml
@@ -223,13 +223,13 @@
android:layout_height="wrap_content"
android:background="@drawable/payment_free_background"
android:fontFamily="@font/pretendard_regular"
- android:gravity="center"
- android:minWidth="52dp"
- android:padding="4dp"
- android:text="@string/live_reservation_free"
- android:textColor="#263238"
- android:textSize="14sp"
- android:visibility="gone"
+ android:gravity="center"
+ android:minWidth="52dp"
+ android:padding="4dp"
+ android:text="@string/live_reservation_free"
+ android:textColor="#263238"
+ android:textSize="14sp"
+ android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
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 8c0ae6e6..00992242 100644
--- a/app/src/main/res/layout/item_new_character_all.xml
+++ b/app/src/main/res/layout/item_new_character_all.xml
@@ -51,7 +51,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_character"
- tools:text="캐릭터 이름" />
+ tools:text="캐릭터 이름"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:text="설명 텍스트"
+ android:fontFamily="@font/pretendard_medium" />
diff --git a/app/src/main/res/layout/item_report_reason.xml b/app/src/main/res/layout/item_report_reason.xml
index 15a68dfa..5e026e2a 100644
--- a/app/src/main/res/layout/item_report_reason.xml
+++ b/app/src/main/res/layout/item_report_reason.xml
@@ -12,7 +12,8 @@
android:layout_weight="1"
android:textColor="@color/white"
android:textSize="15sp"
- android:text=""/>
+ android:text=""
+ android:fontFamily="@font/pretendard_medium" />
+ android:visibility="gone" />
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 c31bba10..0499e580 100644
--- a/app/src/main/res/layout/item_user_profile_cheers.xml
+++ b/app/src/main/res/layout/item_user_profile_cheers.xml
@@ -96,7 +96,8 @@
android:textCursorDrawable="@drawable/edit_text_cursor"
android:textSize="14sp"
android:theme="@style/EditTextStyle"
- tools:ignore="LabelFor" />
+ tools:ignore="LabelFor"
+ android:fontFamily="@font/pretendard_medium" />
+ tools:ignore="SmallSp"
+ android:fontFamily="@font/pretendard_medium" />
@@ -193,7 +195,8 @@
android:textCursorDrawable="@drawable/edit_text_cursor"
android:textSize="14sp"
android:theme="@style/EditTextStyle"
- tools:ignore="LabelFor" />
+ tools:ignore="LabelFor"
+ android:fontFamily="@font/pretendard_medium" />
-
+ android:layout_height="wrap_content"
+ android:layout_marginTop="11dp"
+ android:fontFamily="@font/pretendard_regular"
+ android:gravity="center"
+ android:text="@string/read_more"
+ android:textColor="#B0BEC5"
+ android:textSize="14sp" />
+
diff --git a/app/src/main/res/layout/layout_roulette_option.xml b/app/src/main/res/layout/layout_roulette_option.xml
index 83e20fe6..5e68559e 100644
--- a/app/src/main/res/layout/layout_roulette_option.xml
+++ b/app/src/main/res/layout/layout_roulette_option.xml
@@ -19,7 +19,8 @@
android:textColor="@color/color_eeeeee"
android:textSize="14.7sp"
tools:ignore="RelativeOverlap"
- tools:text="옵션1" />
+ tools:text="옵션1"
+ android:fontFamily="@font/pretendard_medium" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:fontFamily="@font/pretendard_bold"
+ android:text="@string/screen_user_profile_content_title"
+ android:textColor="@color/white"
+ android:textSize="26sp" />
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:fontFamily="@font/pretendard_light"
+ android:gravity="center"
+ android:text="@string/view_all"
+ android:textColor="#78909C"
+ android:textSize="14sp" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/pretendard_bold"
+ android:text="@string/screen_user_profile_fan_talk_title"
+ android:textColor="@color/white"
+ android:textSize="26sp" />
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:fontFamily="@font/pretendard_light"
+ android:gravity="center"
+ android:text="@string/view_all"
+ android:textColor="#78909C"
+ android:textSize="14sp" />
+ tools:ignore="LabelFor"
+ android:fontFamily="@font/pretendard_medium" />
+ android:fontFamily="@font/pretendard_light"
+ android:gravity="center"
+ android:text="@string/screen_user_profile_cheer_empty"
+ android:textColor="@color/color_bbbbbb"
+ android:textSize="14sp"
+ android:visibility="gone" />