Skip to content

Commit 0558b45

Browse files
authored
🔀 [Module] Log 수정 + Figma 디자인 컬러 수정 부분 변경 (#31)
* ♻️ Refactor Log module functionality - Changed `Log(_:with:at:)` to `Log.make(with:)` with `Logger?` as its return type * 🍱 Update and add colors in DesignSystem - Adjusted views with the name of the modified colors in DesignSystem * 💄 Update background color of PromotionTagView - Aligned the background color with the Figma design specifications. * 🔥 Remove doldam font resource
1 parent ed66181 commit 0558b45

File tree

67 files changed

+664
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+664
-284
lines changed

PyeonHaeng-iOS.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
BA28F1912B61566E0052855E /* ProductSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA28F1902B61566E0052855E /* ProductSearchView.swift */; };
2121
BA28F19D2B61572A0052855E /* Pretendard-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA28F1932B61572A0052855E /* Pretendard-Bold.otf */; };
2222
BA28F19E2B61572A0052855E /* Pretendard-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA28F1942B61572A0052855E /* Pretendard-SemiBold.otf */; };
23-
BA28F19F2B61572A0052855E /* EF_jejudoldam.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA28F1952B61572A0052855E /* EF_jejudoldam.otf */; };
2423
BA28F1A02B61572A0052855E /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA28F1962B61572A0052855E /* Pretendard-Regular.otf */; };
2524
BA28F1A12B61572A0052855E /* Pretendard-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA28F1972B61572A0052855E /* Pretendard-Thin.otf */; };
2625
BA28F1A22B61572A0052855E /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA28F1982B61572A0052855E /* Pretendard-Medium.otf */; };
@@ -69,7 +68,6 @@
6968
BA28F1902B61566E0052855E /* ProductSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductSearchView.swift; sourceTree = "<group>"; };
7069
BA28F1932B61572A0052855E /* Pretendard-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Bold.otf"; sourceTree = "<group>"; };
7170
BA28F1942B61572A0052855E /* Pretendard-SemiBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-SemiBold.otf"; sourceTree = "<group>"; };
72-
BA28F1952B61572A0052855E /* EF_jejudoldam.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = EF_jejudoldam.otf; sourceTree = "<group>"; };
7371
BA28F1962B61572A0052855E /* Pretendard-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Regular.otf"; sourceTree = "<group>"; };
7472
BA28F1972B61572A0052855E /* Pretendard-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Thin.otf"; sourceTree = "<group>"; };
7573
BA28F1982B61572A0052855E /* Pretendard-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Medium.otf"; sourceTree = "<group>"; };
@@ -238,7 +236,6 @@
238236
BA28F1922B6157140052855E /* Fonts */ = {
239237
isa = PBXGroup;
240238
children = (
241-
BA28F1952B61572A0052855E /* EF_jejudoldam.otf */,
242239
BA28F19C2B61572A0052855E /* Pretendard-Black.otf */,
243240
BA28F1932B61572A0052855E /* Pretendard-Bold.otf */,
244241
BA28F19A2B61572A0052855E /* Pretendard-ExtraBold.otf */,
@@ -417,7 +414,6 @@
417414
BA28F1A12B61572A0052855E /* Pretendard-Thin.otf in Resources */,
418415
BA28F1A62B61572A0052855E /* Pretendard-Black.otf in Resources */,
419416
BA28F1A52B61572A0052855E /* Pretendard-Light.otf in Resources */,
420-
BA28F19F2B61572A0052855E /* EF_jejudoldam.otf in Resources */,
421417
BA28F1A42B61572A0052855E /* Pretendard-ExtraBold.otf in Resources */,
422418
BA28F1A02B61572A0052855E /* Pretendard-Regular.otf in Resources */,
423419
BAA4D9B12B5A1796005999F8 /* Assets.xcassets in Resources */,
-2.3 MB
Binary file not shown.

PyeonHaeng-iOS/Sources/Components/PromotionTagView.swift

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// Created by 김응철 on 2024/1/27.
66
//
77

8+
import DesignSystem
89
import SwiftUI
910

1011
// MARK: - PromotionTagView
@@ -18,17 +19,25 @@ struct PromotionTagView: View {
1819
.padding(.horizontal, 8.0)
1920
.frame(maxHeight: 18.0)
2021
.foregroundStyle(color)
21-
.background(color.opacity(0.1))
22+
.background(backgroundColor)
2223
.clipShape(.rect(cornerRadius: 6))
2324
}
2425
}
2526

2627
private extension PromotionTagView {
2728
var color: Color {
2829
switch promotionTag {
29-
case .onePlus: .red500
30-
case .twoPlus: .blue500
31-
case .none: .gray400
30+
case .onePlus: .systemRed500
31+
case .twoPlus: .systemBlue500
32+
case .none: .gray500
33+
}
34+
}
35+
36+
var backgroundColor: Color {
37+
switch promotionTag {
38+
case .onePlus: .systemRed050
39+
case .twoPlus: .systemBlue050
40+
case .none: .gray050
3241
}
3342
}
3443
}

PyeonHaeng-iOS/Sources/Scenes/HomeScene/HomeProductListView.swift

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// Created by 홍승현 on 1/28/24.
66
//
77

8+
import DesignSystem
89
import Entity
910
import SwiftUI
1011

@@ -82,12 +83,7 @@ private struct ProductDetailsView: View {
8283
var body: some View {
8384
VStack(alignment: .leading, spacing: 16) {
8485
VStack(alignment: .leading, spacing: 8) {
85-
Text(verbatim: product.promotion.rawValue)
86-
.font(.b3)
87-
.padding(.horizontal, 8)
88-
.background(.red500.opacity(0.1))
89-
.foregroundColor(.red500)
90-
.cornerRadius(5)
86+
PromotionTagView(promotionTag: .onePlus)
9187
Text(verbatim: product.name)
9288
.font(.title1)
9389
}

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Green/green050.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0x32",
27-
"green" : "0x69",
28-
"red" : "0x3B"
26+
"blue" : "0x26",
27+
"green" : "0x4F",
28+
"red" : "0x2C"
2929
}
3030
},
3131
"idiom" : "universal"

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Green/green300.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0x53",
27-
"green" : "0xAB",
28-
"red" : "0x61"
26+
"blue" : "0x50",
27+
"green" : "0xA6",
28+
"red" : "0x5E"
2929
}
3030
},
3131
"idiom" : "universal"

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Green/green400.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0x5A",
27-
"green" : "0xBA",
28-
"red" : "0x69"
26+
"blue" : "0x58",
27+
"green" : "0xB5",
28+
"red" : "0x67"
2929
}
3030
},
3131
"idiom" : "universal"

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Red/red900.colorset/Contents.json

