Skip to content

Commit

Permalink
Font LineHeight 처리, Design System 아이콘, 컬러 추가 (#24)
Browse files Browse the repository at this point in the history
* 🚚 Separate Pretendard and Doldam font files

* 🚚 Organize Fonts in DesignSystem

- Restructured the Fonts within the DesignSystem for better organization.
- Renamed the Fonts file to FontsRegistrar for clearer naming and improved readability.

* 🎨 Adjust line spacing and refactor fonts to match Figma

* 🚚 Separate color and image assets

* ✨ Add yellow, red, blue, yellow colors

* 🍱 Add Icon assets

* 🔥 Remove Doldam Font

* 🏷️ Update extension from `Text` to `View`
  • Loading branch information
WhiteHyun authored Jan 30, 2024
1 parent 3e3616d commit 8cff04a
Show file tree
Hide file tree
Showing 191 changed files with 2,475 additions and 120 deletions.
12 changes: 6 additions & 6 deletions PyeonHaeng-iOS/Sources/Components/PromotionTagView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ struct PromotionTagView: View {
}
}

#Preview(traits: .sizeThatFitsLayout) {
PromotionTagView(promotionTag: .none)
}

private extension PromotionTagView {
var color: Color {
switch promotionTag {
case .onePlus: .pyeonHaengRed
case .twoPlus: .pyeonHaengBlue
case .onePlus: .red500
case .twoPlus: .blue500
case .none: .gray400
}
}
}

#Preview(traits: .sizeThatFitsLayout) {
PromotionTagView(promotionTag: .none)
}
2 changes: 1 addition & 1 deletion PyeonHaeng-iOS/Sources/PyeonHaengApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import SwiftUI
@main
struct PyeonHaengApp: App {
init() {
Fonts.registerFonts() // 앱을 실행하기 전에 폰트를 로드합니다.
FontRegistrar.registerFonts() // 앱을 실행하기 전에 폰트를 로드합니다.
}

var body: some Scene {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ private struct ProductDetailsView: View {
Text(verbatim: "1+1")
.font(.b3)
.padding(.horizontal, 8)
.background(Color.pyeonHaengRed.opacity(0.1))
.foregroundColor(Color.pyeonHaengRed)
.background(.red500.opacity(0.1))
.foregroundColor(.red500)
.cornerRadius(5)
Text(product)
.font(.title1)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFE",
"green" : "0xF2",
"red" : "0xEA"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFE",
"green" : "0xF5",
"red" : "0xE6"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFD",
"green" : "0xD6",
"red" : "0xBE"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFB",
"green" : "0xE0",
"red" : "0xB0"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFC",
"green" : "0xC2",
"red" : "0x9E"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF9",
"green" : "0xD1",
"red" : "0x8A"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFB",
"green" : "0xA7",
"red" : "0x72"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF6",
"green" : "0xBB",
"red" : "0x54"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFA",
"green" : "0x95",
"red" : "0x57"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF4",
"green" : "0xAE",
"red" : "0x33"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xE3",
"green" : "0x70",
"red" : "0x29"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xDB",
"green" : "0x8C",
"red" : "0x00"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xB1",
"green" : "0x57",
"red" : "0x20"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xAB",
"green" : "0x6D",
"red" : "0x00"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x3E",
"green" : "0x9F",
"blue" : "0x89",
"green" : "0x44",
"red" : "0x19"
}
},
Expand All @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x66",
"green" : "0xBC",
"red" : "0x6C"
"blue" : "0x85",
"green" : "0x55",
"red" : "0x00"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x69",
"green" : "0x34",
"red" : "0x13"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x65",
"green" : "0x41",
"red" : "0x00"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading

0 comments on commit 8cff04a

Please sign in to comment.