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

feat: 명함 만들기 UI 구현 (#372) #375

Merged
merged 14 commits into from
Mar 8, 2023
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
30 changes: 26 additions & 4 deletions NADA-iOS-forRelease.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
F838B66E298E5C5400D84340 /* Widgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F838B66A298E5C5300D84340 /* Widgets.intentdefinition */; };
F838B66F298E5C5400D84340 /* Widgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F838B66A298E5C5300D84340 /* Widgets.intentdefinition */; };
F838B672298E5C5400D84340 /* WidgetsExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = F838B65E298E5C5300D84340 /* WidgetsExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
F843DD6D29A5F83000D8D20D /* CardCreationCategoryViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F843DD6C29A5F83000D8D20D /* CardCreationCategoryViewModel.swift */; };
F84BAF9D26FDB417004CA335 /* CardCreationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84BAF9C26FDB417004CA335 /* CardCreationViewController.swift */; };
F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84BAFAB26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift */; };
F84BAFAE26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F84BAFAC26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib */; };
Expand All @@ -128,6 +129,7 @@
F8518055275D040C006BD5ED /* OnboardingCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F8518053275D040C006BD5ED /* OnboardingCollectionViewCell.xib */; };
F8518058275D042B006BD5ED /* Onboarding.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8518057275D042B006BD5ED /* Onboarding.storyboard */; };
F851805B275D047C006BD5ED /* OnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F851805A275D047C006BD5ED /* OnboardingViewController.swift */; };
F855AEF129A3185000312D20 /* CardCreationCategoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F855AEF029A3185000312D20 /* CardCreationCategoryViewController.swift */; };
F8562C96296ADD1000DA1109 /* nearby.json in Resources */ = {isa = PBXBuildFile; fileRef = F8562C95296ADD1000DA1109 /* nearby.json */; };
F8562C98296ADD6700DA1109 /* Lottie.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8562C97296ADD6700DA1109 /* Lottie.swift */; };
F85711A5274A6B2200F59F0B /* CardCreationPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85711A4274A6B2200F59F0B /* CardCreationPreviewViewController.swift */; };
Expand Down Expand Up @@ -337,6 +339,7 @@
F838B66A298E5C5300D84340 /* Widgets.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = Widgets.intentdefinition; sourceTree = "<group>"; };
F838B66B298E5C5400D84340 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
F838B66D298E5C5400D84340 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F843DD6C29A5F83000D8D20D /* CardCreationCategoryViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCreationCategoryViewModel.swift; sourceTree = "<group>"; };
F84BAF9C26FDB417004CA335 /* CardCreationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCreationViewController.swift; sourceTree = "<group>"; };
F84BAFAB26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontCardCreationCollectionViewCell.swift; sourceTree = "<group>"; };
F84BAFAC26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FrontCardCreationCollectionViewCell.xib; sourceTree = "<group>"; };
Expand All @@ -346,6 +349,7 @@
F8518053275D040C006BD5ED /* OnboardingCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OnboardingCollectionViewCell.xib; sourceTree = "<group>"; };
F8518057275D042B006BD5ED /* Onboarding.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Onboarding.storyboard; sourceTree = "<group>"; };
F851805A275D047C006BD5ED /* OnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewController.swift; sourceTree = "<group>"; };
F855AEF029A3185000312D20 /* CardCreationCategoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCreationCategoryViewController.swift; sourceTree = "<group>"; };
F8562C95296ADD1000DA1109 /* nearby.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = nearby.json; sourceTree = "<group>"; };
F8562C97296ADD6700DA1109 /* Lottie.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Lottie.swift; sourceTree = "<group>"; };
F85711A4274A6B2200F59F0B /* CardCreationPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCreationPreviewViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -813,8 +817,8 @@
F84BAFB326FDB8AA004CA335 /* CardCreation */ = {
isa = PBXGroup;
children = (
F84BAF9C26FDB417004CA335 /* CardCreationViewController.swift */,
F85711A4274A6B2200F59F0B /* CardCreationPreviewViewController.swift */,
F885C8A929B827120079FA35 /* ViewModel */,
F885C8A829B827030079FA35 /* VC */,
);
path = CardCreation;
sourceTree = "<group>";
Expand Down Expand Up @@ -932,6 +936,24 @@
path = WidgetsBundle;
sourceTree = "<group>";
};
F885C8A829B827030079FA35 /* VC */ = {
isa = PBXGroup;
children = (
F84BAF9C26FDB417004CA335 /* CardCreationViewController.swift */,
F85711A4274A6B2200F59F0B /* CardCreationPreviewViewController.swift */,
F855AEF029A3185000312D20 /* CardCreationCategoryViewController.swift */,
);
path = VC;
sourceTree = "<group>";
};
F885C8A929B827120079FA35 /* ViewModel */ = {
isa = PBXGroup;
children = (
F843DD6C29A5F83000D8D20D /* CardCreationCategoryViewModel.swift */,
);
path = ViewModel;
sourceTree = "<group>";
};
F8915A1F275713A10013D609 /* CardCreation */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1532,6 +1554,7 @@
770E58862778A78900498C2E /* Status.swift in Sources */,
F851805B275D047C006BD5ED /* OnboardingViewController.swift in Sources */,
392BAF7B2793E90D0013DCB3 /* KeyChainKey.swift in Sources */,
F843DD6D29A5F83000D8D20D /* CardCreationCategoryViewModel.swift in Sources */,
39C1E88F270EC762006D2089 /* UIColor+Extension.swift in Sources */,
F8C83FC9272FA3190009DF0D /* GroupAPI.swift in Sources */,
F8FC43B826C0227D0033E151 /* Const.swift in Sources */,
Expand Down Expand Up @@ -1559,6 +1582,7 @@
39D88B6B274600B100A72164 /* CommonBottomSheetViewController.swift in Sources */,
7734D5B627779EF0004360E4 /* QRCodeView.swift in Sources */,
3918F66727719C4B00984648 /* UserReissueToken.swift in Sources */,
F855AEF129A3185000312D20 /* CardCreationCategoryViewController.swift in Sources */,
7705CF3E2752C7DB005195DF /* CardView.swift in Sources */,
F8FC43BA26C022900033E151 /* ViewController.swift in Sources */,
39D13568273FDCB800B1A148 /* UserWithTokenRequest.swift in Sources */,
Expand Down Expand Up @@ -2044,7 +2068,6 @@
isa = XCConfigurationList;
buildConfigurations = (
F8FC439426C01CDE0033E151 /* Debug */,
77B4E7402990DFB7006098DC /* Beta */,
F8FC439526C01CDE0033E151 /* Release */,
);
defaultConfigurationIsVisible = 0;
Expand All @@ -2054,7 +2077,6 @@
isa = XCConfigurationList;
buildConfigurations = (
F8FC439726C01CDE0033E151 /* Debug */,
77B4E7412990DFB7006098DC /* Beta */,
F8FC439826C01CDE0033E151 /* Release */,
);
defaultConfigurationIsVisible = 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"images" : [
{
"filename" : "icnBasic.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "icnBasicDark.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icnBasic@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "icnBasicDark@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icnBasic@3x.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "icnBasicDark@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"images" : [
{
"filename" : "icnFan.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "icnFanDark.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icnFan@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "icnFanDark@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icnFan@3x.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "icnFanDark@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"images" : [
{
"filename" : "icnOffice.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "icnOfficeDark.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icnOffice@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "icnOfficeDark@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icnOffice@3x.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "icnOfficeDark@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "215",
"green" : "209",
"red" : "202"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "55",
"green" : "49",
"red" : "45"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "239",
"green" : "232",
"red" : "224"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "79",
"green" : "70",
"red" : "64"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
28 changes: 28 additions & 0 deletions NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,34 @@ extension UIColor {
}
}

@nonobjc class var cardCreationUnclicked: UIColor {
if #available(iOS 13, *) {
return UIColor { (traitCollection: UITraitCollection) -> UIColor in
if traitCollection.userInterfaceStyle == .light {
return UIColor(red: 224.0 / 255.0, green: 232 / 255.0, blue: 239.0 / 255.0, alpha: 1.0)
} else {
return UIColor(red: 64.0 / 255.0, green: 70 / 255.0, blue: 79 / 255.0, alpha: 1.0)
}
}
} else {
return UIColor(red: 224.0 / 255.0, green: 232 / 255.0, blue: 239.0 / 255.0, alpha: 1.0)
}
}

@nonobjc class var cardCreationClicked: UIColor {
if #available(iOS 13, *) {
return UIColor { (traitCollection: UITraitCollection) -> UIColor in
if traitCollection.userInterfaceStyle == .light {
return UIColor(red: 202.0 / 255.0, green: 209 / 255.0, blue: 215.0 / 255.0, alpha: 1.0)
} else {
return UIColor(red: 45.0 / 255.0, green: 49 / 255.0, blue: 55 / 255.0, alpha: 1.0)
}
}
} else {
return UIColor(red: 224.0 / 255.0, green: 232 / 255.0, blue: 239.0 / 255.0, alpha: 1.0)
}
}

@nonobjc class var harmonyRed: UIColor {
return UIColor(red: 239.0 / 255.0, green: 115.0 / 255.0, blue: 115.0 / 255.0, alpha: 1.0)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" image="iconAdd"/>
<connections>
<action selector="presentToCardCreationView:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="tBz-L2-36C"/>
<action selector="presentToCardCreationCategoryViewController:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="oLw-lM-0Eu"/>
</connections>
</button>
</subviews>
Expand Down
Loading