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

Jump to bottom

[ADD/#16] 타이포, 색상 에셋 수정, 로고 추가 #17

Merged
merged 3 commits into from
Jan 1, 2024
Merged

[ADD/#16] 타이포, 색상 에셋 수정, 로고 추가 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
183efcb
[FIX/#16] 색상 에셋 수정
Marchbreeze Jan 1, 2024
60b702f
[FIX/#16] 타이포 에셋 수정
Marchbreeze Jan 1, 2024
788ce8b
[ADD/#16] doorip logo 추가
Marchbreeze Jan 1, 2024
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
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<application
android:name=".MyApp"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:icon="@mipmap/ic_doorip_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:roundIcon="@mipmap/ic_doorip_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Doorip"
android:usesCleartextTraffic="true"
Expand Down
Binary file added presentation/src/main/ic_doorip_launcher-playstore.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions presentation/src/main/res/mipmap-anydpi-v26/ic_doorip_launcher.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_doorip_launcher_foreground"/>
</adaptive-icon>
5 changes: 5 additions & 0 deletions presentation/src/main/res/mipmap-anydpi-v26/ic_doorip_launcher_round.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_doorip_launcher_foreground"/>
</adaptive-icon>
Binary file added presentation/src/main/res/mipmap-hdpi/ic_doorip_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-hdpi/ic_doorip_launcher_foreground.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-hdpi/ic_doorip_launcher_round.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-mdpi/ic_doorip_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-mdpi/ic_doorip_launcher_foreground.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-mdpi/ic_doorip_launcher_round.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-xhdpi/ic_doorip_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-xhdpi/ic_doorip_launcher_foreground.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-xhdpi/ic_doorip_launcher_round.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-xxhdpi/ic_doorip_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-xxhdpi/ic_doorip_launcher_foreground.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-xxhdpi/ic_doorip_launcher_round.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-xxxhdpi/ic_doorip_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-xxxhdpi/ic_doorip_launcher_foreground.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added presentation/src/main/res/mipmap-xxxhdpi/ic_doorip_launcher_round.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions presentation/src/main/res/values/appearances.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<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>
<item name="android:paddingVertical">6sp</item>
</style>

<style name="TextAppearance.Doorip.Head3">
Expand All @@ -35,15 +35,15 @@

<style name="TextAppearance.Doorip.Body1">
<item name="android:textSize">16sp</item>
<item name="android:paddingVertical">6sp</item>
<item name="android:paddingVertical">4sp</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 name="TextAppearance.Doorip.Body1.Medi">
<item name="fontFamily">@font/font_pretendard_medium</item>
</style>

<style name="TextAppearance.Doorip.Body2">
Expand All @@ -55,21 +55,21 @@
<item name="fontFamily">@font/font_pretendard_bold</item>
</style>

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

<style name="TextAppearance.Doorip.Body3">
<item name="android:textSize">14sp</item>
<item name="android:paddingVertical">3sp</item>
<item name="android:paddingVertical">4sp</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 name="TextAppearance.Doorip.Body3.Medi">
<item name="fontFamily">@font/font_pretendard_medium</item>
</style>

<style name="TextAppearance.Doorip.Detail1">
Expand Down
3 changes: 1 addition & 2 deletions presentation/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

디자인굉굉이네 공유방 -> Hi-fi view에는 red_400이 FF4F17 로 되어있는데 여기는 red_500으로 되어있어요!!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

엇 그 아래에 브랜딩 페이지 보면 red_400이 없어졌슴니다..! 요거는 디잔 측에 요청해서 통일해달라구 해야할듯

<color name="red_600">#E03600</color>

Expand All @@ -14,13 +13,13 @@
<color name="black_000">#151515</color>

<color name="gray_50">#F3F3F6</color>
<color name="gray_100">#E4E5ED</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>
Expand Down