diff --git a/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Blue300.colorset/Contents.json b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Blue300.colorset/Contents.json index e6b32a4..052be64 100644 --- a/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Blue300.colorset/Contents.json +++ b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Blue300.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "255", - "green" : "140", - "red" : "64" + "blue" : "247", + "green" : "155", + "red" : "94" } }, "idiom" : "universal" diff --git a/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/LightBlue.colorset/Contents.json b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Blue50.colorset/Contents.json similarity index 100% rename from Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/LightBlue.colorset/Contents.json rename to Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Blue50.colorset/Contents.json diff --git a/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/DarkBlue.colorset/Contents.json b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Blue500.colorset/Contents.json similarity index 100% rename from Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/DarkBlue.colorset/Contents.json rename to Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Blue500.colorset/Contents.json diff --git a/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Green100.colorset/Contents.json b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Green100.colorset/Contents.json new file mode 100644 index 0000000..5a52612 --- /dev/null +++ b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Green100.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "165", + "green" : "219", + "red" : "223" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/LightGreen.colorset/Contents.json b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Green50.colorset/Contents.json similarity index 100% rename from Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/LightGreen.colorset/Contents.json rename to Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Green50.colorset/Contents.json diff --git a/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/DarkGreen.colorset/Contents.json b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Green500.colorset/Contents.json similarity index 100% rename from Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/DarkGreen.colorset/Contents.json rename to Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Green500.colorset/Contents.json diff --git a/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Grey50.colorset/Contents.json b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Grey50.colorset/Contents.json new file mode 100644 index 0000000..5a2dce5 --- /dev/null +++ b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Grey50.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "241", + "green" : "242", + "red" : "242" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Pink100.colorset/Contents.json b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Pink100.colorset/Contents.json new file mode 100644 index 0000000..007bf95 --- /dev/null +++ b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Pink100.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "196", + "green" : "177", + "red" : "230" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/LightPink.colorset/Contents.json b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Pink50.colorset/Contents.json similarity index 100% rename from Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/LightPink.colorset/Contents.json rename to Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Pink50.colorset/Contents.json diff --git a/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/DarkPink.colorset/Contents.json b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Pink500.colorset/Contents.json similarity index 100% rename from Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/DarkPink.colorset/Contents.json rename to Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Pink500.colorset/Contents.json diff --git a/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Yellow100.colorset/Contents.json b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Yellow100.colorset/Contents.json new file mode 100644 index 0000000..5a52612 --- /dev/null +++ b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Yellow100.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "165", + "green" : "219", + "red" : "223" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/LightYellow.colorset/Contents.json b/Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Yellow50.colorset/Contents.json similarity index 100% rename from Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/LightYellow.colorset/Contents.json rename to Projects/DesignSystem/DesignCore/Resources/Colors/Colors.xcassets/Yellow50.colorset/Contents.json diff --git a/Projects/DesignSystem/DesignCore/Sources/BackgroundTextureView.swift b/Projects/DesignSystem/DesignCore/Sources/BackgroundTextureView.swift index d706dc2..33ba3f9 100644 --- a/Projects/DesignSystem/DesignCore/Sources/BackgroundTextureView.swift +++ b/Projects/DesignSystem/DesignCore/Sources/BackgroundTextureView.swift @@ -12,7 +12,7 @@ public struct BackgroundTextureView: View { public init() {} public var body: some View { - DesignCore.Images.backgroundDefault.image! + DesignCore.Images.backgroundDefault.image .resizable() .frame( width: Device.width, @@ -27,7 +27,7 @@ fileprivate struct BackgroundTextureViewModifier: ViewModifier { fileprivate func body(content: Content) -> some View { content .background { - DesignCore.Images.backgroundDefault.image! + DesignCore.Images.backgroundDefault.image .resizable() .frame( width: Device.width, diff --git a/Projects/DesignSystem/DesignCore/Sources/CTAButton/CTABottomButton.swift b/Projects/DesignSystem/DesignCore/Sources/CTAButton/CTABottomButton.swift index 3832c48..9a69e37 100644 --- a/Projects/DesignSystem/DesignCore/Sources/CTAButton/CTABottomButton.swift +++ b/Projects/DesignSystem/DesignCore/Sources/CTAButton/CTABottomButton.swift @@ -52,7 +52,7 @@ public struct CTABottomButton: View { ) Text(title) .foregroundStyle(titleColor) - .typography(.medium_18) + .typography(.semibold_18) } Rectangle() .foregroundStyle(buttonBackgroundColor) diff --git a/Projects/DesignSystem/DesignCore/Sources/CTAButton/CTAButton.swift b/Projects/DesignSystem/DesignCore/Sources/CTAButton/CTAButton.swift index 19957b5..a7a2e0a 100644 --- a/Projects/DesignSystem/DesignCore/Sources/CTAButton/CTAButton.swift +++ b/Projects/DesignSystem/DesignCore/Sources/CTAButton/CTAButton.swift @@ -45,7 +45,7 @@ public struct CTAButton: View { .clipShape(RoundedRectangle(cornerRadius: 20)) Text(title) .foregroundStyle(titleColor) - .typography(.medium_18) + .typography(.semibold_18) } } }) diff --git a/Projects/DesignSystem/DesignCore/Sources/Toast/ToastView.swift b/Projects/DesignSystem/DesignCore/Sources/Toast/ToastView.swift index 42c93fe..4ce0045 100644 --- a/Projects/DesignSystem/DesignCore/Sources/Toast/ToastView.swift +++ b/Projects/DesignSystem/DesignCore/Sources/Toast/ToastView.swift @@ -63,7 +63,7 @@ struct Toast: View { .shadow(.alert) HStack(spacing: 6) { - DesignCore.Images.alert.image! + DesignCore.Images.alert.image .resizable() .frame(width: 20, height: 20) Text(message) diff --git a/Projects/DesignSystem/DesignCore/Sources/Typography.swift b/Projects/DesignSystem/DesignCore/Sources/Typography.swift index 27f662c..f9e667e 100644 --- a/Projects/DesignSystem/DesignCore/Sources/Typography.swift +++ b/Projects/DesignSystem/DesignCore/Sources/Typography.swift @@ -17,10 +17,10 @@ public enum Typography: CaseIterable { case semibold_28 case semibold_24 case semibold_20 + case semibold_18 case semibold_14 // Pretendard - medium - case medium_18 case medium_16 case medium_14 @@ -38,8 +38,8 @@ extension Typography { case .semibold_28: return 28 case .semibold_24: return 24 case .semibold_20: return 20 + case .semibold_18: return 18 case .semibold_14: return 14 - case .medium_18: return 18 case .medium_16: return 16 case .medium_14: return 14 case .regular_15: return 15 @@ -63,10 +63,10 @@ extension Typography { case .en_medium_20, .en_medium_16: return nil - case .semibold_28, .semibold_24, .semibold_20, .semibold_14: + case .semibold_28, .semibold_24, .semibold_20, .semibold_18, .semibold_14: return ._600 - case .medium_18, .medium_16, .medium_14: + case .medium_16, .medium_14: return ._500 case .regular_15, .regular_14, .regular_12: diff --git a/Projects/Features/DesignPreview/Sources/DesignButtonView.swift b/Projects/Features/DesignPreview/Sources/DesignButtonView.swift index 5ef0ed9..b7387b1 100644 --- a/Projects/Features/DesignPreview/Sources/DesignButtonView.swift +++ b/Projects/Features/DesignPreview/Sources/DesignButtonView.swift @@ -27,7 +27,7 @@ struct DesignButtonView: View { CTAButton( title: "타이틀", - backgroundStyle: DesignCore.Colors.darkGreen + backgroundStyle: DesignCore.Colors.green500 ) {} .padding(.horizontal, 36) diff --git a/Projects/Features/DesignPreview/Sources/DesignColorPreview.swift b/Projects/Features/DesignPreview/Sources/DesignColorPreview.swift index 1942fba..0006462 100644 --- a/Projects/Features/DesignPreview/Sources/DesignColorPreview.swift +++ b/Projects/Features/DesignPreview/Sources/DesignColorPreview.swift @@ -25,20 +25,26 @@ struct DesignColorPreview: View { DesignCore.Colors.blue300 ] + let lightColors = [ + DesignCore.Colors.green500, + DesignCore.Colors.pink500, + DesignCore.Colors.blue500, + DesignCore.Colors.green100, + DesignCore.Colors.pink100 + ] + let pastelColors = [ - DesignCore.Colors.darkGreen, - DesignCore.Colors.darkPink, - DesignCore.Colors.darkBlue, - DesignCore.Colors.lightYellow, - DesignCore.Colors.lightGreen, - DesignCore.Colors.lightPink, - DesignCore.Colors.lightBlue, + DesignCore.Colors.yellow50, + DesignCore.Colors.green50, + DesignCore.Colors.pink50, + DesignCore.Colors.blue50, ] var colorGroups: [[Color]] { return [ blackColors, tintColors, + lightColors, pastelColors ] } diff --git a/Projects/Features/DesignPreview/Sources/DesignTextInputPreview.swift b/Projects/Features/DesignPreview/Sources/DesignTextInputPreview.swift index 6ee8282..f073760 100644 --- a/Projects/Features/DesignPreview/Sources/DesignTextInputPreview.swift +++ b/Projects/Features/DesignPreview/Sources/DesignTextInputPreview.swift @@ -20,7 +20,7 @@ struct DesignTextInputPreview: View { var phoneRightIcon: TextInputRightIconModel? { if isPhoneValidated { return .init( - icon: DesignCore.Images.checkBold.image!, + icon: DesignCore.Images.checkBold.image, backgroundColor: Color(hex: 0x2DE76B) ) } @@ -36,7 +36,7 @@ struct DesignTextInputPreview: View { backgroundColor: .white, text: $companyTextInput, rightIcon: .init( - icon: DesignCore.Images.checkBold.image!, + icon: DesignCore.Images.checkBold.image, backgroundColor: Color(hex: 0x2DE76B) ) ) @@ -46,7 +46,7 @@ struct DesignTextInputPreview: View { backgroundColor: .white, text: $naverTextInput, rightIcon: .init( - icon: DesignCore.Images.search.image!, + icon: DesignCore.Images.search.image, backgroundColor: DesignCore.Colors.grey100 ) ) @@ -58,7 +58,7 @@ struct DesignTextInputPreview: View { keyboardType: .phonePad, leftView: { HStack(spacing: 6) { - DesignCore.Images.flagKorea.image! + DesignCore.Images.flagKorea.image Text("+82") .foregroundStyle(DesignCore.Colors.grey200) .typography(.medium_16) diff --git a/Projects/Features/DesignPreview/Sources/DesignTypographyPreview.swift b/Projects/Features/DesignPreview/Sources/DesignTypographyPreview.swift index 17f6863..11e577e 100644 --- a/Projects/Features/DesignPreview/Sources/DesignTypographyPreview.swift +++ b/Projects/Features/DesignPreview/Sources/DesignTypographyPreview.swift @@ -36,15 +36,15 @@ struct DesignTypographyPreview: View { .foregroundStyle(DesignCore.Colors.grey200) Text("직업 / medium-14") .typography(.medium_14) - .foregroundStyle(DesignCore.Colors.darkGreen) + .foregroundStyle(DesignCore.Colors.green500) Text("초등학교 교사 / medium-16") .typography(.medium_16) - .foregroundStyle(DesignCore.Colors.darkGreen) + .foregroundStyle(DesignCore.Colors.green500) Text("취미 / semibold-24") .typography(.semibold_24) .foregroundStyle(Color(hex: 0x15394B)) Text("연락한 지 2일차 / medium-18") - .typography(.medium_18) + .typography(.semibold_18) .foregroundStyle(Color(hex: 0x534C44)) Text("3일차까지 10시간 24분 43초 남았어요 / regular-14") .typography(.regular_14) diff --git a/Tuist/ResourceSynthesizers/Assets.stencil b/Tuist/ResourceSynthesizers/Assets.stencil index 1c38b28..757f14b 100755 --- a/Tuist/ResourceSynthesizers/Assets.stencil +++ b/Tuist/ResourceSynthesizers/Assets.stencil @@ -178,9 +178,8 @@ import SwiftUI return image } - {{accessModifier}} var image: SwiftUI.Image? { - guard let uiImage else { return nil } - return SwiftUI.Image(uiImage: uiImage) + {{accessModifier}} var image: SwiftUI.Image { + return SwiftUI.Image(uiImage: uiImage!) } }