Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

토스트 디자인 구현 #126

Merged
merged 12 commits into from
Mar 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions DesignSystemApp/Assets.xcassets/AccentColor.colorset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"colors" : [
{
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
13 changes: 13 additions & 0 deletions DesignSystemApp/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"images" : [
{
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
6 changes: 6 additions & 0 deletions DesignSystemApp/Assets.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
26 changes: 26 additions & 0 deletions DesignSystemApp/ContentView.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// ContentView.swift
// DesignSystemApp
//
// Created by 홍승현 on 3/24/24.
//

import DesignSystem
import SwiftUI

struct ContentView: View {
var body: some View {
VStack {
Button("Toast!") {
Toast.shared.present(title: "Airpods Pro", symbol: "airpodspro", isUserInteractionEnabled: true)
}
}
.padding()
}
}

#Preview {
RootView {
ContentView()
}
}
20 changes: 20 additions & 0 deletions DesignSystemApp/DesignSystemApp.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//
// DesignSystemApp.swift
// DesignSystemApp
//
// Created by 홍승현 on 3/24/24.
//

import DesignSystem
import SwiftUI

@main
struct DesignSystemApp: App {
var body: some Scene {
WindowGroup {
RootView {
ContentView()
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
187 changes: 186 additions & 1 deletion PyeonHaeng-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@
BAA4D9AF2B5A1795005999F8 /* SplashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA4D9AE2B5A1795005999F8 /* SplashView.swift */; };
BAA4D9B12B5A1796005999F8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BAA4D9B02B5A1796005999F8 /* Assets.xcassets */; };
BAA4D9B42B5A1796005999F8 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BAA4D9B32B5A1796005999F8 /* Preview Assets.xcassets */; };
BAAF1D292BAFF1910001EA36 /* DesignSystemApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAAF1D282BAFF1910001EA36 /* DesignSystemApp.swift */; };
BAAF1D2B2BAFF1910001EA36 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAAF1D2A2BAFF1910001EA36 /* ContentView.swift */; };
BAAF1D2D2BAFF1920001EA36 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BAAF1D2C2BAFF1920001EA36 /* Assets.xcassets */; };
BAAF1D302BAFF1920001EA36 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BAAF1D2F2BAFF1920001EA36 /* Preview Assets.xcassets */; };
BAAF1D362BAFFA340001EA36 /* DesignSystem in Frameworks */ = {isa = PBXBuildFile; productRef = BAAF1D352BAFFA340001EA36 /* DesignSystem */; };
BAB569612B639F3000D1E0F9 /* DesignSystem in Frameworks */ = {isa = PBXBuildFile; productRef = BAB569602B639F3000D1E0F9 /* DesignSystem */; };
BAB5CF252B6B7C5A008B24BF /* Services.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB5CF242B6B7C5A008B24BF /* Services.swift */; };
BAB5CF272B6B7CF3008B24BF /* HomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB5CF262B6B7CF3008B24BF /* HomeViewModel.swift */; };
Expand Down Expand Up @@ -122,6 +127,11 @@
BAA4D9AE2B5A1795005999F8 /* SplashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashView.swift; sourceTree = "<group>"; };
BAA4D9B02B5A1796005999F8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
BAA4D9B32B5A1796005999F8 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
BAAF1D262BAFF1910001EA36 /* DesignSystemApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DesignSystemApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
BAAF1D282BAFF1910001EA36 /* DesignSystemApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DesignSystemApp.swift; sourceTree = "<group>"; };
BAAF1D2A2BAFF1910001EA36 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
BAAF1D2C2BAFF1920001EA36 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
BAAF1D2F2BAFF1920001EA36 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
BAB5CF242B6B7C5A008B24BF /* Services.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Services.swift; sourceTree = "<group>"; };
BAB5CF262B6B7CF3008B24BF /* HomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewModel.swift; sourceTree = "<group>"; };
BAB720332B9325F200C2CA1A /* PromotionSelectBottomSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromotionSelectBottomSheetView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -175,6 +185,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
BAAF1D232BAFF1910001EA36 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
BAAF1D362BAFFA340001EA36 /* DesignSystem in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand Down Expand Up @@ -379,6 +397,7 @@
BABFEA6F2B6399C30084C0EC /* Shared */,
BA0564032B6219D4003D6DC7 /* APIService */,
BA0564022B62179A003D6DC7 /* Core */,
BAAF1D272BAFF1910001EA36 /* DesignSystemApp */,
BAA4D9AA2B5A1795005999F8 /* Products */,
BAA4D9AB2B5A1795005999F8 /* PyeonHaeng-iOS */,
BA28F17A2B6155450052855E /* PyeonHaeng-iOSTests */,
Expand All @@ -392,6 +411,7 @@
children = (
BAA4D9A92B5A1795005999F8 /* PyeonHaeng-iOS.app */,
BA28F1792B6155450052855E /* PyeonHaeng-iOSTests.xctest */,
BAAF1D262BAFF1910001EA36 /* DesignSystemApp.app */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -434,6 +454,25 @@
path = View;
sourceTree = "<group>";
};
BAAF1D272BAFF1910001EA36 /* DesignSystemApp */ = {
isa = PBXGroup;
children = (
BAAF1D282BAFF1910001EA36 /* DesignSystemApp.swift */,
BAAF1D2A2BAFF1910001EA36 /* ContentView.swift */,
BAAF1D2C2BAFF1920001EA36 /* Assets.xcassets */,
BAAF1D2E2BAFF1920001EA36 /* Preview Content */,
);
path = DesignSystemApp;
sourceTree = "<group>";
};
BAAF1D2E2BAFF1920001EA36 /* Preview Content */ = {
isa = PBXGroup;
children = (
BAAF1D2F2BAFF1920001EA36 /* Preview Assets.xcassets */,
);
path = "Preview Content";
sourceTree = "<group>";
};
BAB8C3AB2BAC7A09003DF3CC /* LeaveReview */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -514,14 +553,34 @@
productReference = BAA4D9A92B5A1795005999F8 /* PyeonHaeng-iOS.app */;
productType = "com.apple.product-type.application";
};
BAAF1D252BAFF1910001EA36 /* DesignSystemApp */ = {
isa = PBXNativeTarget;
buildConfigurationList = BAAF1D342BAFF1920001EA36 /* Build configuration list for PBXNativeTarget "DesignSystemApp" */;
buildPhases = (
BAAF1D222BAFF1910001EA36 /* Sources */,
BAAF1D232BAFF1910001EA36 /* Frameworks */,
BAAF1D242BAFF1910001EA36 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = DesignSystemApp;
packageProductDependencies = (
BAAF1D352BAFFA340001EA36 /* DesignSystem */,
);
productName = DesignSystemApp;
productReference = BAAF1D262BAFF1910001EA36 /* DesignSystemApp.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
BAA4D9A12B5A1795005999F8 /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1520;
LastSwiftUpdateCheck = 1530;
LastUpgradeCheck = 1520;
TargetAttributes = {
BA28F1782B6155450052855E = {
Expand All @@ -531,6 +590,9 @@
BAA4D9A82B5A1795005999F8 = {
CreatedOnToolsVersion = 15.2;
};
BAAF1D252BAFF1910001EA36 = {
CreatedOnToolsVersion = 15.3;
};
};
};
buildConfigurationList = BAA4D9A42B5A1795005999F8 /* Build configuration list for PBXProject "PyeonHaeng-iOS" */;
Expand All @@ -550,6 +612,7 @@
targets = (
BAA4D9A82B5A1795005999F8 /* PyeonHaeng-iOS */,
BA28F1782B6155450052855E /* PyeonHaeng-iOSTests */,
BAAF1D252BAFF1910001EA36 /* DesignSystemApp */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -583,6 +646,15 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
BAAF1D242BAFF1910001EA36 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BAAF1D302BAFF1920001EA36 /* Preview Assets.xcassets in Resources */,
BAAF1D2D2BAFF1920001EA36 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -680,6 +752,15 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
BAAF1D222BAFF1910001EA36 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BAAF1D2B2BAFF1910001EA36 /* ContentView.swift in Sources */,
BAAF1D292BAFF1910001EA36 /* DesignSystemApp.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
Expand Down Expand Up @@ -1036,6 +1117,96 @@
};
name = Release;
};
BAAF1D312BAFF1920001EA36 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"DesignSystemApp/Preview Content\"";
DEVELOPMENT_TEAM = 2ZQR76M3UH;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 17.4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.pyeonhaeng.DesignSystemApp;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
BAAF1D322BAFF1920001EA36 /* Staging */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"DesignSystemApp/Preview Content\"";
DEVELOPMENT_TEAM = 2ZQR76M3UH;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 17.4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.pyeonhaeng.DesignSystemApp;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Staging;
};
BAAF1D332BAFF1920001EA36 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"DesignSystemApp/Preview Content\"";
DEVELOPMENT_TEAM = 2ZQR76M3UH;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 17.4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.pyeonhaeng.DesignSystemApp;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand Down Expand Up @@ -1069,6 +1240,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
BAAF1D342BAFF1920001EA36 /* Build configuration list for PBXNativeTarget "DesignSystemApp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
BAAF1D312BAFF1920001EA36 /* Debug */,
BAAF1D322BAFF1920001EA36 /* Staging */,
BAAF1D332BAFF1920001EA36 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
/* End XCConfigurationList section */

/* Begin XCSwiftPackageProductDependency section */
Expand Down Expand Up @@ -1100,6 +1281,10 @@
isa = XCSwiftPackageProductDependency;
productName = NoticeAPISupport;
};
BAAF1D352BAFFA340001EA36 /* DesignSystem */ = {
isa = XCSwiftPackageProductDependency;
productName = DesignSystem;
};
BAB569602B639F3000D1E0F9 /* DesignSystem */ = {
isa = XCSwiftPackageProductDependency;
productName = DesignSystem;
Expand Down
Loading