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.

Sign up for GitHub

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

Jump to bottom

[FEAT] #18 - 명함생성 뷰 텍스트필드 기능 구현 #27

Merged
merged 1 commit into from
Oct 5, 2021
Merged

[FEAT] #18 - 명함생성 뷰 텍스트필드 기능 구현 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 4 additions & 20 deletions NADA-iOS-forRelease.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
3979709626FA0BE5003FB4F5 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3979709526FA0BE5003FB4F5 /* LoginViewController.swift */; };
3979709826FA0BF0003FB4F5 /* Login.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3979709726FA0BF0003FB4F5 /* Login.storyboard */; };
DBBB91E1639641F40C5B4416 /* Pods_NADA_iOS_forRelease.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */; };
F822E7A92709CEB60020452C /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F822E7A82709CEB60020452C /* Notification.swift */; };
F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */; };
F82FF8252702000000E57F8B /* RequiredFlavorCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F82FF8232702000000E57F8B /* RequiredFlavorCollectionViewCell.swift */; };
F82FF8262702000000E57F8B /* RequiredFlavorCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F82FF8242702000000E57F8B /* RequiredFlavorCollectionViewCell.xib */; };
Expand All @@ -37,11 +38,8 @@
F8F5D0AA270800FD00D99D2E /* Xib.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8F5D0A9270800FD00D99D2E /* Xib.swift */; };
F8FC438626C01CDD0033E151 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC438526C01CDD0033E151 /* AppDelegate.swift */; };
F8FC438826C01CDD0033E151 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC438726C01CDD0033E151 /* SceneDelegate.swift */; };
F8FC438A26C01CDD0033E151 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC438926C01CDD0033E151 /* MainViewController.swift */; };
F8FC438D26C01CDD0033E151 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8FC438B26C01CDD0033E151 /* Main.storyboard */; };
F8FC438F26C01CDE0033E151 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F8FC438E26C01CDE0033E151 /* Assets.xcassets */; };
F8FC439226C01CDE0033E151 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8FC439026C01CDE0033E151 /* LaunchScreen.storyboard */; };
F8FC43A726C020780033E151 /* TempExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC43A626C020780033E151 /* TempExtensions.swift */; };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오 제가 빼려했는데 빼주셨군요 감사합니다 ><

