From 20d52a3fbfd3db3a91a1d762a6f34313d46bfe6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Junnos=20=EF=A3=BF?= Date: Mon, 19 Feb 2024 22:11:31 +0900 Subject: [PATCH 1/5] =?UTF-8?q?:package:=20MSUIKit=20=E2=9E=A1=EF=B8=8F=20?= =?UTF-8?q?MSFusion=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SwiftUI 사용을 위한 MSUIKit의 이름 변경, commit 실행 파일 MSUIKit 부분 수정 --- iOS/Features/Home/Package.swift | 7 +- iOS/Features/JourneyList/Package.swift | 7 +- iOS/Features/RewindJourney/Package.swift | 7 +- iOS/Features/SaveJourney/Package.swift | 7 +- iOS/Features/SelectSong/Package.swift | 7 +- iOS/Features/Spot/Package.swift | 9 +- .../contents.xcworkspacedata | 0 iOS/{MSUIKit => MSFusion}/Package.swift | 6 +- .../CombineCocoa/UITextField+Combine.swift | 0 .../Sources/MSDesignSystem/MSColor.swift | 0 .../Sources/MSDesignSystem/MSFont.swift | 0 .../Sources/MSDesignSystem/MSIcon.swift | 0 .../Resources/Fonts/Pretendard-Bold.otf | Bin .../Resources/Fonts/Pretendard-Regular.otf | Bin .../Resources/Fonts/Pretendard-SemiBold.otf | Bin .../Background Modal.colorset/Contents.json | 0 .../Background Primary.colorset/Contents.json | 0 .../Contents.json | 0 .../Contents.json | 0 .../Contents.json | 0 .../Contents.json | 0 .../Contents.json | 0 .../Contents.json | 0 .../Component Typo.colorset/Contents.json | 0 .../Resources/MSColor.xcassets/Contents.json | 0 .../MusicSpot.colorset/Contents.json | 0 .../Contents.json | 0 .../TextField Typo.colorset/Contents.json | 0 .../Typo Primary.colorset/Contents.json | 0 .../Typo Secondary.colorset/Contents.json | 0 .../Calendar.imageset/Calendar.pdf | Bin .../Calendar.imageset/Contents.json | 0 .../Check.imageset/Contents.json | 0 .../MSIcon.xcassets/Check.imageset/Tick.pdf | Bin .../MSIcon.xcassets/Close.imageset/Close.pdf | Bin .../Close.imageset/Contents.json | 0 .../Resources/MSIcon.xcassets/Contents.json | 0 .../Down.imageset/Contents.json | 0 .../MSIcon.xcassets/Down.imageset/Down 2.pdf | Bin .../Image.imageset/Contents.json | 0 .../Image.imageset/Image 2.pdf | Bin .../Left.imageset/Contents.json | 0 .../MSIcon.xcassets/Left.imageset/Left 2.pdf | Bin .../Location Add.imageset/Contents.json | 0 .../Location Add.imageset/Location Add.pdf | Bin .../Location.imageset/Contents.json | 0 .../Location.imageset/Location.pdf | Bin .../Lock.imageset/Contents.json | 0 .../MSIcon.xcassets/Lock.imageset/Lock 2.pdf | Bin .../Map.imageset/Contents.json | 0 .../MSIcon.xcassets/Map.imageset/Map.pdf | Bin .../Message.imageset/Contents.json | 0 .../Message.imageset/Message 15.pdf | Bin .../Pause.imageset/Contents.json | 0 .../MSIcon.xcassets/Pause.imageset/Pause.pdf | Bin .../Play.imageset/Contents.json | 0 .../MSIcon.xcassets/Play.imageset/Play.pdf | Bin .../Right.imageset/Contents.json | 0 .../Right.imageset/Right 2.pdf | Bin .../Setting.imageset/Contents.json | 0 .../Setting.imageset/Setting.pdf | Bin .../MSIcon.xcassets/Up.imageset/Contents.json | 0 .../MSIcon.xcassets/Up.imageset/Up 3.pdf | Bin .../User Tag.imageset/Contents.json | 0 .../User Tag.imageset/User Tag 2.pdf | Bin .../Voice.imageset/Contents.json | 0 .../MSIcon.xcassets/Voice.imageset/Voice.pdf | Bin .../Volume High.imageset/Contents.json | 0 .../Volume High.imageset/Volume High.pdf | Bin .../Volume Off.imageset/Contents.json | 0 .../Volume Off.imageset/Volume Off.pdf | Bin .../Sources/MSSwiftUI/placeholder.swift | 8 + .../Sources/MSUIKit/BaseViewController.swift | 0 .../Sources/MSUIKit/Cells/EmptyCell.swift | 0 .../Cells/JourneyCell/JourneyCell.swift | 0 .../Cells/JourneyCell/JourneyCellModel.swift | 0 .../Cells/JourneyCell/JourneyInfoView.swift | 0 .../Cells/JourneyCell/MusicInfoView.swift | 0 .../JourneyCell/SpotPhotoImageView.swift | 0 .../Cells/SongListCell/SongListCell.swift | 0 .../SongListCell/SongListCellModel.swift | 0 .../Extension/NSCollectionLayoutGroup+.swift | 0 .../MSUIKit/Extension/UIColor+HEX.swift | 0 .../MSUIKit/MSAlertViewController.swift | 0 .../BottomSheetConfiguration.swift | 0 .../MSBottomSheetViewController.swift | 0 .../MSUIKit/MSButton/MSButton+Primary.swift | 0 .../MSUIKit/MSButton/MSButton+Secondary.swift | 0 .../Sources/MSUIKit/MSButton/MSButton.swift | 0 .../MSUIKit/MSButton/MSRectButton+Large.swift | 0 .../MSUIKit/MSButton/MSRectButton+Small.swift | 0 .../MSUIKit/MSButton/MSRectButton.swift | 0 .../Sources/MSUIKit/MSGradientLayer.swift | 0 .../MSImageFetcher+UIImageView.swift | 0 .../Sources/MSUIKit/MSMusicPlayerView.swift | 0 .../MSUIKit/MSTextField/MSTextField.swift | 0 .../Sources/MSUIKit/Spacer.swift | 0 .../contents.xcworkspacedata | 4 +- .../MusicSpot.xcodeproj/project.pbxproj | 154 ++++++------------ iOS/commit | 4 +- 100 files changed, 91 insertions(+), 129 deletions(-) rename iOS/{MSUIKit => MSFusion}/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata (100%) rename iOS/{MSUIKit => MSFusion}/Package.swift (90%) rename iOS/{MSUIKit => MSFusion}/Sources/CombineCocoa/UITextField+Combine.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/MSColor.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/MSFont.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/MSIcon.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/Fonts/Pretendard-Bold.otf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/Fonts/Pretendard-Regular.otf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/Fonts/Pretendard-SemiBold.otf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Modal.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Primary.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Secondary.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Background Primary.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Background Secondary.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Typo Primary.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Typo Secondary.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/Component Background.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/Component Typo.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/MusicSpot.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/TextField Background.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/TextField Typo.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/Typo Primary.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSColor.xcassets/Typo Secondary.colorset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Calendar.imageset/Calendar.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Calendar.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Check.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Check.imageset/Tick.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Close.imageset/Close.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Close.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Down.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Down.imageset/Down 2.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Image.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Image.imageset/Image 2.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Left.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Left.imageset/Left 2.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location Add.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location Add.imageset/Location Add.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location.imageset/Location.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Lock.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Lock.imageset/Lock 2.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Map.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Map.imageset/Map.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Message.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Message.imageset/Message 15.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Pause.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Pause.imageset/Pause.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Play.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Play.imageset/Play.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Right.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Right.imageset/Right 2.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Setting.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Setting.imageset/Setting.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Up.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Up.imageset/Up 3.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/User Tag.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/User Tag.imageset/User Tag 2.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Voice.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Voice.imageset/Voice.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume High.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume High.imageset/Volume High.pdf (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume Off.imageset/Contents.json (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume Off.imageset/Volume Off.pdf (100%) create mode 100644 iOS/MSFusion/Sources/MSSwiftUI/placeholder.swift rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/BaseViewController.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/Cells/EmptyCell.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/Cells/JourneyCell/JourneyCell.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/Cells/JourneyCell/JourneyCellModel.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/Cells/JourneyCell/JourneyInfoView.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/Cells/JourneyCell/MusicInfoView.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/Cells/JourneyCell/SpotPhotoImageView.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/Cells/SongListCell/SongListCell.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/Cells/SongListCell/SongListCellModel.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/Extension/NSCollectionLayoutGroup+.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/Extension/UIColor+HEX.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/MSAlertViewController.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/MSBottomSheetViewController/BottomSheetConfiguration.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/MSBottomSheetViewController/MSBottomSheetViewController.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/MSButton/MSButton+Primary.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/MSButton/MSButton+Secondary.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/MSButton/MSButton.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/MSButton/MSRectButton+Large.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/MSButton/MSRectButton+Small.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/MSButton/MSRectButton.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/MSGradientLayer.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/MSImageFetcher/MSImageFetcher+UIImageView.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/MSMusicPlayerView.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/MSTextField/MSTextField.swift (100%) rename iOS/{MSUIKit => MSFusion}/Sources/MSUIKit/Spacer.swift (100%) diff --git a/iOS/Features/Home/Package.swift b/iOS/Features/Home/Package.swift index 8275bc7..939e974 100644 --- a/iOS/Features/Home/Package.swift +++ b/iOS/Features/Home/Package.swift @@ -32,6 +32,7 @@ private enum Dependency { static let msDomain = "MSDomain" static let msData = "MSData" static let msUIKit = "MSUIKit" + static let msFusion = "MSFusion" static let msUserDefaults = "MSUserDefaults" static let msLogger = "MSLogger" static let msFoundation = "MSFoundation" @@ -58,8 +59,8 @@ let package = Package( path: Dependency.msDomain.fromRootPath), .package(name: Dependency.msData, path: Dependency.msData.fromRootPath), - .package(name: Dependency.msUIKit, - path: Dependency.msUIKit.fromRootPath), + .package(name: Dependency.msFusion, + path: Dependency.msFusion.fromRootPath), .package(name: Dependency.msFoundation, path: Dependency.msFoundation.fromRootPath) ], @@ -85,7 +86,7 @@ let package = Package( .product(name: Dependency.msData, package: Dependency.msData), .product(name: Dependency.msUIKit, - package: Dependency.msUIKit), + package: Dependency.msFusion), .product(name: Dependency.msUserDefaults, package: Dependency.msFoundation), .product(name: Dependency.msLogger, diff --git a/iOS/Features/JourneyList/Package.swift b/iOS/Features/JourneyList/Package.swift index 63c7311..d021a9d 100644 --- a/iOS/Features/JourneyList/Package.swift +++ b/iOS/Features/JourneyList/Package.swift @@ -26,6 +26,7 @@ private enum Dependency { static let msData = "MSData" static let msUIKit = "MSUIKit" + static let msFusion = "MSFusion" static let msLogger = "MSLogger" static let msFoundation = "MSFoundation" @@ -46,8 +47,8 @@ let package = Package( dependencies: [ .package(name: Dependency.msData, path: Dependency.msData.fromRootPath), - .package(name: Dependency.msUIKit, - path: Dependency.msUIKit.fromRootPath), + .package(name: Dependency.msFusion, + path: Dependency.msFusion.fromRootPath), .package(name: Dependency.msFoundation, path: Dependency.msFoundation.fromRootPath) ], @@ -55,7 +56,7 @@ let package = Package( .target(name: Target.journeyList, dependencies: [ .product(name: Dependency.msUIKit, - package: Dependency.msUIKit), + package: Dependency.msFusion), .product(name: Dependency.msData, package: Dependency.msData), .product(name: Dependency.msLogger, diff --git a/iOS/Features/RewindJourney/Package.swift b/iOS/Features/RewindJourney/Package.swift index 4441dc9..3d36390 100644 --- a/iOS/Features/RewindJourney/Package.swift +++ b/iOS/Features/RewindJourney/Package.swift @@ -33,6 +33,7 @@ private enum Dependency { static let combineCocoa = "CombineCocoa" static let msDesignsystem = "MSDesignSystem" static let msUIKit = "MSUIKit" + static let msFusion = "MSFusion" static let msExtension = "MSExtension" static let msLogger = "MSLogger" @@ -56,8 +57,8 @@ let package = Package( path: Dependency.msDomain.fromRootPath), .package(name: Dependency.msData, path: Dependency.msData.fromRootPath), - .package(name: Dependency.msUIKit, - path: Dependency.msUIKit.fromRootPath), + .package(name: Dependency.msFusion, + path: Dependency.msFusion.fromRootPath), .package(name: Dependency.msFoundation, path: Dependency.msFoundation.fromRootPath) ], @@ -69,7 +70,7 @@ let package = Package( .product(name: Dependency.msData, package: Dependency.msData), .product(name: Dependency.msUIKit, - package: Dependency.msUIKit), + package: Dependency.msFusion), .product(name: Dependency.msLogger, package: Dependency.msFoundation), .product(name: Dependency.msExtension, diff --git a/iOS/Features/SaveJourney/Package.swift b/iOS/Features/SaveJourney/Package.swift index 2592d97..53b3555 100644 --- a/iOS/Features/SaveJourney/Package.swift +++ b/iOS/Features/SaveJourney/Package.swift @@ -31,6 +31,7 @@ private enum Dependency { static let msData = "MSData" static let msUIKit = "MSUIKit" + static let msFusion = "MSFusion" static let msExtension = "MSExtension" static let msLogger = "MSLogger" @@ -54,8 +55,8 @@ let package = Package( path: Dependency.msDomain.fromRootPath), .package(name: Dependency.msData, path: Dependency.msData.fromRootPath), - .package(name: Dependency.msUIKit, - path: Dependency.msUIKit.fromRootPath), + .package(name: Dependency.msFusion, + path: Dependency.msFusion.fromRootPath), .package(name: Dependency.msFoundation, path: Dependency.msFoundation.fromRootPath) ], @@ -67,7 +68,7 @@ let package = Package( .product(name: Dependency.msData, package: Dependency.msData), .product(name: Dependency.msUIKit, - package: Dependency.msUIKit), + package: Dependency.msFusion), .product(name: Dependency.msExtension, package: Dependency.msFoundation), .product(name: Dependency.msLogger, diff --git a/iOS/Features/SelectSong/Package.swift b/iOS/Features/SelectSong/Package.swift index cc2f6cb..c7c0c85 100644 --- a/iOS/Features/SelectSong/Package.swift +++ b/iOS/Features/SelectSong/Package.swift @@ -33,6 +33,7 @@ private enum Dependency { static let combineCocoa = "CombineCocoa" static let msDesignsystem = "MSDesignSystem" static let msUIKit = "MSUIKit" + static let msFusion = "MSFusion" static let msLogger = "MSLogger" static let msFoundation = "MSFoundation" @@ -55,8 +56,8 @@ let package = Package( path: Dependency.msDomain.fromRootPath), .package(name: Dependency.msData, path: Dependency.msData.fromRootPath), - .package(name: Dependency.msUIKit, - path: Dependency.msUIKit.fromRootPath), + .package(name: Dependency.msFusion, + path: Dependency.msFusion.fromRootPath), .package(name: Dependency.msFoundation, path: Dependency.msFoundation.fromRootPath) ], @@ -68,7 +69,7 @@ let package = Package( .product(name: Dependency.msData, package: Dependency.msData), .product(name: Dependency.msUIKit, - package: Dependency.msUIKit), + package: Dependency.msFusion), .product(name: Dependency.msLogger, package: Dependency.msFoundation) ]) diff --git a/iOS/Features/Spot/Package.swift b/iOS/Features/Spot/Package.swift index eddc5f5..131ed57 100644 --- a/iOS/Features/Spot/Package.swift +++ b/iOS/Features/Spot/Package.swift @@ -30,11 +30,12 @@ private enum Dependency { // package static let msData = "MSData" static let msDomain = "MSDomain" - static let msUIKit = "MSUIKit" + static let msFusion = "MSFusion" static let msFoundation = "MSFoundation" // library static let msLogger = "MSLogger" + static let msUIKit = "MSUIKit" } @@ -54,8 +55,8 @@ let package = Package( path: Dependency.msDomain.fromRootPath), .package(name: Dependency.msData, path: Dependency.msData.fromRootPath), - .package(name: Dependency.msUIKit, - path: Dependency.msUIKit.fromRootPath), + .package(name: Dependency.msFusion, + path: Dependency.msFusion.fromRootPath), .package(name: Dependency.msFoundation, path: Dependency.msFoundation.fromRootPath) ], @@ -67,7 +68,7 @@ let package = Package( .product(name: Dependency.msData, package: Dependency.msData), .product(name: Dependency.msUIKit, - package: Dependency.msUIKit), + package: Dependency.msFusion), .product(name: Dependency.msLogger, package: Dependency.msFoundation) ]) diff --git a/iOS/MSUIKit/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/iOS/MSFusion/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata similarity index 100% rename from iOS/MSUIKit/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata rename to iOS/MSFusion/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata diff --git a/iOS/MSUIKit/Package.swift b/iOS/MSFusion/Package.swift similarity index 90% rename from iOS/MSUIKit/Package.swift rename to iOS/MSFusion/Package.swift index 2d9e5d1..1adc1f1 100644 --- a/iOS/MSUIKit/Package.swift +++ b/iOS/MSFusion/Package.swift @@ -7,7 +7,7 @@ import PackageDescription extension String { - static let package = "MSUIKit" + static let package = "MSFusion" var fromRootPath: String { return "../" + self @@ -18,6 +18,7 @@ extension String { private enum Target { static let msDesignSystem = "MSDesignSystem" + static let msSwiftUI = "MSSwiftUI" static let msUIKit = "MSUIKit" static let combineCocoa = "CombineCocoa" @@ -41,6 +42,8 @@ let package = Package( .iOS(.v15) ], products: [ + .library(name: Target.msSwiftUI, + targets: [Target.msSwiftUI]), .library(name: Target.msUIKit, targets: [Target.msUIKit]) ], @@ -56,6 +59,7 @@ let package = Package( .process("../\(Target.msDesignSystem)/Resources") ]), .target(name: Target.combineCocoa), + .target(name: Target.msSwiftUI), .target(name: Target.msUIKit, dependencies: [ .target(name: Target.msDesignSystem), diff --git a/iOS/MSUIKit/Sources/CombineCocoa/UITextField+Combine.swift b/iOS/MSFusion/Sources/CombineCocoa/UITextField+Combine.swift similarity index 100% rename from iOS/MSUIKit/Sources/CombineCocoa/UITextField+Combine.swift rename to iOS/MSFusion/Sources/CombineCocoa/UITextField+Combine.swift diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/MSColor.swift b/iOS/MSFusion/Sources/MSDesignSystem/MSColor.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/MSColor.swift rename to iOS/MSFusion/Sources/MSDesignSystem/MSColor.swift diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/MSFont.swift b/iOS/MSFusion/Sources/MSDesignSystem/MSFont.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/MSFont.swift rename to iOS/MSFusion/Sources/MSDesignSystem/MSFont.swift diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/MSIcon.swift b/iOS/MSFusion/Sources/MSDesignSystem/MSIcon.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/MSIcon.swift rename to iOS/MSFusion/Sources/MSDesignSystem/MSIcon.swift diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/Fonts/Pretendard-Bold.otf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/Fonts/Pretendard-Bold.otf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/Fonts/Pretendard-Bold.otf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/Fonts/Pretendard-Bold.otf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/Fonts/Pretendard-Regular.otf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/Fonts/Pretendard-Regular.otf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/Fonts/Pretendard-Regular.otf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/Fonts/Pretendard-Regular.otf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/Fonts/Pretendard-SemiBold.otf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/Fonts/Pretendard-SemiBold.otf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/Fonts/Pretendard-SemiBold.otf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/Fonts/Pretendard-SemiBold.otf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Modal.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Modal.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Modal.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Modal.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Primary.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Primary.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Primary.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Primary.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Secondary.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Secondary.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Secondary.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Background Secondary.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Background Primary.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Background Primary.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Background Primary.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Background Primary.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Background Secondary.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Background Secondary.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Background Secondary.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Background Secondary.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Typo Primary.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Typo Primary.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Typo Primary.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Typo Primary.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Typo Secondary.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Typo Secondary.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Typo Secondary.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Button Typo Secondary.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Component Background.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Component Background.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Component Background.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Component Background.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Component Typo.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Component Typo.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Component Typo.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Component Typo.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/MusicSpot.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/MusicSpot.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/MusicSpot.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/MusicSpot.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/TextField Background.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/TextField Background.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/TextField Background.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/TextField Background.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/TextField Typo.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/TextField Typo.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/TextField Typo.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/TextField Typo.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Typo Primary.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Typo Primary.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Typo Primary.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Typo Primary.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Typo Secondary.colorset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Typo Secondary.colorset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSColor.xcassets/Typo Secondary.colorset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSColor.xcassets/Typo Secondary.colorset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Calendar.imageset/Calendar.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Calendar.imageset/Calendar.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Calendar.imageset/Calendar.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Calendar.imageset/Calendar.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Calendar.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Calendar.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Calendar.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Calendar.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Check.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Check.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Check.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Check.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Check.imageset/Tick.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Check.imageset/Tick.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Check.imageset/Tick.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Check.imageset/Tick.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Close.imageset/Close.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Close.imageset/Close.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Close.imageset/Close.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Close.imageset/Close.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Close.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Close.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Close.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Close.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Down.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Down.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Down.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Down.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Down.imageset/Down 2.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Down.imageset/Down 2.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Down.imageset/Down 2.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Down.imageset/Down 2.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Image.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Image.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Image.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Image.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Image.imageset/Image 2.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Image.imageset/Image 2.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Image.imageset/Image 2.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Image.imageset/Image 2.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Left.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Left.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Left.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Left.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Left.imageset/Left 2.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Left.imageset/Left 2.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Left.imageset/Left 2.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Left.imageset/Left 2.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location Add.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location Add.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location Add.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location Add.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location Add.imageset/Location Add.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location Add.imageset/Location Add.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location Add.imageset/Location Add.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location Add.imageset/Location Add.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location.imageset/Location.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location.imageset/Location.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location.imageset/Location.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Location.imageset/Location.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Lock.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Lock.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Lock.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Lock.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Lock.imageset/Lock 2.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Lock.imageset/Lock 2.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Lock.imageset/Lock 2.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Lock.imageset/Lock 2.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Map.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Map.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Map.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Map.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Map.imageset/Map.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Map.imageset/Map.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Map.imageset/Map.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Map.imageset/Map.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Message.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Message.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Message.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Message.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Message.imageset/Message 15.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Message.imageset/Message 15.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Message.imageset/Message 15.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Message.imageset/Message 15.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Pause.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Pause.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Pause.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Pause.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Pause.imageset/Pause.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Pause.imageset/Pause.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Pause.imageset/Pause.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Pause.imageset/Pause.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Play.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Play.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Play.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Play.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Play.imageset/Play.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Play.imageset/Play.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Play.imageset/Play.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Play.imageset/Play.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Right.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Right.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Right.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Right.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Right.imageset/Right 2.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Right.imageset/Right 2.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Right.imageset/Right 2.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Right.imageset/Right 2.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Setting.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Setting.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Setting.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Setting.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Setting.imageset/Setting.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Setting.imageset/Setting.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Setting.imageset/Setting.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Setting.imageset/Setting.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Up.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Up.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Up.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Up.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Up.imageset/Up 3.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Up.imageset/Up 3.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Up.imageset/Up 3.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Up.imageset/Up 3.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/User Tag.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/User Tag.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/User Tag.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/User Tag.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/User Tag.imageset/User Tag 2.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/User Tag.imageset/User Tag 2.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/User Tag.imageset/User Tag 2.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/User Tag.imageset/User Tag 2.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Voice.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Voice.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Voice.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Voice.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Voice.imageset/Voice.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Voice.imageset/Voice.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Voice.imageset/Voice.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Voice.imageset/Voice.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume High.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume High.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume High.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume High.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume High.imageset/Volume High.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume High.imageset/Volume High.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume High.imageset/Volume High.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume High.imageset/Volume High.pdf diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume Off.imageset/Contents.json b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume Off.imageset/Contents.json similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume Off.imageset/Contents.json rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume Off.imageset/Contents.json diff --git a/iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume Off.imageset/Volume Off.pdf b/iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume Off.imageset/Volume Off.pdf similarity index 100% rename from iOS/MSUIKit/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume Off.imageset/Volume Off.pdf rename to iOS/MSFusion/Sources/MSDesignSystem/Resources/MSIcon.xcassets/Volume Off.imageset/Volume Off.pdf diff --git a/iOS/MSFusion/Sources/MSSwiftUI/placeholder.swift b/iOS/MSFusion/Sources/MSSwiftUI/placeholder.swift new file mode 100644 index 0000000..ca2469e --- /dev/null +++ b/iOS/MSFusion/Sources/MSSwiftUI/placeholder.swift @@ -0,0 +1,8 @@ +// +// File.swift +// +// +// Created by 이창준 on 2024.02.19. +// + +import Foundation diff --git a/iOS/MSUIKit/Sources/MSUIKit/BaseViewController.swift b/iOS/MSFusion/Sources/MSUIKit/BaseViewController.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/BaseViewController.swift rename to iOS/MSFusion/Sources/MSUIKit/BaseViewController.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/Cells/EmptyCell.swift b/iOS/MSFusion/Sources/MSUIKit/Cells/EmptyCell.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/Cells/EmptyCell.swift rename to iOS/MSFusion/Sources/MSUIKit/Cells/EmptyCell.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/Cells/JourneyCell/JourneyCell.swift b/iOS/MSFusion/Sources/MSUIKit/Cells/JourneyCell/JourneyCell.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/Cells/JourneyCell/JourneyCell.swift rename to iOS/MSFusion/Sources/MSUIKit/Cells/JourneyCell/JourneyCell.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/Cells/JourneyCell/JourneyCellModel.swift b/iOS/MSFusion/Sources/MSUIKit/Cells/JourneyCell/JourneyCellModel.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/Cells/JourneyCell/JourneyCellModel.swift rename to iOS/MSFusion/Sources/MSUIKit/Cells/JourneyCell/JourneyCellModel.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/Cells/JourneyCell/JourneyInfoView.swift b/iOS/MSFusion/Sources/MSUIKit/Cells/JourneyCell/JourneyInfoView.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/Cells/JourneyCell/JourneyInfoView.swift rename to iOS/MSFusion/Sources/MSUIKit/Cells/JourneyCell/JourneyInfoView.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/Cells/JourneyCell/MusicInfoView.swift b/iOS/MSFusion/Sources/MSUIKit/Cells/JourneyCell/MusicInfoView.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/Cells/JourneyCell/MusicInfoView.swift rename to iOS/MSFusion/Sources/MSUIKit/Cells/JourneyCell/MusicInfoView.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/Cells/JourneyCell/SpotPhotoImageView.swift b/iOS/MSFusion/Sources/MSUIKit/Cells/JourneyCell/SpotPhotoImageView.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/Cells/JourneyCell/SpotPhotoImageView.swift rename to iOS/MSFusion/Sources/MSUIKit/Cells/JourneyCell/SpotPhotoImageView.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/Cells/SongListCell/SongListCell.swift b/iOS/MSFusion/Sources/MSUIKit/Cells/SongListCell/SongListCell.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/Cells/SongListCell/SongListCell.swift rename to iOS/MSFusion/Sources/MSUIKit/Cells/SongListCell/SongListCell.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/Cells/SongListCell/SongListCellModel.swift b/iOS/MSFusion/Sources/MSUIKit/Cells/SongListCell/SongListCellModel.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/Cells/SongListCell/SongListCellModel.swift rename to iOS/MSFusion/Sources/MSUIKit/Cells/SongListCell/SongListCellModel.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/Extension/NSCollectionLayoutGroup+.swift b/iOS/MSFusion/Sources/MSUIKit/Extension/NSCollectionLayoutGroup+.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/Extension/NSCollectionLayoutGroup+.swift rename to iOS/MSFusion/Sources/MSUIKit/Extension/NSCollectionLayoutGroup+.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/Extension/UIColor+HEX.swift b/iOS/MSFusion/Sources/MSUIKit/Extension/UIColor+HEX.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/Extension/UIColor+HEX.swift rename to iOS/MSFusion/Sources/MSUIKit/Extension/UIColor+HEX.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/MSAlertViewController.swift b/iOS/MSFusion/Sources/MSUIKit/MSAlertViewController.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/MSAlertViewController.swift rename to iOS/MSFusion/Sources/MSUIKit/MSAlertViewController.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/MSBottomSheetViewController/BottomSheetConfiguration.swift b/iOS/MSFusion/Sources/MSUIKit/MSBottomSheetViewController/BottomSheetConfiguration.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/MSBottomSheetViewController/BottomSheetConfiguration.swift rename to iOS/MSFusion/Sources/MSUIKit/MSBottomSheetViewController/BottomSheetConfiguration.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/MSBottomSheetViewController/MSBottomSheetViewController.swift b/iOS/MSFusion/Sources/MSUIKit/MSBottomSheetViewController/MSBottomSheetViewController.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/MSBottomSheetViewController/MSBottomSheetViewController.swift rename to iOS/MSFusion/Sources/MSUIKit/MSBottomSheetViewController/MSBottomSheetViewController.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/MSButton/MSButton+Primary.swift b/iOS/MSFusion/Sources/MSUIKit/MSButton/MSButton+Primary.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/MSButton/MSButton+Primary.swift rename to iOS/MSFusion/Sources/MSUIKit/MSButton/MSButton+Primary.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/MSButton/MSButton+Secondary.swift b/iOS/MSFusion/Sources/MSUIKit/MSButton/MSButton+Secondary.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/MSButton/MSButton+Secondary.swift rename to iOS/MSFusion/Sources/MSUIKit/MSButton/MSButton+Secondary.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/MSButton/MSButton.swift b/iOS/MSFusion/Sources/MSUIKit/MSButton/MSButton.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/MSButton/MSButton.swift rename to iOS/MSFusion/Sources/MSUIKit/MSButton/MSButton.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/MSButton/MSRectButton+Large.swift b/iOS/MSFusion/Sources/MSUIKit/MSButton/MSRectButton+Large.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/MSButton/MSRectButton+Large.swift rename to iOS/MSFusion/Sources/MSUIKit/MSButton/MSRectButton+Large.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/MSButton/MSRectButton+Small.swift b/iOS/MSFusion/Sources/MSUIKit/MSButton/MSRectButton+Small.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/MSButton/MSRectButton+Small.swift rename to iOS/MSFusion/Sources/MSUIKit/MSButton/MSRectButton+Small.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/MSButton/MSRectButton.swift b/iOS/MSFusion/Sources/MSUIKit/MSButton/MSRectButton.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/MSButton/MSRectButton.swift rename to iOS/MSFusion/Sources/MSUIKit/MSButton/MSRectButton.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/MSGradientLayer.swift b/iOS/MSFusion/Sources/MSUIKit/MSGradientLayer.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/MSGradientLayer.swift rename to iOS/MSFusion/Sources/MSUIKit/MSGradientLayer.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/MSImageFetcher/MSImageFetcher+UIImageView.swift b/iOS/MSFusion/Sources/MSUIKit/MSImageFetcher/MSImageFetcher+UIImageView.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/MSImageFetcher/MSImageFetcher+UIImageView.swift rename to iOS/MSFusion/Sources/MSUIKit/MSImageFetcher/MSImageFetcher+UIImageView.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/MSMusicPlayerView.swift b/iOS/MSFusion/Sources/MSUIKit/MSMusicPlayerView.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/MSMusicPlayerView.swift rename to iOS/MSFusion/Sources/MSUIKit/MSMusicPlayerView.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/MSTextField/MSTextField.swift b/iOS/MSFusion/Sources/MSUIKit/MSTextField/MSTextField.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/MSTextField/MSTextField.swift rename to iOS/MSFusion/Sources/MSUIKit/MSTextField/MSTextField.swift diff --git a/iOS/MSUIKit/Sources/MSUIKit/Spacer.swift b/iOS/MSFusion/Sources/MSUIKit/Spacer.swift similarity index 100% rename from iOS/MSUIKit/Sources/MSUIKit/Spacer.swift rename to iOS/MSFusion/Sources/MSUIKit/Spacer.swift diff --git a/iOS/MusicSpot.xcworkspace/contents.xcworkspacedata b/iOS/MusicSpot.xcworkspace/contents.xcworkspacedata index 3038f04..06f154b 100644 --- a/iOS/MusicSpot.xcworkspace/contents.xcworkspacedata +++ b/iOS/MusicSpot.xcworkspace/contents.xcworkspacedata @@ -36,9 +36,9 @@ location = "group:MSDomain"> + location = "group:MSFusion"> + location = "group:MSFoundation"> diff --git a/iOS/MusicSpot/MusicSpot.xcodeproj/project.pbxproj b/iOS/MusicSpot/MusicSpot.xcodeproj/project.pbxproj index 6995b28..0513a83 100644 --- a/iOS/MusicSpot/MusicSpot.xcodeproj/project.pbxproj +++ b/iOS/MusicSpot/MusicSpot.xcodeproj/project.pbxproj @@ -13,15 +13,6 @@ 08CBF87D2B18468E007D3797 /* SpotCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08CBF8752B18468E007D3797 /* SpotCoordinator.swift */; }; 08CBF87E2B18468E007D3797 /* SaveJourneyFlowCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08CBF8762B18468E007D3797 /* SaveJourneyFlowCoordinator.swift */; }; 08CBF87F2B18468E007D3797 /* Coordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08CBF8772B18468E007D3797 /* Coordinator.swift */; }; - DD3A97362B52411000BA2800 /* MSUIKit in Frameworks */ = {isa = PBXBuildFile; productRef = DD3A97352B52411000BA2800 /* MSUIKit */; }; - DD3A97392B52413300BA2800 /* Home in Frameworks */ = {isa = PBXBuildFile; productRef = DD3A97382B52413300BA2800 /* Home */; }; - DD3A973B2B52413300BA2800 /* NavigateMap in Frameworks */ = {isa = PBXBuildFile; productRef = DD3A973A2B52413300BA2800 /* NavigateMap */; }; - DD3A973E2B52414200BA2800 /* JourneyList in Frameworks */ = {isa = PBXBuildFile; productRef = DD3A973D2B52414200BA2800 /* JourneyList */; }; - DD3A97412B52414B00BA2800 /* RewindJourney in Frameworks */ = {isa = PBXBuildFile; productRef = DD3A97402B52414B00BA2800 /* RewindJourney */; }; - DD3A97432B52415800BA2800 /* RewindJourney in Frameworks */ = {isa = PBXBuildFile; productRef = DD3A97422B52415800BA2800 /* RewindJourney */; }; - DD3A97462B52416100BA2800 /* SaveJourney in Frameworks */ = {isa = PBXBuildFile; productRef = DD3A97452B52416100BA2800 /* SaveJourney */; }; - DD3A97492B52416900BA2800 /* SelectSong in Frameworks */ = {isa = PBXBuildFile; productRef = DD3A97482B52416900BA2800 /* SelectSong */; }; - DD3A974C2B52417100BA2800 /* Spot in Frameworks */ = {isa = PBXBuildFile; productRef = DD3A974B2B52417100BA2800 /* Spot */; }; DD612FB92B50080600E681CC /* SaveJourneyFlowCoordinatorFinishDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD612FB82B50080600E681CC /* SaveJourneyFlowCoordinatorFinishDelegate.swift */; }; DD612FBB2B50DA0600E681CC /* RewindJourneyCoordinatorFinishDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD612FBA2B50DA0600E681CC /* RewindJourneyCoordinatorFinishDelegate.swift */; }; DD72AF642B4B89E700EB4E81 /* CoordinatorFinishDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDB22F742B433EC300F83D84 /* CoordinatorFinishDelegate.swift */; }; @@ -29,14 +20,15 @@ DD73F85B2B024C4900EE9BF2 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD73F85A2B024C4900EE9BF2 /* SceneDelegate.swift */; }; DD73F8622B024C4B00EE9BF2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DD73F8612B024C4B00EE9BF2 /* Assets.xcassets */; }; DD73F8652B024C4B00EE9BF2 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DD73F8632B024C4B00EE9BF2 /* LaunchScreen.storyboard */; }; - DD92FEAB2B35EDFF00A672F5 /* Home in Frameworks */ = {isa = PBXBuildFile; productRef = DD92FEAA2B35EDFF00A672F5 /* Home */; }; - DD92FEAD2B35EE0700A672F5 /* NavigateMap in Frameworks */ = {isa = PBXBuildFile; productRef = DD92FEAC2B35EE0700A672F5 /* NavigateMap */; }; - DD92FEAF2B35EE0700A672F5 /* JourneyList in Frameworks */ = {isa = PBXBuildFile; productRef = DD92FEAE2B35EE0700A672F5 /* JourneyList */; }; - DD92FEB12B35EE0700A672F5 /* RewindJourney in Frameworks */ = {isa = PBXBuildFile; productRef = DD92FEB02B35EE0700A672F5 /* RewindJourney */; }; - DD92FEB32B35EE0700A672F5 /* SelectSong in Frameworks */ = {isa = PBXBuildFile; productRef = DD92FEB22B35EE0700A672F5 /* SelectSong */; }; - DD92FEB52B35EE0700A672F5 /* Spot in Frameworks */ = {isa = PBXBuildFile; productRef = DD92FEB42B35EE0700A672F5 /* Spot */; }; - DD92FEBA2B35EEAF00A672F5 /* SaveJourney in Frameworks */ = {isa = PBXBuildFile; productRef = DD92FEB92B35EEAF00A672F5 /* SaveJourney */; }; + DD9182E12B838AA2009B7D21 /* MSUIKit in Frameworks */ = {isa = PBXBuildFile; productRef = DD9182E02B838AA2009B7D21 /* MSUIKit */; }; DDB3B9F22B4F6DF60024C6BF /* SpotCoordinatorFinishDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDB3B9F12B4F6DF60024C6BF /* SpotCoordinatorFinishDelegate.swift */; }; + DDEED6D42B8389CE00141E01 /* Home in Frameworks */ = {isa = PBXBuildFile; productRef = DDEED6D32B8389CE00141E01 /* Home */; }; + DDEED6D62B8389CE00141E01 /* NavigateMap in Frameworks */ = {isa = PBXBuildFile; productRef = DDEED6D52B8389CE00141E01 /* NavigateMap */; }; + DDEED6D92B8389D600141E01 /* JourneyList in Frameworks */ = {isa = PBXBuildFile; productRef = DDEED6D82B8389D600141E01 /* JourneyList */; }; + DDEED6DC2B8389E300141E01 /* RewindJourney in Frameworks */ = {isa = PBXBuildFile; productRef = DDEED6DB2B8389E300141E01 /* RewindJourney */; }; + DDEED6E12B8389F000141E01 /* SaveJourney in Frameworks */ = {isa = PBXBuildFile; productRef = DDEED6E02B8389F000141E01 /* SaveJourney */; }; + DDEED6E62B8389FF00141E01 /* SelectSong in Frameworks */ = {isa = PBXBuildFile; productRef = DDEED6E52B8389FF00141E01 /* SelectSong */; }; + DDEED6E92B838A0600141E01 /* Spot in Frameworks */ = {isa = PBXBuildFile; productRef = DDEED6E82B838A0600141E01 /* Spot */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -79,22 +71,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DD92FEAD2B35EE0700A672F5 /* NavigateMap in Frameworks */, - DD3A973E2B52414200BA2800 /* JourneyList in Frameworks */, - DD3A97492B52416900BA2800 /* SelectSong in Frameworks */, - DD92FEAB2B35EDFF00A672F5 /* Home in Frameworks */, - DD92FEB52B35EE0700A672F5 /* Spot in Frameworks */, - DD3A97432B52415800BA2800 /* RewindJourney in Frameworks */, - DD92FEB32B35EE0700A672F5 /* SelectSong in Frameworks */, - DD3A97462B52416100BA2800 /* SaveJourney in Frameworks */, - DD92FEB12B35EE0700A672F5 /* RewindJourney in Frameworks */, - DD3A97412B52414B00BA2800 /* RewindJourney in Frameworks */, - DD3A974C2B52417100BA2800 /* Spot in Frameworks */, - DD3A97362B52411000BA2800 /* MSUIKit in Frameworks */, - DD3A973B2B52413300BA2800 /* NavigateMap in Frameworks */, - DD92FEBA2B35EEAF00A672F5 /* SaveJourney in Frameworks */, - DD92FEAF2B35EE0700A672F5 /* JourneyList in Frameworks */, - DD3A97392B52413300BA2800 /* Home in Frameworks */, + DDEED6D62B8389CE00141E01 /* NavigateMap in Frameworks */, + DDEED6E62B8389FF00141E01 /* SelectSong in Frameworks */, + DDEED6D42B8389CE00141E01 /* Home in Frameworks */, + DDEED6DC2B8389E300141E01 /* RewindJourney in Frameworks */, + DDEED6E92B838A0600141E01 /* Spot in Frameworks */, + DD9182E12B838AA2009B7D21 /* MSUIKit in Frameworks */, + DDEED6E12B8389F000141E01 /* SaveJourney in Frameworks */, + DDEED6D92B8389D600141E01 /* JourneyList in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -183,22 +167,14 @@ ); name = MusicSpot; packageProductDependencies = ( - DD92FEAA2B35EDFF00A672F5 /* Home */, - DD92FEAC2B35EE0700A672F5 /* NavigateMap */, - DD92FEAE2B35EE0700A672F5 /* JourneyList */, - DD92FEB02B35EE0700A672F5 /* RewindJourney */, - DD92FEB22B35EE0700A672F5 /* SelectSong */, - DD92FEB42B35EE0700A672F5 /* Spot */, - DD92FEB92B35EEAF00A672F5 /* SaveJourney */, - DD3A97352B52411000BA2800 /* MSUIKit */, - DD3A97382B52413300BA2800 /* Home */, - DD3A973A2B52413300BA2800 /* NavigateMap */, - DD3A973D2B52414200BA2800 /* JourneyList */, - DD3A97402B52414B00BA2800 /* RewindJourney */, - DD3A97422B52415800BA2800 /* RewindJourney */, - DD3A97452B52416100BA2800 /* SaveJourney */, - DD3A97482B52416900BA2800 /* SelectSong */, - DD3A974B2B52417100BA2800 /* Spot */, + DDEED6D32B8389CE00141E01 /* Home */, + DDEED6D52B8389CE00141E01 /* NavigateMap */, + DDEED6D82B8389D600141E01 /* JourneyList */, + DDEED6DB2B8389E300141E01 /* RewindJourney */, + DDEED6E02B8389F000141E01 /* SaveJourney */, + DDEED6E52B8389FF00141E01 /* SelectSong */, + DDEED6E82B838A0600141E01 /* Spot */, + DD9182E02B838AA2009B7D21 /* MSUIKit */, ); productName = MusicSpot; productReference = DD73F8552B024C4900EE9BF2 /* MusicSpot.app */; @@ -229,13 +205,13 @@ ); mainGroup = DD73F84C2B024C4900EE9BF2; packageReferences = ( - DD3A97342B52411000BA2800 /* XCLocalSwiftPackageReference "../MSUIKit" */, - DD3A97372B52413300BA2800 /* XCLocalSwiftPackageReference "../Features/Home" */, - DD3A973C2B52414200BA2800 /* XCLocalSwiftPackageReference "../Features/JourneyList" */, - DD3A973F2B52414B00BA2800 /* XCLocalSwiftPackageReference "../Features/RewindJourney" */, - DD3A97442B52416100BA2800 /* XCLocalSwiftPackageReference "../Features/SaveJourney" */, - DD3A97472B52416900BA2800 /* XCLocalSwiftPackageReference "../Features/SelectSong" */, - DD3A974A2B52417100BA2800 /* XCLocalSwiftPackageReference "../Features/Spot" */, + DDEED6D22B8389CE00141E01 /* XCLocalSwiftPackageReference "../Features/Home" */, + DDEED6D72B8389D600141E01 /* XCLocalSwiftPackageReference "../Features/JourneyList" */, + DDEED6DA2B8389E300141E01 /* XCLocalSwiftPackageReference "../Features/RewindJourney" */, + DDEED6DF2B8389F000141E01 /* XCLocalSwiftPackageReference "../Features/SaveJourney" */, + DDEED6E42B8389FF00141E01 /* XCLocalSwiftPackageReference "../Features/SelectSong" */, + DDEED6E72B838A0600141E01 /* XCLocalSwiftPackageReference "../Features/Spot" */, + DDEED6EA2B838A1500141E01 /* XCLocalSwiftPackageReference "../MSFusion" */, ); productRefGroup = DD73F8562B024C4900EE9BF2 /* Products */; projectDirPath = ""; @@ -643,101 +619,69 @@ /* End XCConfigurationList section */ /* Begin XCLocalSwiftPackageReference section */ - DD3A97342B52411000BA2800 /* XCLocalSwiftPackageReference "../MSUIKit" */ = { - isa = XCLocalSwiftPackageReference; - relativePath = ../MSUIKit; - }; - DD3A97372B52413300BA2800 /* XCLocalSwiftPackageReference "../Features/Home" */ = { + DDEED6D22B8389CE00141E01 /* XCLocalSwiftPackageReference "../Features/Home" */ = { isa = XCLocalSwiftPackageReference; relativePath = ../Features/Home; }; - DD3A973C2B52414200BA2800 /* XCLocalSwiftPackageReference "../Features/JourneyList" */ = { + DDEED6D72B8389D600141E01 /* XCLocalSwiftPackageReference "../Features/JourneyList" */ = { isa = XCLocalSwiftPackageReference; relativePath = ../Features/JourneyList; }; - DD3A973F2B52414B00BA2800 /* XCLocalSwiftPackageReference "../Features/RewindJourney" */ = { + DDEED6DA2B8389E300141E01 /* XCLocalSwiftPackageReference "../Features/RewindJourney" */ = { isa = XCLocalSwiftPackageReference; relativePath = ../Features/RewindJourney; }; - DD3A97442B52416100BA2800 /* XCLocalSwiftPackageReference "../Features/SaveJourney" */ = { + DDEED6DF2B8389F000141E01 /* XCLocalSwiftPackageReference "../Features/SaveJourney" */ = { isa = XCLocalSwiftPackageReference; relativePath = ../Features/SaveJourney; }; - DD3A97472B52416900BA2800 /* XCLocalSwiftPackageReference "../Features/SelectSong" */ = { + DDEED6E42B8389FF00141E01 /* XCLocalSwiftPackageReference "../Features/SelectSong" */ = { isa = XCLocalSwiftPackageReference; relativePath = ../Features/SelectSong; }; - DD3A974A2B52417100BA2800 /* XCLocalSwiftPackageReference "../Features/Spot" */ = { + DDEED6E72B838A0600141E01 /* XCLocalSwiftPackageReference "../Features/Spot" */ = { isa = XCLocalSwiftPackageReference; relativePath = ../Features/Spot; }; + DDEED6EA2B838A1500141E01 /* XCLocalSwiftPackageReference "../MSFusion" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = ../MSFusion; + }; /* End XCLocalSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - DD3A97352B52411000BA2800 /* MSUIKit */ = { + DD9182E02B838AA2009B7D21 /* MSUIKit */ = { isa = XCSwiftPackageProductDependency; productName = MSUIKit; }; - DD3A97382B52413300BA2800 /* Home */ = { + DDEED6D32B8389CE00141E01 /* Home */ = { isa = XCSwiftPackageProductDependency; productName = Home; }; - DD3A973A2B52413300BA2800 /* NavigateMap */ = { + DDEED6D52B8389CE00141E01 /* NavigateMap */ = { isa = XCSwiftPackageProductDependency; productName = NavigateMap; }; - DD3A973D2B52414200BA2800 /* JourneyList */ = { + DDEED6D82B8389D600141E01 /* JourneyList */ = { isa = XCSwiftPackageProductDependency; productName = JourneyList; }; - DD3A97402B52414B00BA2800 /* RewindJourney */ = { - isa = XCSwiftPackageProductDependency; - productName = RewindJourney; - }; - DD3A97422B52415800BA2800 /* RewindJourney */ = { + DDEED6DB2B8389E300141E01 /* RewindJourney */ = { isa = XCSwiftPackageProductDependency; productName = RewindJourney; }; - DD3A97452B52416100BA2800 /* SaveJourney */ = { + DDEED6E02B8389F000141E01 /* SaveJourney */ = { isa = XCSwiftPackageProductDependency; productName = SaveJourney; }; - DD3A97482B52416900BA2800 /* SelectSong */ = { - isa = XCSwiftPackageProductDependency; - productName = SelectSong; - }; - DD3A974B2B52417100BA2800 /* Spot */ = { - isa = XCSwiftPackageProductDependency; - productName = Spot; - }; - DD92FEAA2B35EDFF00A672F5 /* Home */ = { - isa = XCSwiftPackageProductDependency; - productName = Home; - }; - DD92FEAC2B35EE0700A672F5 /* NavigateMap */ = { - isa = XCSwiftPackageProductDependency; - productName = NavigateMap; - }; - DD92FEAE2B35EE0700A672F5 /* JourneyList */ = { - isa = XCSwiftPackageProductDependency; - productName = JourneyList; - }; - DD92FEB02B35EE0700A672F5 /* RewindJourney */ = { - isa = XCSwiftPackageProductDependency; - productName = RewindJourney; - }; - DD92FEB22B35EE0700A672F5 /* SelectSong */ = { + DDEED6E52B8389FF00141E01 /* SelectSong */ = { isa = XCSwiftPackageProductDependency; productName = SelectSong; }; - DD92FEB42B35EE0700A672F5 /* Spot */ = { + DDEED6E82B838A0600141E01 /* Spot */ = { isa = XCSwiftPackageProductDependency; productName = Spot; }; - DD92FEB92B35EEAF00A672F5 /* SaveJourney */ = { - isa = XCSwiftPackageProductDependency; - productName = SaveJourney; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = DD73F84D2B024C4900EE9BF2 /* Project object */; diff --git a/iOS/commit b/iOS/commit index d3f7aca..fad94fb 100755 --- a/iOS/commit +++ b/iOS/commit @@ -1,7 +1,7 @@ #!/bin/sh LINTPATH='.swiftlint.yml' -declare -a PATHS=("MSCoreKit" "MSFoundation" "MSUIKit" "MSData" "MusicSpot" "Features") +declare -a PATHS=("MSCoreKit" "MSFoundation" "MSFusion" "MSData" "MusicSpot" "Features") failures="" for path in "${PATHS[@]}"; do @@ -29,4 +29,4 @@ if [ ! -z "$failures" ]; then else echo "✨ All linting checks passed. Ready to commit." gitmoji -c -fi \ No newline at end of file +fi From 956ca71dd76e21f125705f00d96004728cd73bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Junnos=20=EF=A3=BF?= Date: Mon, 19 Feb 2024 22:48:41 +0900 Subject: [PATCH 2/5] =?UTF-8?q?:sparkles:=20SwiftUI=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=A0=20MSDesignSystem=20=EC=9A=94?= =?UTF-8?q?=EC=86=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iOS/MSFusion/Package.swift | 5 +++- .../Sources/MSDesignSystem/Bundle+.swift | 26 ++++++++++++++++++ .../Color/MSColor+SwiftUI.swift | 16 +++++++++++ .../MSDesignSystem/Color/MSColor+UIKit.swift | 16 +++++++++++ .../MSDesignSystem/{ => Color}/MSColor.swift | 12 ++------- .../MSDesignSystem/Font/MSFont+SwiftUI.swift | 25 +++++++++++++++++ .../MSDesignSystem/Font/MSFont+UIKit.swift | 26 ++++++++++++++++++ .../MSDesignSystem/{ => Font}/MSFont.swift | 27 +++++-------------- .../MSDesignSystem/{ => Icon}/MSIcon.swift | 12 +-------- 9 files changed, 122 insertions(+), 43 deletions(-) create mode 100644 iOS/MSFusion/Sources/MSDesignSystem/Bundle+.swift create mode 100644 iOS/MSFusion/Sources/MSDesignSystem/Color/MSColor+SwiftUI.swift create mode 100644 iOS/MSFusion/Sources/MSDesignSystem/Color/MSColor+UIKit.swift rename iOS/MSFusion/Sources/MSDesignSystem/{ => Color}/MSColor.swift (80%) create mode 100644 iOS/MSFusion/Sources/MSDesignSystem/Font/MSFont+SwiftUI.swift create mode 100644 iOS/MSFusion/Sources/MSDesignSystem/Font/MSFont+UIKit.swift rename iOS/MSFusion/Sources/MSDesignSystem/{ => Font}/MSFont.swift (73%) rename iOS/MSFusion/Sources/MSDesignSystem/{ => Icon}/MSIcon.swift (73%) diff --git a/iOS/MSFusion/Package.swift b/iOS/MSFusion/Package.swift index 1adc1f1..9547f22 100644 --- a/iOS/MSFusion/Package.swift +++ b/iOS/MSFusion/Package.swift @@ -59,7 +59,10 @@ let package = Package( .process("../\(Target.msDesignSystem)/Resources") ]), .target(name: Target.combineCocoa), - .target(name: Target.msSwiftUI), + .target(name: Target.msSwiftUI, + dependencies: [ + .target(name: Target.msDesignSystem) + ]), .target(name: Target.msUIKit, dependencies: [ .target(name: Target.msDesignSystem), diff --git a/iOS/MSFusion/Sources/MSDesignSystem/Bundle+.swift b/iOS/MSFusion/Sources/MSDesignSystem/Bundle+.swift new file mode 100644 index 0000000..bcd10b2 --- /dev/null +++ b/iOS/MSFusion/Sources/MSDesignSystem/Bundle+.swift @@ -0,0 +1,26 @@ +// +// Bundle+.swift +// MSDesignSystem +// +// Created by 이창준 on 2024.02.19. +// + +import Foundation + +public class MSBundle { + public static let bundle = Bundle(for: MSBundle.self) +} + +extension Bundle { + + #if SWIFT_PACKAGE + public static var msDesignSystem: Bundle { + return .module + } + #else + public static var msDesignSystem: Bundle { + return Bundle(for: MSBundle.self) + } + #endif + +} diff --git a/iOS/MSFusion/Sources/MSDesignSystem/Color/MSColor+SwiftUI.swift b/iOS/MSFusion/Sources/MSDesignSystem/Color/MSColor+SwiftUI.swift new file mode 100644 index 0000000..0154f6c --- /dev/null +++ b/iOS/MSFusion/Sources/MSDesignSystem/Color/MSColor+SwiftUI.swift @@ -0,0 +1,16 @@ +// +// MSColor+SwiftUI.swift +// MSDesignSystem +// +// Created by 이창준 on 2024.02.19. +// + +import SwiftUI + +extension Color { + + public static func msColor(_ color: MSColor) -> Color { + return Color(color.rawValue, bundle: .msDesignSystem) + } + +} diff --git a/iOS/MSFusion/Sources/MSDesignSystem/Color/MSColor+UIKit.swift b/iOS/MSFusion/Sources/MSDesignSystem/Color/MSColor+UIKit.swift new file mode 100644 index 0000000..a158b73 --- /dev/null +++ b/iOS/MSFusion/Sources/MSDesignSystem/Color/MSColor+UIKit.swift @@ -0,0 +1,16 @@ +// +// MSColor+UIKit.swift +// MSDesignSystem +// +// Created by 이창준 on 2024.02.19. +// + +import UIKit + +extension UIColor { + + public static func msColor(_ color: MSColor) -> UIColor { + return UIColor(named: color.rawValue, in: .msDesignSystem, compatibleWith: .current)! + } + +} diff --git a/iOS/MSFusion/Sources/MSDesignSystem/MSColor.swift b/iOS/MSFusion/Sources/MSDesignSystem/Color/MSColor.swift similarity index 80% rename from iOS/MSFusion/Sources/MSDesignSystem/MSColor.swift rename to iOS/MSFusion/Sources/MSDesignSystem/Color/MSColor.swift index 10d8dfb..e675a6d 100644 --- a/iOS/MSFusion/Sources/MSDesignSystem/MSColor.swift +++ b/iOS/MSFusion/Sources/MSDesignSystem/Color/MSColor.swift @@ -1,13 +1,12 @@ // // MSColor.swift -// MSUIKit +// MSDesignSystem // // Created by 이창준 on 11/19/23. // -import UIKit - public enum MSColor: String { + case primaryBackground = "Background Primary" case secondaryBackground = "Background Secondary" case primaryButtonBackground = "Button Background Primary" @@ -26,12 +25,5 @@ public enum MSColor: String { case textFieldTypo = "TextField Typo" case musicSpot = "MusicSpot" -} - -extension UIColor { - - public static func msColor(_ color: MSColor) -> UIColor { - return UIColor(named: color.rawValue, in: .module, compatibleWith: .current)! - } } diff --git a/iOS/MSFusion/Sources/MSDesignSystem/Font/MSFont+SwiftUI.swift b/iOS/MSFusion/Sources/MSDesignSystem/Font/MSFont+SwiftUI.swift new file mode 100644 index 0000000..9023424 --- /dev/null +++ b/iOS/MSFusion/Sources/MSDesignSystem/Font/MSFont+SwiftUI.swift @@ -0,0 +1,25 @@ +// +// MSFont+SwiftUI.swift +// MSDesignSystem +// +// Created by 이창준 on 2024.02.19. +// + +import SwiftUI + +extension MSFont { + + fileprivate func font() -> Font? { + let details = self.fontDetails + return Font.custom(details.fontName, size: details.size) + } + +} + +public extension Font { + + static func msFont(_ font: MSFont) -> Font? { + return font.font() + } + +} diff --git a/iOS/MSFusion/Sources/MSDesignSystem/Font/MSFont+UIKit.swift b/iOS/MSFusion/Sources/MSDesignSystem/Font/MSFont+UIKit.swift new file mode 100644 index 0000000..31bf63a --- /dev/null +++ b/iOS/MSFusion/Sources/MSDesignSystem/Font/MSFont+UIKit.swift @@ -0,0 +1,26 @@ +// +// MSFont+UIKit.swift +// MSDesignSystem +// +// Created by 이창준 on 2024.02.19. +// + +import UIKit + +extension MSFont { + + fileprivate func font() -> UIFont? { + let details = self.fontDetails + return UIFont(name: details.fontName, size: details.size) + } + +} + +public extension UIFont { + + static func msFont(_ font: MSFont) -> UIFont? { + return font.font() + } + +} + diff --git a/iOS/MSFusion/Sources/MSDesignSystem/MSFont.swift b/iOS/MSFusion/Sources/MSDesignSystem/Font/MSFont.swift similarity index 73% rename from iOS/MSFusion/Sources/MSDesignSystem/MSFont.swift rename to iOS/MSFusion/Sources/MSDesignSystem/Font/MSFont.swift index 3bc0e36..d7f8a57 100644 --- a/iOS/MSFusion/Sources/MSDesignSystem/MSFont.swift +++ b/iOS/MSFusion/Sources/MSDesignSystem/Font/MSFont.swift @@ -1,11 +1,13 @@ // // MSFont.swift -// MSUIKit +// MSDesignSystem // // Created by 이창준 on 11/19/23. // -import UIKit +import CoreGraphics +import CoreText +import Foundation public enum MSFont { case superTitle @@ -19,7 +21,7 @@ public enum MSFont { // MARK: - Functions - private var fontDetails: (fontName: String, size: CGFloat) { + internal var fontDetails: (fontName: String, size: CGFloat) { switch self { case .superTitle: return ("Pretendard-Bold", 34.0) case .duperTitle: return ("Pretendard-Bold", 28.0) @@ -32,11 +34,6 @@ public enum MSFont { } } - internal func font() -> UIFont? { - let details = self.fontDetails - return UIFont(name: details.fontName, size: details.size) - } - fileprivate static func registerFont(bundle: Bundle, fontName: String, fontExtension: String) { guard let fontURL = bundle.url(forResource: fontName, withExtension: fontExtension), let fontDataProvider = CGDataProvider(url: fontURL as CFURL), @@ -54,19 +51,7 @@ public enum MSFont { "Pretendard-SemiBold", "Pretendard-Bold" ].forEach { - registerFont(bundle: .module, fontName: $0, fontExtension: "otf") - } - } - -} - -public extension UIFont { - - static func msFont(_ font: MSFont) -> UIFont? { - if let font = font.font() { - return font - } else { - return nil + self.registerFont(bundle: .msDesignSystem, fontName: $0, fontExtension: "otf") } } diff --git a/iOS/MSFusion/Sources/MSDesignSystem/MSIcon.swift b/iOS/MSFusion/Sources/MSDesignSystem/Icon/MSIcon.swift similarity index 73% rename from iOS/MSFusion/Sources/MSDesignSystem/MSIcon.swift rename to iOS/MSFusion/Sources/MSDesignSystem/Icon/MSIcon.swift index 2fc0a16..93e7e3f 100644 --- a/iOS/MSFusion/Sources/MSDesignSystem/MSIcon.swift +++ b/iOS/MSFusion/Sources/MSDesignSystem/Icon/MSIcon.swift @@ -1,12 +1,10 @@ // // MSIcon.swift -// MSUIKit +// MSDesignSystem // // Created by 이창준 on 11/19/23. // -import UIKit - public enum MSIcon: String { case check = "Check" case close = "Close" @@ -32,11 +30,3 @@ public enum MSIcon: String { case volumeHigh = "Volume High" case volumeOff = "Volume Off" } - -extension UIImage { - - public static func msIcon(_ icon: MSIcon) -> UIImage? { - return UIImage(named: icon.rawValue, in: .module, compatibleWith: .current)?.withRenderingMode(.alwaysTemplate) - } - -} From 9c58e911da20cdbc70ef56a2da01d458e14b43c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Junnos=20=EF=A3=BF?= Date: Tue, 20 Feb 2024 00:47:42 +0900 Subject: [PATCH 3/5] =?UTF-8?q?:sparkles:=20MSButton=20SwiftUI=20=ED=8F=AC?= =?UTF-8?q?=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MSSwiftUI/MSButton+CornerStyle.swift | 26 +++++++ .../Sources/MSSwiftUI/MSButton+Primary.swift | 59 ++++++++++++++++ .../MSSwiftUI/MSButton+Secondary.swift | 55 +++++++++++++++ iOS/MSFusion/Sources/MSSwiftUI/MSButton.swift | 68 +++++++++++++++++++ .../Sources/MSSwiftUI/placeholder.swift | 8 --- .../Sources/MSUIKit/MSButton/MSButton.swift | 1 - 6 files changed, 208 insertions(+), 9 deletions(-) create mode 100644 iOS/MSFusion/Sources/MSSwiftUI/MSButton+CornerStyle.swift create mode 100644 iOS/MSFusion/Sources/MSSwiftUI/MSButton+Primary.swift create mode 100644 iOS/MSFusion/Sources/MSSwiftUI/MSButton+Secondary.swift create mode 100644 iOS/MSFusion/Sources/MSSwiftUI/MSButton.swift delete mode 100644 iOS/MSFusion/Sources/MSSwiftUI/placeholder.swift diff --git a/iOS/MSFusion/Sources/MSSwiftUI/MSButton+CornerStyle.swift b/iOS/MSFusion/Sources/MSSwiftUI/MSButton+CornerStyle.swift new file mode 100644 index 0000000..9c88329 --- /dev/null +++ b/iOS/MSFusion/Sources/MSSwiftUI/MSButton+CornerStyle.swift @@ -0,0 +1,26 @@ +// +// MSButton+CornerStyle.swift +// MSSwiftUI +// +// Created by 이창준 on 2024.02.20. +// + +import CoreGraphics + +extension MSButton { + + public enum CornerStyle { + case squared + case rounded + case custom(CGFloat) + + var cornerRadius: CGFloat { + switch self { + case .squared: return 8.0 + case .rounded: return 25.0 + case .custom(let cornerRadius): return cornerRadius + } + } + } + +} diff --git a/iOS/MSFusion/Sources/MSSwiftUI/MSButton+Primary.swift b/iOS/MSFusion/Sources/MSSwiftUI/MSButton+Primary.swift new file mode 100644 index 0000000..249853e --- /dev/null +++ b/iOS/MSFusion/Sources/MSSwiftUI/MSButton+Primary.swift @@ -0,0 +1,59 @@ +// +// MSButton+Primary.swift +// MSSwiftUI +// +// Created by 이창준 on 2024.02.19. +// + +import SwiftUI + +fileprivate struct MSButtonPrimaryModifier: ViewModifier { + + // MARK: - Properties + + private let cornerStyle: MSButton.CornerStyle + private let isBrandColored: Bool + + // MARK: - Initializer + + init(cornerStyle: MSButton.CornerStyle, isBrandColored: Bool) { + self.cornerStyle = cornerStyle + self.isBrandColored = isBrandColored + } + + // MARK: - Body + + public func body(content: Content) -> some View { + let backgroundColor: Color = self.isBrandColored + ? .msColor(.musicSpot) + : .msColor(.primaryButtonBackground) + + content + .foregroundStyle(Color.msColor(.primaryButtonTypo)) + .background( + RoundedRectangle(cornerRadius: self.cornerStyle.cornerRadius, style: .continuous) + .fill(backgroundColor) + ) + } + +} + +extension MSButton { + + public func primary(_ cornerStyle: CornerStyle = .squared, + isBrandColored: Bool = true) -> some View { + self.modifier(MSButtonPrimaryModifier(cornerStyle: cornerStyle, + isBrandColored: isBrandColored)) + } + +} + +#Preview("Rounded") { + MSButton(title: "버튼", image: .msIcon(.check)) + .primary(.rounded) +} + +#Preview("Squared") { + MSButton(title: "버튼", image: .msIcon(.check)) + .primary(.squared) +} diff --git a/iOS/MSFusion/Sources/MSSwiftUI/MSButton+Secondary.swift b/iOS/MSFusion/Sources/MSSwiftUI/MSButton+Secondary.swift new file mode 100644 index 0000000..cb4b8a0 --- /dev/null +++ b/iOS/MSFusion/Sources/MSSwiftUI/MSButton+Secondary.swift @@ -0,0 +1,55 @@ +// +// MSButton+Secondary.swift +// MSSwiftUI +// +// Created by 이창준 on 2024.02.20. +// + +import SwiftUI + +fileprivate struct MSButtonSecondaryModifier: ViewModifier { + + // MARK: - Properties + + private let cornerStyle: MSButton.CornerStyle + private let isBrandColored: Bool + + // MARK: - Initializer + + init(cornerStyle: MSButton.CornerStyle, isBrandColored: Bool) { + self.cornerStyle = cornerStyle + self.isBrandColored = isBrandColored + } + + // MARK: - Body + + public func body(content: Content) -> some View { + content + .foregroundStyle(Color.msColor(.secondaryButtonTypo)) + .background( + RoundedRectangle(cornerRadius: self.cornerStyle.cornerRadius, style: .continuous) + .fill(Color.msColor(.secondaryButtonBackground)) + ) + } + +} + +extension MSButton { + + public func secondary(_ cornerStyle: CornerStyle = .squared, + isBrandColored: Bool = true) -> some View { + self.modifier(MSButtonSecondaryModifier(cornerStyle: cornerStyle, + isBrandColored: isBrandColored)) + } + +} + +#Preview("Rounded") { + MSButton(title: "버튼", image: .msIcon(.check)) + .secondary(.rounded) +} + +#Preview("Squared") { + MSButton(title: "버튼", image: .msIcon(.check)) + .secondary(.squared) +} diff --git a/iOS/MSFusion/Sources/MSSwiftUI/MSButton.swift b/iOS/MSFusion/Sources/MSSwiftUI/MSButton.swift new file mode 100644 index 0000000..f87af6b --- /dev/null +++ b/iOS/MSFusion/Sources/MSSwiftUI/MSButton.swift @@ -0,0 +1,68 @@ +// +// SwiftUIView.swift +// MSSwiftUI +// +// Created by 이창준 on 2024.02.19. +// + +import SwiftUI + +import MSDesignSystem + +struct MSButton: View { + + // MARK: - Constants + + private enum Metric { + static let height: CGFloat = 60.0 + static let horizontalEdgeInsets: CGFloat = 58.0 + static let verticalEdgeInsets: CGFloat = 10.0 + static let imagePadding: CGFloat = 8.0 + } + + // MARK: - Properties + + private var title: String? + private var image: Image? + private let action: (() -> Void)? + + // MARK: - Initializer + + public init(title: String? = nil, + image: Image? = nil, + action: (() -> Void)? = nil) { + self.title = title + self.image = image + self.action = action + } + + // MARK: - Body + + var body: some View { + Button { + self.action?() + } label: { + HStack(spacing: Metric.imagePadding) { + if let image = self.image { + image + } + if let title = self.title { + Text(title) + } + } + .padding(.horizontal, Metric.horizontalEdgeInsets) + .padding(.vertical, Metric.verticalEdgeInsets) + } + .font(.msFont(.buttonTitle)) + .frame(height: Metric.height) + } + +} + +#Preview { + let button = MSButton(title: "버튼", + image: .msIcon(.check)) { + print("Hello World!") + } + return button +} diff --git a/iOS/MSFusion/Sources/MSSwiftUI/placeholder.swift b/iOS/MSFusion/Sources/MSSwiftUI/placeholder.swift deleted file mode 100644 index ca2469e..0000000 --- a/iOS/MSFusion/Sources/MSSwiftUI/placeholder.swift +++ /dev/null @@ -1,8 +0,0 @@ -// -// File.swift -// -// -// Created by 이창준 on 2024.02.19. -// - -import Foundation diff --git a/iOS/MSFusion/Sources/MSUIKit/MSButton/MSButton.swift b/iOS/MSFusion/Sources/MSUIKit/MSButton/MSButton.swift index 2d0d448..9d4e75e 100644 --- a/iOS/MSFusion/Sources/MSUIKit/MSButton/MSButton.swift +++ b/iOS/MSFusion/Sources/MSUIKit/MSButton/MSButton.swift @@ -23,7 +23,6 @@ public class MSButton: UIButton { case .custom(let cornerRadius): return cornerRadius } } - } // MARK: - Constants From 30695646d44212af7fafe40466dd1e00c8eb625e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Junnos=20=EF=A3=BF?= Date: Tue, 20 Feb 2024 00:51:32 +0900 Subject: [PATCH 4/5] =?UTF-8?q?:truck:=20MSButton=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EB=93=A4=20=EB=94=94=EB=A0=89=ED=86=A0=EB=A6=AC=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/MSSwiftUI/{ => MSButton}/MSButton+CornerStyle.swift | 0 .../Sources/MSSwiftUI/{ => MSButton}/MSButton+Primary.swift | 0 .../Sources/MSSwiftUI/{ => MSButton}/MSButton+Secondary.swift | 0 iOS/MSFusion/Sources/MSSwiftUI/{ => MSButton}/MSButton.swift | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename iOS/MSFusion/Sources/MSSwiftUI/{ => MSButton}/MSButton+CornerStyle.swift (100%) rename iOS/MSFusion/Sources/MSSwiftUI/{ => MSButton}/MSButton+Primary.swift (100%) rename iOS/MSFusion/Sources/MSSwiftUI/{ => MSButton}/MSButton+Secondary.swift (100%) rename iOS/MSFusion/Sources/MSSwiftUI/{ => MSButton}/MSButton.swift (100%) diff --git a/iOS/MSFusion/Sources/MSSwiftUI/MSButton+CornerStyle.swift b/iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+CornerStyle.swift similarity index 100% rename from iOS/MSFusion/Sources/MSSwiftUI/MSButton+CornerStyle.swift rename to iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+CornerStyle.swift diff --git a/iOS/MSFusion/Sources/MSSwiftUI/MSButton+Primary.swift b/iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+Primary.swift similarity index 100% rename from iOS/MSFusion/Sources/MSSwiftUI/MSButton+Primary.swift rename to iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+Primary.swift diff --git a/iOS/MSFusion/Sources/MSSwiftUI/MSButton+Secondary.swift b/iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+Secondary.swift similarity index 100% rename from iOS/MSFusion/Sources/MSSwiftUI/MSButton+Secondary.swift rename to iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+Secondary.swift diff --git a/iOS/MSFusion/Sources/MSSwiftUI/MSButton.swift b/iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton.swift similarity index 100% rename from iOS/MSFusion/Sources/MSSwiftUI/MSButton.swift rename to iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton.swift From e7a851c6116c45504d4a1bd0baeaccd98c5697d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Junnos=20=EF=A3=BF?= Date: Tue, 20 Feb 2024 01:01:43 +0900 Subject: [PATCH 5/5] =?UTF-8?q?:bug:=20MSButton=EC=97=90=20MSDesignSystem?= =?UTF-8?q?=20import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+Primary.swift | 2 ++ .../Sources/MSSwiftUI/MSButton/MSButton+Secondary.swift | 2 ++ 2 files changed, 4 insertions(+) diff --git a/iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+Primary.swift b/iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+Primary.swift index 249853e..a426af7 100644 --- a/iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+Primary.swift +++ b/iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+Primary.swift @@ -7,6 +7,8 @@ import SwiftUI +import MSDesignSystem + fileprivate struct MSButtonPrimaryModifier: ViewModifier { // MARK: - Properties diff --git a/iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+Secondary.swift b/iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+Secondary.swift index cb4b8a0..4f710bc 100644 --- a/iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+Secondary.swift +++ b/iOS/MSFusion/Sources/MSSwiftUI/MSButton/MSButton+Secondary.swift @@ -7,6 +7,8 @@ import SwiftUI +import MSDesignSystem + fileprivate struct MSButtonSecondaryModifier: ViewModifier { // MARK: - Properties