Lines changed: 0 additions & 38 deletions
This file was deleted.

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Blue/blue050.colorset/Contents.json renamed to Shared/Sources/DesignSystem/Resources/Colors.xcassets/System/Blue/system_blue050.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0xFE",
27-
"green" : "0xF5",
28-
"red" : "0xE6"
26+
"blue" : "0x48",
27+
"green" : "0x24",
28+
"red" : "0x14"
2929
}
3030
},
3131
"idiom" : "universal"

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Blue/blue100.colorset/Contents.json renamed to Shared/Sources/DesignSystem/Resources/Colors.xcassets/System/Blue/system_blue100.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0xFB",
27-
"green" : "0xE0",
28-
"red" : "0xB0"
26+
"blue" : "0x5C",
27+
"green" : "0x32",
28+
"red" : "0x18"
2929
}
3030
},
3131
"idiom" : "universal"

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Blue/blue200.colorset/Contents.json renamed to Shared/Sources/DesignSystem/Resources/Colors.xcassets/System/Blue/system_blue200.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0xF9",
27-
"green" : "0xD1",
28-
"red" : "0x8A"
26+
"blue" : "0x8B",
27+
"green" : "0x4B",
28+
"red" : "0x24"
2929
}
3030
},
3131
"idiom" : "universal"

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Blue/blue300.colorset/Contents.json renamed to Shared/Sources/DesignSystem/Resources/Colors.xcassets/System/Blue/system_blue300.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0xF6",
27-
"green" : "0xBB",
28-
"red" : "0x54"
26+
"blue" : "0xB3",
27+
"green" : "0x61",
28+
"red" : "0x2E"
2929
}
3030
},
3131
"idiom" : "universal"

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Blue/blue400.colorset/Contents.json renamed to Shared/Sources/DesignSystem/Resources/Colors.xcassets/System/Blue/system_blue400.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0xF4",
27-
"green" : "0xAE",
28-
"red" : "0x33"
26+
"blue" : "0xE0",
27+
"green" : "0x71",
28+
"red" : "0x2D"
2929
}
3030
},
3131
"idiom" : "universal"

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Blue/blue500.colorset/Contents.json renamed to Shared/Sources/DesignSystem/Resources/Colors.xcassets/System/Blue/system_blue500.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0xF1",
27-
"green" : "0x9A",
28-
"red" : "0x00"
26+
"blue" : "0xFC",
27+
"green" : "0x88",
28+
"red" : "0x41"
2929
}
3030
},
3131
"idiom" : "universal"

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Blue/blue600.colorset/Contents.json renamed to Shared/Sources/DesignSystem/Resources/Colors.xcassets/System/Blue/system_blue600.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0xDB",
27-
"green" : "0x8C",
28-
"red" : "0x00"
26+
"blue" : "0xF8",
27+
"green" : "0x9A",
28+
"red" : "0x60"
2929
}
3030
},
3131
"idiom" : "universal"

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Blue/blue700.colorset/Contents.json renamed to Shared/Sources/DesignSystem/Resources/Colors.xcassets/System/Blue/system_blue700.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0xAB",
27-
"green" : "0x6D",
28-
"red" : "0x00"
26+
"blue" : "0xF8",
27+
"green" : "0xBC",
28+
"red" : "0x97"
2929
}
3030
},
3131
"idiom" : "universal"

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Blue/blue800.colorset/Contents.json renamed to Shared/Sources/DesignSystem/Resources/Colors.xcassets/System/Blue/system_blue800.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0x85",
27-
"green" : "0x55",
28-
"red" : "0x00"
26+
"blue" : "0xFD",
27+
"green" : "0xDB",
28+
"red" : "0xC7"
2929
}
3030
},
3131
"idiom" : "universal"

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Blue/blue900.colorset/Contents.json renamed to Shared/Sources/DesignSystem/Resources/Colors.xcassets/System/Blue/system_blue900.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0x65",
27-
"green" : "0x41",
28-
"red" : "0x00"
26+
"blue" : "0xFD",
27+
"green" : "0xE7",
28+
"red" : "0xDA"
2929
}
3030
},
3131
"idiom" : "universal"

Shared/Sources/DesignSystem/Resources/Colors.xcassets/Yellow/yellow600.colorset/Contents.json renamed to Shared/Sources/DesignSystem/Resources/Colors.xcassets/System/Green/system_green050.colorset/Contents.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"color-space" : "srgb",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "0x53",
9-
"green" : "0xB3",
8+
"blue" : "0xEC",
9+
"green" : "0xF5",
1010
"red" : "0xE8"
1111
}
1212
},
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0x2F",
27-
"green" : "0xBB",
28-
"red" : "0xDF"
26+
"blue" : "0x0E",
27+
"green" : "0x1F",
28+
"red" : "0x0C"
2929
}
3030
},
3131
"idiom" : "universal"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0xC3",
9+
"green" : "0xE1",
10+
"red" : "0xB8"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "0x0C",
27+
"green" : "0x36",
28+
"red" : "0x0F"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

0 commit comments

Comments
 (0)