Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#23 미사용 폰트 정리 진행 #24

Merged
merged 1 commit into from
Sep 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed app/src/main/res/font/notosanskr_black.ttf
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_bold.ttf
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_extrabold.ttf
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_extralight.ttf
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_light.ttf
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_semibold.ttf
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_thin.ttf
Binary file not shown.
Binary file removed app/src/main/res/font/pretendard_bold.otf
Binary file not shown.
Binary file removed app/src/main/res/font/pretendard_extra_bold.otf
Binary file not shown.
Binary file removed app/src/main/res/font/pretendard_extra_light.otf
Binary file not shown.
Binary file removed app/src/main/res/font/pretendard_light.otf
Binary file not shown.
Binary file removed app/src/main/res/font/pretendard_medium.otf
Binary file not shown.
Binary file removed app/src/main/res/font/pretendard_regular.otf
Binary file not shown.
Binary file removed app/src/main/res/font/pretendard_semi_bold.otf
Binary file not shown.
Binary file removed app/src/main/res/font/pretendard_thin.otf
Binary file not shown.
Binary file removed app/src/main/res/font/pretentdar_black.otf
Binary file not shown.
1 change: 0 additions & 1 deletion app/src/main/res/layout/fragment_login.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
android:id="@+id/subtitle_login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/pretendard_bold"
android:text="@string/owori_splash_subtitle"
android:textColor="@color/black"
android:textSize="18dp"
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/layout/fragment_onboarding.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="106dp"
android:fontFamily="@font/pretendard_bold"
setTitleText="@{vm.currentItemIndex}"
android:textColor="@color/black"
android:textSize="22dp"
Expand All @@ -37,7 +36,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginBottom="24dp"
android:fontFamily="@font/pretendard_medium"
android:textColor="@color/grey_909090"
android:textSize="16dp"
app:layout_constraintBottom_toTopOf="@+id/onboarding_viewpager"
Expand Down Expand Up @@ -97,7 +95,6 @@
android:layout_height="64dp"
android:clickable="true"
android:background="@color/owori_red"
android:fontFamily="@font/pretendard_bold"
android:onClick="@{() -> vm.onClickNextButton()}"
android:text="@{vm.currentItemIndex >= 2 ? @string/onboarding_login : @string/onboarding_next}"
android:textColor="@color/white"
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/res/layout/fragment_policy.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
xmlns:app="http://schemas.android.com/apk/res-auto">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
Expand All @@ -15,7 +14,6 @@
app:layout_constraintTop_toTopOf="parent"
android:textSize="36dp"
android:textColor="@color/black_050708"
android:fontFamily="@font/pretendard_medium"
app:layout_constraintBottom_toBottomOf="parent"
android:text="PolicyFragment"/>

Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/fragment_splash.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
android:id="@+id/subTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/pretendard_medium"
android:text="@string/owori_splash_subtitle"
android:textColor="@color/grey_f2f2f2"
android:textSize="16dp"
Expand Down
81 changes: 81 additions & 0 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="SpUsage">

<style name="TextTitle">
<item name="fontFamily">@font/notosanskr_regular</item>
<item name="fontWeight">700</item>
<item name="android:textStyle">bold</item>
</style>

<style name="TextTitle.00">
<item name="android:textSize">26dp</item>
</style>

<style name="TextTitle.01">
<item name="android:textSize">22dp</item>
</style>

<style name="TextTitle.02">
<item name="android:textSize">20dp</item>
</style>

<style name="TextSubTitle">
<item name="fontFamily">@font/notosanskr_medium</item>
<item name="fontWeight">500</item>
</style>

<style name="TextSubTitle.01">
<item name="android:textSize">18dp</item>
</style>

<style name="TextSubTitle.02">
<item name="android:textSize">16dp</item>
</style>

<style name="TextBodyMedium">
<item name="fontFamily">@font/notosanskr_medium</item>
<item name="fontWeight">500</item>
</style>

<style name="TextBodyMedium.01">
<item name="android:textSize">16dp</item>
</style>

<style name="TextBodyMedium.02">
<item name="android:textSize">15dp</item>
</style>

<style name="TextBodyMedium.03">
<item name="android:textSize">14dp</item>
</style>

<style name="TextBodyRegular">
<item name="fontFamily">@font/notosanskr_regular</item>
<item name="fontWeight">400</item>
</style>

<style name="TextBodyRegular.01">
<item name="android:textSize">16dp</item>
</style>

<style name="TextBodyRegular.02">
<item name="android:textSize">15dp</item>
</style>

<style name="TextBodyRegular.03">
<item name="android:textSize">14dp</item>
</style>

<style name="TextCaptionMedium">
<item name="fontFamily">@font/notosanskr_medium</item>
<item name="fontWeight">500</item>
<item name="android:textSize">12dp</item>
</style>

<style name="TextCaptionRegular">
<item name="fontFamily">@font/notosanskr_regular</item>
<item name="fontWeight">400</item>
<item name="android:textSize">12dp</item>
</style>

</resources>