From b9039020231f3107ef8e404053f573be26d625bb Mon Sep 17 00:00:00 2001 From: Park Seo Yeon Date: Wed, 5 Jun 2024 22:27:22 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=92=84=20[Design]=20=EC=83=89?= =?UTF-8?q?=EC=83=81=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=8B=9C=EC=8A=A4?= =?UTF-8?q?=ED=85=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets.xcassets/Color/Contents.json | 6 ++++ .../Color/Info/Caution.colorset/Contents.json | 20 +++++++++++++ .../Assets.xcassets/Color/Info/Contents.json | 6 ++++ .../Info/Information.colorset/Contents.json | 20 +++++++++++++ .../Info/Negative.colorset/Contents.json | 20 +++++++++++++ .../Info/Positive.colorset/Contents.json | 20 +++++++++++++ .../Assets.xcassets/Color/Main/Contents.json | 6 ++++ .../Color/Main/Primary.colorset/Contents.json | 20 +++++++++++++ .../Color/Neutral/Contents.json | 6 ++++ .../Neutral/Neutral100.colorset/Contents.json | 20 +++++++++++++ .../Neutral/Neutral200.colorset/Contents.json | 20 +++++++++++++ .../Neutral/Neutral300.colorset/Contents.json | 20 +++++++++++++ .../Neutral/Neutral400.colorset/Contents.json | 20 +++++++++++++ .../Neutral/Neutral50.colorset/Contents.json | 20 +++++++++++++ .../Neutral/Neutral500.colorset/Contents.json | 20 +++++++++++++ .../Neutral/Neutral600.colorset/Contents.json | 20 +++++++++++++ .../Neutral/Neutral700.colorset/Contents.json | 20 +++++++++++++ .../Neutral/Neutral800.colorset/Contents.json | 20 +++++++++++++ .../Neutral/Neutral900.colorset/Contents.json | 20 +++++++++++++ .../DesignSystem/Sources/Color/Color.swift | 30 +++++++++++++++++++ .../Sources/Color/ColorView.swift | 20 +++++++++++++ .../Sources/{ => Font}/Font.swift | 21 +++++++++---- .../Sources/{ => Font}/FontView.swift | 0 23 files changed, 389 insertions(+), 6 deletions(-) create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Caution.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Information.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Negative.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Positive.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Main/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Main/Primary.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral100.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral200.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral300.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral400.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral50.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral500.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral600.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral700.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral800.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral900.colorset/Contents.json create mode 100644 Projects/DesignSystem/Sources/Color/Color.swift create mode 100644 Projects/DesignSystem/Sources/Color/ColorView.swift rename Projects/DesignSystem/Sources/{ => Font}/Font.swift (89%) rename Projects/DesignSystem/Sources/{ => Font}/FontView.swift (100%) diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Caution.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Caution.colorset/Contents.json new file mode 100644 index 0000000..c72f567 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Caution.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.157", + "green" : "0.639", + "red" : "1.000" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Information.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Information.colorset/Contents.json new file mode 100644 index 0000000..23a70ae --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Information.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "1.000", + "green" : "0.392", + "red" : "0.157" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Negative.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Negative.colorset/Contents.json new file mode 100644 index 0000000..63d0ff8 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Negative.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.251", + "green" : "0.251", + "red" : "1.000" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Positive.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Positive.colorset/Contents.json new file mode 100644 index 0000000..26fe1fe --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Positive.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.435", + "green" : "0.804", + "red" : "0.039" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Main/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Main/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Main/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Main/Primary.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Main/Primary.colorset/Contents.json new file mode 100644 index 0000000..d3777aa --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Main/Primary.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.447", + "green" : "0.412", + "red" : "1.000" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral100.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral100.colorset/Contents.json new file mode 100644 index 0000000..6360067 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral100.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.933", + "green" : "0.933", + "red" : "0.933" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral200.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral200.colorset/Contents.json new file mode 100644 index 0000000..b91fa3d --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral200.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.863", + "green" : "0.863", + "red" : "0.863" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral300.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral300.colorset/Contents.json new file mode 100644 index 0000000..f9b5e0d --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral300.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.769", + "green" : "0.769", + "red" : "0.769" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral400.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral400.colorset/Contents.json new file mode 100644 index 0000000..6f06231 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral400.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.608", + "green" : "0.608", + "red" : "0.608" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral50.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral50.colorset/Contents.json new file mode 100644 index 0000000..6c265a8 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral50.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.969", + "green" : "0.969", + "red" : "0.969" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral500.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral500.colorset/Contents.json new file mode 100644 index 0000000..36d2384 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral500.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.451", + "green" : "0.451", + "red" : "0.451" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral600.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral600.colorset/Contents.json new file mode 100644 index 0000000..f66d5ab --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral600.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.278", + "green" : "0.278", + "red" : "0.278" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral700.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral700.colorset/Contents.json new file mode 100644 index 0000000..9e96833 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral700.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.188", + "green" : "0.188", + "red" : "0.188" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral800.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral800.colorset/Contents.json new file mode 100644 index 0000000..3da689c --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral800.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.090", + "green" : "0.090", + "red" : "0.090" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral900.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral900.colorset/Contents.json new file mode 100644 index 0000000..860bdff --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Neutral/Neutral900.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.059", + "green" : "0.059", + "red" : "0.059" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Sources/Color/Color.swift b/Projects/DesignSystem/Sources/Color/Color.swift new file mode 100644 index 0000000..f13e789 --- /dev/null +++ b/Projects/DesignSystem/Sources/Color/Color.swift @@ -0,0 +1,30 @@ +// +// Color.swift +// DesignSystem +// +// Created by 박서연 on 2024/06/05. +// Copyright © 2024 iOS. All rights reserved. +// + +import Foundation +import SwiftUI + +extension Color { + public static let primaryFF6972 = Color(asset: DesignSystemAsset.Assets.primary) + + public static let neutral900 = Color(asset: DesignSystemAsset.Assets.neutral900) + public static let neutral800 = Color(asset: DesignSystemAsset.Assets.neutral800) + public static let neutral700 = Color(asset: DesignSystemAsset.Assets.neutral700) + public static let neutral600 = Color(asset: DesignSystemAsset.Assets.neutral600) + public static let neutral500 = Color(asset: DesignSystemAsset.Assets.neutral500) + public static let neutral400 = Color(asset: DesignSystemAsset.Assets.neutral400) + public static let neutral300 = Color(asset: DesignSystemAsset.Assets.neutral300) + public static let neutral200 = Color(asset: DesignSystemAsset.Assets.neutral200) + public static let neutral100 = Color(asset: DesignSystemAsset.Assets.neutral100) + public static let neutral50 = Color(asset: DesignSystemAsset.Assets.neutral50) + + public static let positive = Color(asset: DesignSystemAsset.Assets.positive) + public static let caution = Color(asset: DesignSystemAsset.Assets.caution) + public static let negative = Color(asset: DesignSystemAsset.Assets.negative) + public static let information = Color(asset: DesignSystemAsset.Assets.information) +} diff --git a/Projects/DesignSystem/Sources/Color/ColorView.swift b/Projects/DesignSystem/Sources/Color/ColorView.swift new file mode 100644 index 0000000..af40d75 --- /dev/null +++ b/Projects/DesignSystem/Sources/Color/ColorView.swift @@ -0,0 +1,20 @@ +// +// ColorView.swift +// DesignSystem +// +// Created by 박서연 on 2024/06/05. +// Copyright © 2024 iOS. All rights reserved. +// + +import SwiftUI + +struct ColorView: View { + var body: some View { + Text("test") + .foregroundStyle(Color.information) + } +} + +#Preview { + ColorView() +} diff --git a/Projects/DesignSystem/Sources/Font.swift b/Projects/DesignSystem/Sources/Font/Font.swift similarity index 89% rename from Projects/DesignSystem/Sources/Font.swift rename to Projects/DesignSystem/Sources/Font/Font.swift index a8d033a..c486037 100644 --- a/Projects/DesignSystem/Sources/Font.swift +++ b/Projects/DesignSystem/Sources/Font/Font.swift @@ -15,7 +15,8 @@ public enum ZSFont { case subtitle2 case body1 case body2 - case label + case label1 + case label2 case caption } @@ -35,7 +36,9 @@ extension ZSFont { return DesignSystemFontFamily.Pretendard.medium.name case .body2: return DesignSystemFontFamily.Pretendard.medium.name - case .label: + case .label1: + return DesignSystemFontFamily.Pretendard.medium.name + case .label2: return DesignSystemFontFamily.Pretendard.medium.name case .caption: return DesignSystemFontFamily.Pretendard.medium.name @@ -56,8 +59,10 @@ extension ZSFont { return 15 case .body2: return 14 - case .label: + case .label1: return 13 + case .label2: + return 11 case .caption: return 13 } @@ -77,8 +82,10 @@ extension ZSFont { return CGFloat(ZSFont.body1.size * 0.140) case .body2: return CGFloat(ZSFont.body2.size * 0.140) - case .label: - return CGFloat(ZSFont.label.size * 0.140) + case .label1: + return CGFloat(ZSFont.label1.size * 0.140) + case .label2: + return CGFloat(ZSFont.label2.size * 0.140) case .caption: return CGFloat(ZSFont.caption.size * 0.140) } @@ -98,7 +105,9 @@ extension ZSFont { return 0 case .body2: return 0 - case .label: + case .label1: + return 0 + case .label2: return 0 case .caption: return 0 diff --git a/Projects/DesignSystem/Sources/FontView.swift b/Projects/DesignSystem/Sources/Font/FontView.swift similarity index 100% rename from Projects/DesignSystem/Sources/FontView.swift rename to Projects/DesignSystem/Sources/Font/FontView.swift From 99ab7e2f2a332437d96f53866033605d32196c61 Mon Sep 17 00:00:00 2001 From: Park Seo Yeon Date: Tue, 18 Jun 2024 15:16:00 +0900 Subject: [PATCH 2/4] :bento: [Design] Add Tabbar Assests --- Projects/DesignSystem/Project.swift | 2 +- .../Assets.xcassets/Common/Contents.json | 6 +++++ .../progress_gray.imageset/Contents.json | 12 ++++++++++ .../progress_gray.imageset/progress_gray.svg | 8 +++++++ .../Assets.xcassets/Tabbar/Contents.json | 6 +++++ .../ic_category_empty.imageset/Contents.json | 12 ++++++++++ .../ic_category_empty.svg | 5 ++++ .../ic_category_fill.imageset/Contents.json | 12 ++++++++++ .../ic_category_fill.svg | 5 ++++ .../ic_home_empty.imageset/Contents.json | 12 ++++++++++ .../ic_home_empty.imageset/ic_home_empty.svg | 4 ++++ .../ic_home_fill.imageset/Contents.json | 12 ++++++++++ .../ic_home_fill.imageset/ic_home_fill.svg | 4 ++++ .../ic_mypage_empty.imageset/Contents.json | 12 ++++++++++ .../ic_mypage_empty.svg | 4 ++++ .../ic_mypage_fill.imageset/Contents.json | 12 ++++++++++ .../ic_mypage_fill.svg | 4 ++++ .../Sources/Assets/AssestsTestView.swift | 23 +++++++++++++++++++ .../Assets/Common/Common+Assests.swift | 13 +++++++++++ .../Sources/Assets/Tab/Tabbar.swift | 18 +++++++++++++++ 20 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Common/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Common/progress_gray.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Common/progress_gray.imageset/progress_gray.svg create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_empty.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_empty.imageset/ic_category_empty.svg create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_fill.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_fill.imageset/ic_category_fill.svg create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_empty.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_empty.imageset/ic_home_empty.svg create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_fill.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_fill.imageset/ic_home_fill.svg create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_empty.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_empty.imageset/ic_mypage_empty.svg create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_fill.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_fill.imageset/ic_mypage_fill.svg create mode 100644 Projects/DesignSystem/Sources/Assets/AssestsTestView.swift create mode 100644 Projects/DesignSystem/Sources/Assets/Common/Common+Assests.swift create mode 100644 Projects/DesignSystem/Sources/Assets/Tab/Tabbar.swift diff --git a/Projects/DesignSystem/Project.swift b/Projects/DesignSystem/Project.swift index f5b4e29..39d2419 100644 --- a/Projects/DesignSystem/Project.swift +++ b/Projects/DesignSystem/Project.swift @@ -26,5 +26,5 @@ let designSystemTarget = Target.makeTarget( let designSystemProject = Project.makeProject( name: "DesignSystem", targets: designSystemTarget, - isXconfigSet: true) + isXconfigSet: false) diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Common/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Common/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Common/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Common/progress_gray.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Common/progress_gray.imageset/Contents.json new file mode 100644 index 0000000..ba895f0 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Common/progress_gray.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "progress_gray.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Common/progress_gray.imageset/progress_gray.svg b/Projects/DesignSystem/Resources/Assets.xcassets/Common/progress_gray.imageset/progress_gray.svg new file mode 100644 index 0000000..65524ec --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Common/progress_gray.imageset/progress_gray.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_empty.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_empty.imageset/Contents.json new file mode 100644 index 0000000..3197d37 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_empty.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "ic_category_empty.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_empty.imageset/ic_category_empty.svg b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_empty.imageset/ic_category_empty.svg new file mode 100644 index 0000000..93a76e8 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_empty.imageset/ic_category_empty.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_fill.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_fill.imageset/Contents.json new file mode 100644 index 0000000..5619351 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_fill.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "ic_category_fill.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_fill.imageset/ic_category_fill.svg b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_fill.imageset/ic_category_fill.svg new file mode 100644 index 0000000..334379d --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_category_fill.imageset/ic_category_fill.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_empty.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_empty.imageset/Contents.json new file mode 100644 index 0000000..79e0aff --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_empty.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "ic_home_empty.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_empty.imageset/ic_home_empty.svg b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_empty.imageset/ic_home_empty.svg new file mode 100644 index 0000000..6f0a2e8 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_empty.imageset/ic_home_empty.svg @@ -0,0 +1,4 @@ + + + + diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_fill.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_fill.imageset/Contents.json new file mode 100644 index 0000000..cb61b18 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_fill.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "ic_home_fill.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_fill.imageset/ic_home_fill.svg b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_fill.imageset/ic_home_fill.svg new file mode 100644 index 0000000..40154de --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_home_fill.imageset/ic_home_fill.svg @@ -0,0 +1,4 @@ + + + + diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_empty.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_empty.imageset/Contents.json new file mode 100644 index 0000000..60bd379 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_empty.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "ic_mypage_empty.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_empty.imageset/ic_mypage_empty.svg b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_empty.imageset/ic_mypage_empty.svg new file mode 100644 index 0000000..1e10d1f --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_empty.imageset/ic_mypage_empty.svg @@ -0,0 +1,4 @@ + + + + diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_fill.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_fill.imageset/Contents.json new file mode 100644 index 0000000..2cdb440 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_fill.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "ic_mypage_fill.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_fill.imageset/ic_mypage_fill.svg b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_fill.imageset/ic_mypage_fill.svg new file mode 100644 index 0000000..d645d46 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Tabbar/ic_mypage_fill.imageset/ic_mypage_fill.svg @@ -0,0 +1,4 @@ + + + + diff --git a/Projects/DesignSystem/Sources/Assets/AssestsTestView.swift b/Projects/DesignSystem/Sources/Assets/AssestsTestView.swift new file mode 100644 index 0000000..b730383 --- /dev/null +++ b/Projects/DesignSystem/Sources/Assets/AssestsTestView.swift @@ -0,0 +1,23 @@ +// +// AssestsTestView.swift +// DesignSystem +// +// Created by 박서연 on 2024/06/18. +// Copyright © 2024 iOS. All rights reserved. +// + +import SwiftUI + +struct AssestsTestView: View { + var body: some View { + VStack { + ZerosomeTab.ic_home + ZerosomeAsset.zero_progress + } + .background(.green) + } +} + +#Preview { + AssestsTestView() +} diff --git a/Projects/DesignSystem/Sources/Assets/Common/Common+Assests.swift b/Projects/DesignSystem/Sources/Assets/Common/Common+Assests.swift new file mode 100644 index 0000000..0e595fe --- /dev/null +++ b/Projects/DesignSystem/Sources/Assets/Common/Common+Assests.swift @@ -0,0 +1,13 @@ +// +// Common+Assests.swift +// DesignSystem +// +// Created by 박서연 on 2024/06/18. +// Copyright © 2024 iOS. All rights reserved. +// + +import SwiftUI + +public struct ZerosomeAsset { + public static let zero_progress = DesignSystemAsset.Assets.progressGray.swiftUIImage +} diff --git a/Projects/DesignSystem/Sources/Assets/Tab/Tabbar.swift b/Projects/DesignSystem/Sources/Assets/Tab/Tabbar.swift new file mode 100644 index 0000000..23f02ba --- /dev/null +++ b/Projects/DesignSystem/Sources/Assets/Tab/Tabbar.swift @@ -0,0 +1,18 @@ +// +// Tabbar.swift +// DesignSystem +// +// Created by 박서연 on 2024/06/18. +// Copyright © 2024 iOS. All rights reserved. +// + +import SwiftUI + +public enum ZerosomeTab { + public static let ic_home = DesignSystemAsset.Assets.icHomeEmpty.swiftUIImage + public static let ic_home_fill = DesignSystemAsset.Assets.icHomeFill.swiftUIImage + public static let ic_category = DesignSystemAsset.Assets.icCategoryEmpty.swiftUIImage + public static let ic_category_fill = DesignSystemAsset.Assets.icCategoryFill.swiftUIImage + public static let ic_mypage = DesignSystemAsset.Assets.icMypageEmpty.swiftUIImage + public static let ic_mpyage_fi = DesignSystemAsset.Assets.icMypageFill.swiftUIImage +} From e0a195ac87086f5042d7372cd735f1ed75e6f9dd Mon Sep 17 00:00:00 2001 From: Park Seo Yeon Date: Tue, 18 Jun 2024 15:22:02 +0900 Subject: [PATCH 3/4] :bento: Add Font --- .../Color/Info/Negative.colorset/Contents.json | 6 +++--- Projects/DesignSystem/Sources/Font/Font.swift | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Negative.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Negative.colorset/Contents.json index 63d0ff8..6825ed4 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Negative.colorset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Color/Info/Negative.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0.251", - "green" : "0.251", - "red" : "1.000" + "blue" : "0.149", + "green" : "0.192", + "red" : "0.984" } }, "idiom" : "universal" diff --git a/Projects/DesignSystem/Sources/Font/Font.swift b/Projects/DesignSystem/Sources/Font/Font.swift index c486037..f9eb902 100644 --- a/Projects/DesignSystem/Sources/Font/Font.swift +++ b/Projects/DesignSystem/Sources/Font/Font.swift @@ -15,6 +15,8 @@ public enum ZSFont { case subtitle2 case body1 case body2 + case body3 + case body4 case label1 case label2 case caption @@ -36,6 +38,10 @@ extension ZSFont { return DesignSystemFontFamily.Pretendard.medium.name case .body2: return DesignSystemFontFamily.Pretendard.medium.name + case .body3: + return DesignSystemFontFamily.Pretendard.medium.name + case .body4: + return DesignSystemFontFamily.Pretendard.medium.name case .label1: return DesignSystemFontFamily.Pretendard.medium.name case .label2: @@ -59,6 +65,10 @@ extension ZSFont { return 15 case .body2: return 14 + case .body3: + return 13 + case .body4: + return 12 case .label1: return 13 case .label2: @@ -82,6 +92,10 @@ extension ZSFont { return CGFloat(ZSFont.body1.size * 0.140) case .body2: return CGFloat(ZSFont.body2.size * 0.140) + case .body3: + return CGFloat(ZSFont.body2.size * 0.140) + case .body4: + return CGFloat(ZSFont.body2.size * 0.140) case .label1: return CGFloat(ZSFont.label1.size * 0.140) case .label2: @@ -105,6 +119,10 @@ extension ZSFont { return 0 case .body2: return 0 + case .body3: + return 0 + case .body4: + return 0 case .label1: return 0 case .label2: From 92e499e5dd2447c0b55dfaa901fdd8f71bfeaf69 Mon Sep 17 00:00:00 2001 From: Park Seo Yeon Date: Tue, 18 Jun 2024 15:28:04 +0900 Subject: [PATCH 4/4] :adhesive_bandage: [Fix] fix merge error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - conflict 수정하면서 발생한 merge error 수정 --- Projects/DesignSystem/Sources/Font/Font.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Projects/DesignSystem/Sources/Font/Font.swift b/Projects/DesignSystem/Sources/Font/Font.swift index 50d7972..bcf460e 100644 --- a/Projects/DesignSystem/Sources/Font/Font.swift +++ b/Projects/DesignSystem/Sources/Font/Font.swift @@ -130,6 +130,10 @@ extension ZSFont { return 0 } } + + public var toUIFont: UIFont { + return UIFont(name: self.name, size: self.size) ?? UIFont.systemFont(ofSize: self.size) + } } public struct FontModifier: ViewModifier {