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

[Module] Log 수정 + Figma 디자인 컬러 수정 부분 변경 #31

Merged
merged 5 commits into from
Feb 2, 2024
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
4 changes: 0 additions & 4 deletions PyeonHaeng-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
BA28F1912B61566E0052855E /* ProductSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA28F1902B61566E0052855E /* ProductSearchView.swift */; };
BA28F19D2B61572A0052855E /* Pretendard-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA28F1932B61572A0052855E /* Pretendard-Bold.otf */; };
BA28F19E2B61572A0052855E /* Pretendard-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA28F1942B61572A0052855E /* Pretendard-SemiBold.otf */; };
BA28F19F2B61572A0052855E /* EF_jejudoldam.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA28F1952B61572A0052855E /* EF_jejudoldam.otf */; };
BA28F1A02B61572A0052855E /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA28F1962B61572A0052855E /* Pretendard-Regular.otf */; };
BA28F1A12B61572A0052855E /* Pretendard-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA28F1972B61572A0052855E /* Pretendard-Thin.otf */; };
BA28F1A22B61572A0052855E /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA28F1982B61572A0052855E /* Pretendard-Medium.otf */; };
Expand Down Expand Up @@ -69,7 +68,6 @@
BA28F1902B61566E0052855E /* ProductSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductSearchView.swift; sourceTree = "<group>"; };
BA28F1932B61572A0052855E /* Pretendard-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Bold.otf"; sourceTree = "<group>"; };
BA28F1942B61572A0052855E /* Pretendard-SemiBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-SemiBold.otf"; sourceTree = "<group>"; };
BA28F1952B61572A0052855E /* EF_jejudoldam.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = EF_jejudoldam.otf; sourceTree = "<group>"; };
BA28F1962B61572A0052855E /* Pretendard-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Regular.otf"; sourceTree = "<group>"; };
BA28F1972B61572A0052855E /* Pretendard-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Thin.otf"; sourceTree = "<group>"; };
BA28F1982B61572A0052855E /* Pretendard-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Medium.otf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -238,7 +236,6 @@
BA28F1922B6157140052855E /* Fonts */ = {
isa = PBXGroup;
children = (
BA28F1952B61572A0052855E /* EF_jejudoldam.otf */,
BA28F19C2B61572A0052855E /* Pretendard-Black.otf */,
BA28F1932B61572A0052855E /* Pretendard-Bold.otf */,
BA28F19A2B61572A0052855E /* Pretendard-ExtraBold.otf */,
Expand Down Expand Up @@ -417,7 +414,6 @@
BA28F1A12B61572A0052855E /* Pretendard-Thin.otf in Resources */,
BA28F1A62B61572A0052855E /* Pretendard-Black.otf in Resources */,
BA28F1A52B61572A0052855E /* Pretendard-Light.otf in Resources */,
BA28F19F2B61572A0052855E /* EF_jejudoldam.otf in Resources */,
BA28F1A42B61572A0052855E /* Pretendard-ExtraBold.otf in Resources */,
BA28F1A02B61572A0052855E /* Pretendard-Regular.otf in Resources */,
BAA4D9B12B5A1796005999F8 /* Assets.xcassets in Resources */,
Expand Down
Binary file removed PyeonHaeng-iOS/Resources/Fonts/EF_jejudoldam.otf
Binary file not shown.
17 changes: 13 additions & 4 deletions PyeonHaeng-iOS/Sources/Components/PromotionTagView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Created by 김응철 on 2024/1/27.
//

import DesignSystem
import SwiftUI

// MARK: - PromotionTagView
Expand All @@ -18,17 +19,25 @@ struct PromotionTagView: View {
.padding(.horizontal, 8.0)
.frame(maxHeight: 18.0)
.foregroundStyle(color)
.background(color.opacity(0.1))
.background(backgroundColor)
.clipShape(.rect(cornerRadius: 6))
}
}

private extension PromotionTagView {
var color: Color {
switch promotionTag {
case .onePlus: .red500
case .twoPlus: .blue500
case .none: .gray400
case .onePlus: .systemRed500
case .twoPlus: .systemBlue500
case .none: .gray500
}
}

var backgroundColor: Color {
switch promotionTag {
case .onePlus: .systemRed050
case .twoPlus: .systemBlue050
case .none: .gray050
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Created by 홍승현 on 1/28/24.
//

import DesignSystem
import Entity
import SwiftUI

Expand Down Expand Up @@ -82,12 +83,7 @@ private struct ProductDetailsView: View {
var body: some View {
VStack(alignment: .leading, spacing: 16) {
VStack(alignment: .leading, spacing: 8) {
Text(verbatim: product.promotion.rawValue)
.font(.b3)
.padding(.horizontal, 8)
.background(.red500.opacity(0.1))
.foregroundColor(.red500)
.cornerRadius(5)
PromotionTagView(promotionTag: .onePlus)
Text(verbatim: product.name)
.font(.title1)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x32",
"green" : "0x69",
"red" : "0x3B"
"blue" : "0x26",
"green" : "0x4F",
"red" : "0x2C"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x53",
"green" : "0xAB",
"red" : "0x61"
"blue" : "0x50",
"green" : "0xA6",
"red" : "0x5E"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x5A",
"green" : "0xBA",
"red" : "0x69"
"blue" : "0x58",
"green" : "0xB5",
"red" : "0x67"
}
},
"idiom" : "universal"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFE",
"green" : "0xF5",
"red" : "0xE6"
"blue" : "0x48",
"green" : "0x24",
"red" : "0x14"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFB",
"green" : "0xE0",
"red" : "0xB0"
"blue" : "0x5C",
"green" : "0x32",
"red" : "0x18"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF9",
"green" : "0xD1",
"red" : "0x8A"
"blue" : "0x8B",
"green" : "0x4B",
"red" : "0x24"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF6",
"green" : "0xBB",
"red" : "0x54"
"blue" : "0xB3",
"green" : "0x61",
"red" : "0x2E"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF4",
"green" : "0xAE",
"red" : "0x33"
"blue" : "0xE0",
"green" : "0x71",
"red" : "0x2D"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF1",
"green" : "0x9A",
"red" : "0x00"
"blue" : "0xFC",
"green" : "0x88",
"red" : "0x41"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xDB",
"green" : "0x8C",
"red" : "0x00"
"blue" : "0xF8",
"green" : "0x9A",
"red" : "0x60"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xAB",
"green" : "0x6D",
"red" : "0x00"
"blue" : "0xF8",
"green" : "0xBC",
"red" : "0x97"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x85",
"green" : "0x55",
"red" : "0x00"
"blue" : "0xFD",
"green" : "0xDB",
"red" : "0xC7"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x65",
"green" : "0x41",
"red" : "0x00"
"blue" : "0xFD",
"green" : "0xE7",
"red" : "0xDA"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x53",
"green" : "0xB3",
"blue" : "0xEC",
"green" : "0xF5",
"red" : "0xE8"
}
},
Expand All @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x2F",
"green" : "0xBB",
"red" : "0xDF"
"blue" : "0x0E",
"green" : "0x1F",
"red" : "0x0C"
}
},
"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" : "0xC3",
"green" : "0xE1",
"red" : "0xB8"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x0C",
"green" : "0x36",
"red" : "0x0F"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading