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.

Sign up for GitHub

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

[ADD/#8] 색상, 타이포 에셋 세팅 #10

Merged
merged 5 commits into from
Dec 30, 2023
Merged

[ADD/#8] 색상, 타이포 에셋 세팅 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b02a23
[ADD/#8] color asset 추가
Marchbreeze Dec 29, 2023
33edc4a
[ADD/#8] font family 추가
Marchbreeze Dec 29, 2023
1d9af5f
[ADD/#8] textAppearance 추가
Marchbreeze Dec 29, 2023
3a7a6e9
[ADD/#8] textView style 세팅
Marchbreeze Dec 29, 2023
3fe0bd2
[FIX/#8] theme textAppearance 수정
Marchbreeze Dec 29, 2023
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
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.GoingGoing"
android:theme="@style/Theme.Doorip"
android:usesCleartextTraffic="true"
tools:targetApi="31">

Expand Down
11 changes: 11 additions & 0 deletions presentation/src/main/res/font/font_pretendard_bold.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:font="@font/pretendard_bold"
android:fontStyle="normal"
android:fontWeight="700" />
<font
android:font="@font/pretendard_bold"
android:fontStyle="italic"
android:fontWeight="700" />
</font-family>
11 changes: 11 additions & 0 deletions presentation/src/main/res/font/font_pretendard_extrabold.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:font="@font/pretendard_extrabold"
android:fontStyle="normal"
android:fontWeight="800" />
<font
android:font="@font/pretendard_extrabold"
android:fontStyle="italic"
android:fontWeight="800" />
</font-family>
11 changes: 11 additions & 0 deletions presentation/src/main/res/font/font_pretendard_medium.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:font="@font/pretendard_medium"
android:fontStyle="normal"
android:fontWeight="500" />
<font
android:font="@font/pretendard_medium"
android:fontStyle="italic"
android:fontWeight="500" />
</font-family>
11 changes: 11 additions & 0 deletions presentation/src/main/res/font/font_pretendard_regular.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:font="@font/pretendard_regular"
android:fontStyle="normal"
android:fontWeight="400" />
<font
android:font="@font/pretendard_regular"
android:fontStyle="italic"
android:fontWeight="400" />
</font-family>
11 changes: 11 additions & 0 deletions presentation/src/main/res/font/font_pretendard_semibold.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:font="@font/pretendard_semibold"
android:fontStyle="normal"
android:fontWeight="600" />
<font
android:font="@font/pretendard_semibold"
android:fontStyle="italic"
android:fontWeight="600" />
</font-family>
Binary file added presentation/src/main/res/font/pretendard_bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added presentation/src/main/res/font/pretendard_extrabold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added presentation/src/main/res/font/pretendard_medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file added presentation/src/main/res/font/pretendard_regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added presentation/src/main/res/font/pretendard_semibold.ttf
View file
Open in desktop
Binary file not shown.
20 changes: 18 additions & 2 deletions presentation/src/main/res/layout/activity_mock.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,23 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#8C8C8C">
android:background="@color/black_000">

<!-- 색상 적용은 @color 활용하기 -->
<!-- 폰트 적용은 style 활용하기 -->
<!-- 폰트 색상, 형태(italic) 등 필요시 textView에서 지정해서 덮어쓰면 됨! -->

<TextView
android:id="@+id/tv_mock_text"
style="@style/TextAppearance.Doorip.Head1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:background="@color/white_000"
android:text="MOCK ACTIVITY"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_follower"
Expand All @@ -23,7 +39,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_mock_text"
app:spanCount="2"
tools:listitem="@layout/item_mock" />

Expand Down
2 changes: 1 addition & 1 deletion presentation/src/main/res/layout/item_mock.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/white_000"
android:padding="12dp">

<ImageView
Expand Down
110 changes: 110 additions & 0 deletions presentation/src/main/res/values/appearances.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="TextAppearance.Doorip" parent="">
<item name="android:textStyle">normal</item>
<item name="android:textColor">@color/black_000</item>
<item name="android:textAllCaps">false</item>
<item name="android:includeFontPadding">false</item>
<item name="android:lineSpacingMultiplier">1.0</item>
</style>

<style name="TextAppearance.Doorip.Head1">
<item name="fontFamily">@font/font_pretendard_extrabold</item>
<item name="android:textSize">24sp</item>
<item name="android:paddingVertical">6sp</item>
</style>

<style name="TextAppearance.Doorip.Head2">
<item name="fontFamily">@font/font_pretendard_bold</item>
<item name="android:textSize">22sp</item>
<item name="android:paddingVertical">5sp</item>
</style>

<style name="TextAppearance.Doorip.Head3">
<item name="fontFamily">@font/font_pretendard_semibold</item>
<item name="android:textSize">20sp</item>
<item name="android:paddingVertical">5sp</item>
</style>

<style name="TextAppearance.Doorip.Head4">
<item name="fontFamily">@font/font_pretendard_medium</item>
<item name="android:textSize">18sp</item>
<item name="android:paddingVertical">5sp</item>
</style>

<style name="TextAppearance.Doorip.Body1">
<item name="android:textSize">16sp</item>
<item name="android:paddingVertical">6sp</item>
</style>

<style name="TextAppearance.Doorip.Body1.Bold">
<item name="fontFamily">@font/font_pretendard_bold</item>
</style>

<style name="TextAppearance.Doorip.Body1.Regular">
<item name="fontFamily">@font/font_pretendard_regular</item>
</style>

<style name="TextAppearance.Doorip.Body2">
<item name="android:textSize">15sp</item>
<item name="android:paddingVertical">4sp</item>
</style>

<style name="TextAppearance.Doorip.Body2.Bold">
<item name="fontFamily">@font/font_pretendard_bold</item>
</style>

<style name="TextAppearance.Doorip.Body2.Regular">
<item name="fontFamily">@font/font_pretendard_regular</item>
</style>

<style name="TextAppearance.Doorip.Body3">
<item name="android:textSize">14sp</item>
<item name="android:paddingVertical">3sp</item>
</style>

<style name="TextAppearance.Doorip.Body3.Bold">
<item name="fontFamily">@font/font_pretendard_bold</item>
</style>

<style name="TextAppearance.Doorip.Body3.Regular">
<item name="fontFamily">@font/font_pretendard_regular</item>
</style>

<style name="TextAppearance.Doorip.Detail1">
<item name="android:textSize">13sp</item>
<item name="android:paddingVertical">3sp</item>
</style>

<style name="TextAppearance.Doorip.Detail1.Bold">
<item name="fontFamily">@font/font_pretendard_bold</item>
</style>

<style name="TextAppearance.Doorip.Detail1.Regular">
<item name="fontFamily">@font/font_pretendard_regular</item>
</style>

<style name="TextAppearance.Doorip.Detail2">
<item name="android:textSize">12sp</item>
<item name="android:paddingVertical">3sp</item>
</style>

<style name="TextAppearance.Doorip.Detail2.Bold">
<item name="fontFamily">@font/font_pretendard_bold</item>
</style>

<style name="TextAppearance.Doorip.Detail2.Regular">
<item name="fontFamily">@font/font_pretendard_regular</item>
</style>

<style name="TextAppearance.Doorip.Detail3">
<item name="android:textSize">11sp</item>
<item name="android:paddingVertical">3sp</item>
</style>

<style name="TextAppearance.Doorip.Detail3.Regular">
<item name="fontFamily">@font/font_pretendard_regular</item>
</style>

</resources>
38 changes: 31 additions & 7 deletions presentation/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>

<!-- Main _ Tangerine -->
<color name="red_100">#FAD3C6</color>
<color name="red_200">#FCAD95</color>
<color name="red_300">#FE8763</color>
<color name="red_400">#FE6032</color>
<color name="red_500">#FF4F17</color>
<color name="red_600">#E03600</color>

<!-- Sub _ Cool Gray -->
<color name="white_000">#FFFFFF</color>
<color name="black_000">#151515</color>

<color name="gray_50">#F3F3F6</color>
<color name="gray_200">#C3C4CE</color>
<color name="gray_300">#9093A8</color>
<color name="gray_400">#4A4D63</color>
<color name="gray_500">#36394F</color>
<color name="gray_600">#292C3C</color>
<color name="gray_700">#1D1F29</color>
<color name="gray_900">#15171E</color>

<!-- Transparent -->
<color name="transparent">#00000000</color>
<color name="transparent_70">#B3000000</color>
<color name="transparent_50">#80000000</color>
<color name="transparent_30">#4D000000</color>

<!-- Custom -->
<color name="kakao_yellow">#FEE500</color>

</resources>
16 changes: 6 additions & 10 deletions presentation/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.GoingGoing" parent="Theme.MaterialComponents.Light.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_500</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>
<item name="colorSecondaryVariant">@color/teal_700</item>
<item name="colorOnSecondary">@color/black</item>
<style name="Base.Theme.Doorip" parent="Theme.MaterialComponents.Light.NoActionBar">

<!-- Status bar color. -->
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar">true</item>
<!-- Customize your theme here. -->

</style>

<style name="Theme.Doorip" parent="Base.Theme.Doorip" />

</resources>