F8FC43A926C0207F0033E151 /* TempFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC43A826C0207F0033E151 /* TempFont.swift */; };
F8FC43AD26C020940033E151 /* TempClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC43AC26C020940033E151 /* TempClass.swift */; };
F8FC43AF26C0209A0033E151 /* TempModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC43AE26C0209A0033E151 /* TempModel.swift */; };
Expand Down Expand Up @@ -72,6 +70,7 @@
3979709726FA0BF0003FB4F5 /* Login.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Login.storyboard; sourceTree = "<group>"; };
4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NADA_iOS_forRelease.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7F4EE1D042EC783FA8528743 /* Pods-NADA-iOS-forRelease.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.debug.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.debug.xcconfig"; sourceTree = "<group>"; };
F822E7A82709CEB60020452C /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = "<group>"; };
F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardCreation.storyboard; sourceTree = "<group>"; };
F82FF8232702000000E57F8B /* RequiredFlavorCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequiredFlavorCollectionViewCell.swift; sourceTree = "<group>"; };
F82FF8242702000000E57F8B /* RequiredFlavorCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RequiredFlavorCollectionViewCell.xib; sourceTree = "<group>"; };
Expand All @@ -88,12 +87,9 @@
F8FC438226C01CDD0033E151 /* NADA-iOS-forRelease.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "NADA-iOS-forRelease.app"; sourceTree = BUILT_PRODUCTS_DIR; };
F8FC438526C01CDD0033E151 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
F8FC438726C01CDD0033E151 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
F8FC438926C01CDD0033E151 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
F8FC438C26C01CDD0033E151 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
F8FC438E26C01CDE0033E151 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
F8FC439126C01CDE0033E151 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
F8FC439326C01CDE0033E151 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F8FC43A626C020780033E151 /* TempExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempExtensions.swift; sourceTree = "<group>"; };
F8FC43A826C0207F0033E151 /* TempFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempFont.swift; sourceTree = "<group>"; };
F8FC43AC26C020940033E151 /* TempClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempClass.swift; sourceTree = "<group>"; };
F8FC43AE26C0209A0033E151 /* TempModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -356,7 +352,6 @@
F84BAFB326FDB8AA004CA335 /* CardCreation */,
39523E072701848E00536900 /* CardList */,
3979709426FA0BD8003FB4F5 /* Login */,
F8FC438926C01CDD0033E151 /* MainViewController.swift */,
);
path = ViewControllers;
sourceTree = "<group>";
Expand All @@ -375,7 +370,6 @@
394F314D27081B4100C83291 /* Main */,
F84BAF9E26FDB425004CA335 /* CardCreation */,
F8FC439026C01CDE0033E151 /* LaunchScreen.storyboard */,
F8FC438B26C01CDD0033E151 /* Main.storyboard */,
3979709726FA0BF0003FB4F5 /* Login.storyboard */,
39523E0A270184B100536900 /* CardList.storyboard */,
);
Expand All @@ -390,14 +384,14 @@
F8FC43BB26C022A20033E151 /* Storyboard.swift */,
390515B92706D29B00C5F7A5 /* Color.swift */,
F8F5D0A9270800FD00D99D2E /* Xib.swift */,
F822E7A82709CEB60020452C /* Notification.swift */,
);
path = Constants;
sourceTree = "<group>";
};
F8FC43A426C01F5B0033E151 /* Extensions */ = {
isa = PBXGroup;
children = (
F8FC43A626C020780033E151 /* TempExtensions.swift */,
3909242E26FA15E800236C51 /* UIView+Extension.swift */,
39488E342706E17200BDC917 /* UIAlertController+Extension.swift */,
39007F2B27080D8200E7143E /* UIViewController+Extension.swift */,
Expand Down Expand Up @@ -485,7 +479,6 @@
F8FC439226C01CDE0033E151 /* LaunchScreen.storyboard in Resources */,
F8FC438F26C01CDE0033E151 /* Assets.xcassets in Resources */,
39523E0B270184B100536900 /* CardList.storyboard in Resources */,
F8FC438D26C01CDD0033E151 /* Main.storyboard in Resources */,
F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */,
390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */,
);
Expand Down Expand Up @@ -560,15 +553,13 @@
F84BAF9D26FDB417004CA335 /* CardCreationViewController.swift in Sources */,
F8FC43B126C020A70033E151 /* TempNetwork.swift in Sources */,
F858079E2700354E00872484 /* BackgroundCollectionViewCell.swift in Sources */,
F8FC438A26C01CDD0033E151 /* MainViewController.swift in Sources */,
39007F2C27080D8200E7143E /* UIViewController+Extension.swift in Sources */,
3909242F26FA15E800236C51 /* UIView+Extension.swift in Sources */,
39523E09270184A700536900 /* CardListViewController.swift in Sources */,
F83206AA26F61E3700D61711 /* FrontCardCell.swift in Sources */,
3979709626FA0BE5003FB4F5 /* LoginViewController.swift in Sources */,
39488E352706E17200BDC917 /* UIAlertController+Extension.swift in Sources */,
F8FC43AF26C0209A0033E151 /* TempModel.swift in Sources */,
F8FC43A726C020780033E151 /* TempExtensions.swift in Sources */,
F8FC43B826C0227D0033E151 /* Const.swift in Sources */,
394F314C27081B3A00C83291 /* FrontViewController.swift in Sources */,
F8F5D0AA270800FD00D99D2E /* Xib.swift in Sources */,
Expand All @@ -583,6 +574,7 @@
F84BAFB126FDB552004CA335 /* BackCardCreationCollectionViewCell.swift in Sources */,
F8FC43BC26C022A20033E151 /* Storyboard.swift in Sources */,
F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */,
F822E7A92709CEB60020452C /* Notification.swift in Sources */,
F8FC43A926C0207F0033E151 /* TempFont.swift in Sources */,
F8FC438626C01CDD0033E151 /* AppDelegate.swift in Sources */,
F8FC438826C01CDD0033E151 /* SceneDelegate.swift in Sources */,
Expand All @@ -592,14 +584,6 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
F8FC438B26C01CDD0033E151 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
F8FC438C26C01CDD0033E151 /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
F8FC439026C01CDE0033E151 /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
Expand Down
13 changes: 13 additions & 0 deletions NADA-iOS-forRelease/Resouces/Constants/Notification.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// Notification.swift
// NADA-iOS-forRelease
//
// Created by kimhyungyu on 2021/10/03.
//

import Foundation

extension Notification.Name {
static let frontCardtextFieldIsEmpty = Notification.Name("frontCardtextFieldIsEmpty")
static let backCardtextFieldIsEmpty = Notification.Name("backCardtextFieldIsEmpty")
}
1 change: 0 additions & 1 deletion NADA-iOS-forRelease/Resouces/Constants/Storyboard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ extension Const {
struct Storyboard {

struct Name {
static let Main = "Main"
static let CardCreation = "CardCreation"
static let Login = "Login"
static let CardList = "CardList"
Expand Down
1 change: 0 additions & 1 deletion NADA-iOS-forRelease/Resouces/Constants/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ extension Const {
struct ViewController {

struct Identifier {
static let MainViewController = "MainViewController"
static let CardCreationViewController = "CardCreationViewController"
static let LoginViewController = "LoginViewController"
static let CardListViewController = "CardListViewController"
Expand Down
8 changes: 0 additions & 8 deletions NADA-iOS-forRelease/Resouces/Extensions/TempExtensions.swift
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions NADA-iOS-forRelease/Resouces/Storyboards/Base.lproj/Main.storyboard
View file
Open in desktop

This file was deleted.

16 changes: 8 additions & 8 deletions NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreation.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tbX-yg-azh">
<rect key="frame" x="28" y="67" width="42" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<rect key="frame" x="28" y="67" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeo-Regular" family="Apple SD Gothic Neo" pointSize="0.0"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q7k-m0-xi2">
<rect key="frame" x="28" y="111" width="42" height="21"/>
<rect key="frame" x="28" y="90" width="42" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yP6-6Y-BPF">
<rect key="frame" x="100" y="111" width="42" height="21"/>
<rect key="frame" x="100" y="90" width="42" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="KAZ-zy-W47">
<rect key="frame" x="28" y="135" width="114" height="2"/>
<rect key="frame" x="28" y="114" width="114" height="2"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="2" id="5a5-lK-ETW"/>
Expand Down Expand Up @@ -68,13 +68,13 @@
</connections>
</button>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" horizontalHuggingPriority="1000" verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="SCY-6J-7gG">
<rect key="frame" x="0.0" y="155" width="414" height="635"/>
<rect key="frame" x="0.0" y="134" width="414" height="656"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wd4-Tx-rSs">
<rect key="frame" x="0.0" y="0.0" width="414" height="635"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="656"/>
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="PLB-cM-M8s">
<rect key="frame" x="0.0" y="0.0" width="414" height="635"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="656"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="RWl-ol-Bps">
<size key="itemSize" width="128" height="128"/>
Expand Down
1 change: 0 additions & 1 deletion NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class FrontCardCell: CardCell {
// MARK: - Life Cycle
override func awakeFromNib() {
super.awakeFromNib()

setUI()
}

Expand Down
Loading