-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/Onboarding/10
- Loading branch information
Showing
63 changed files
with
221 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
27 changes: 27 additions & 0 deletions
27
PyeonHaeng-iOS/Resources/Assets.xcassets/AccentColor.colorset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| .DS_Store | ||
| /.build | ||
| /Packages | ||
| xcuserdata/ | ||
| DerivedData/ | ||
| .swiftpm/configuration/registries.json | ||
| .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata | ||
| .netrc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| // swift-tools-version: 5.9 | ||
| // The swift-tools-version declares the minimum version of Swift required to build this package. | ||
|
|
||
| import PackageDescription | ||
|
|
||
| let package = Package( | ||
| name: "Shared", | ||
| platforms: [.iOS(.v17)], | ||
| products: [ | ||
| .library( | ||
| name: "DesignSystem", | ||
| targets: ["DesignSystem"] | ||
| ), | ||
| ], | ||
| targets: [ | ||
| .target( | ||
| name: "DesignSystem", | ||
| resources: [.process("Resources")] | ||
| ), | ||
| ] | ||
| ) |
38 changes: 38 additions & 0 deletions
38
Shared/Sources/DesignSystem/Resources/Assets.xcassets/Blur.colorset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| { | ||
| "colors" : [ | ||
| { | ||
| "color" : { | ||
| "color-space" : "srgb", | ||
| "components" : { | ||
| "alpha" : "0.900", | ||
| "blue" : "0xFF", | ||
| "green" : "0xFF", | ||
| "red" : "0xFF" | ||
| } | ||
| }, | ||
| "idiom" : "universal" | ||
| }, | ||
| { | ||
| "appearances" : [ | ||
| { | ||
| "appearance" : "luminosity", | ||
| "value" : "dark" | ||
| } | ||
| ], | ||
| "color" : { | ||
| "color-space" : "srgb", | ||
| "components" : { | ||
| "alpha" : "0.900", | ||
| "blue" : "0x12", | ||
| "green" : "0x12", | ||
| "red" : "0x12" | ||
| } | ||
| }, | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
Shared/Sources/DesignSystem/Resources/Assets.xcassets/System/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+1.56 MB
Shared/Sources/DesignSystem/Resources/Fonts/Pretendard-ExtraLight.otf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // | ||
| // Color+Resource.swift | ||
| // | ||
| // | ||
| // Created by 홍승현 on 1/27/24. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| public extension Color { | ||
| static let gray050: Color = .init(.gray050) | ||
| static let gray100: Color = .init(.gray100) | ||
| static let gray200: Color = .init(.gray200) | ||
| static let gray300: Color = .init(.gray300) | ||
| static let gray400: Color = .init(.gray400) | ||
| static let gray500: Color = .init(.gray500) | ||
| static let gray600: Color = .init(.gray600) | ||
| static let gray700: Color = .init(.gray700) | ||
| static let gray800: Color = .init(.gray800) | ||
| static let gray900: Color = .init(.gray900) | ||
|
|
||
| static let green050: Color = .init(.green050) | ||
| static let green100: Color = .init(.green100) | ||
| static let green200: Color = .init(.green200) | ||
| static let green300: Color = .init(.green300) | ||
| static let green400: Color = .init(.green400) | ||
| static let green500: Color = .init(.green500) | ||
| static let green600: Color = .init(.green600) | ||
| static let green700: Color = .init(.green700) | ||
| static let green800: Color = .init(.green800) | ||
| static let green900: Color = .init(.green900) | ||
|
|
||
| static let pyeonHaengBlue: Color = .init(.pyeonHaengBlue) | ||
| static let pyeonHaengGreen: Color = .init(.pyeonHaengGreen) | ||
| static let pyeonHaengRed: Color = .init(.pyeonHaengRed) | ||
| static let pyeonHaengYellow: Color = .init(.pyeonHaengYellow) | ||
|
|
||
| static let blur: Color = .init(.blur) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // | ||
| // Fonts.swift | ||
| // | ||
| // | ||
| // Created by 홍승현 on 1/26/24. | ||
| // | ||
|
|
||
| import CoreText | ||
| import Foundation | ||
|
|
||
| // MARK: - Fonts | ||
|
|
||
| /// `Fonts` 열거형은 커스텀 폰트를 등록하는 데 사용됩니다. | ||
| public enum Fonts { | ||
| /// 이 메서드는 `Pretendard`와 `DolDam` 폰트를 등록합니다. | ||
| /// 각각의 폰트 이름을 순회하면서 `registerFont` 메서드를 호출하여 폰트를 등록합니다. | ||
| public static func registerFonts() { | ||
| // Pretendard 폰트 등록 | ||
| for fontName in Pretendard.allCases.map(\.rawValue) { | ||
| registerFont(bundle: .module, fontName: fontName, fontExtension: "otf") | ||
| } | ||
|
|
||
| // DolDam 폰트 등록 | ||
| for fontName in DolDam.allCases.map(\.rawValue) { | ||
| registerFont(bundle: .module, fontName: fontName, fontExtension: "otf") | ||
| } | ||
| } | ||
|
|
||
| /// 주어진 폰트 이름과 확장자를 사용하여 폰트를 동적으로 등록합니다. | ||
| /// - Parameters: | ||
| /// - bundle: 폰트 파일을 포함하고 있는 번들. | ||
| /// - fontName: 등록할 폰트의 이름. | ||
| /// - fontExtension: 폰트 파일의 확장자. | ||
| private static func registerFont(bundle: Bundle, fontName: String, fontExtension: String) { | ||
| guard let fontURL = bundle.url(forResource: fontName, withExtension: fontExtension), | ||
| let fontDataDriver = CGDataProvider(url: fontURL as CFURL), | ||
| let font = CGFont(fontDataDriver) | ||
| else { | ||
| return // 폰트 로딩에 실패할 경우 함수를 종료합니다. | ||
| } | ||
| // CoreText를 사용하여 폰트를 시스템에 등록합니다. | ||
| CTFontManagerRegisterGraphicsFont(font, nil) | ||
| } | ||
| } |
Oops, something went wrong.