From b705e45e0847e3932c27099aa8f65bbd5355fe06 Mon Sep 17 00:00:00 2001 From: hyungyu Kim Date: Sat, 2 Oct 2021 12:35:53 +0900 Subject: [PATCH] =?UTF-8?q?[#22]=20initializer=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=20=EC=BB=A8=EB=B0=B4=EC=85=98=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EC=B6=B0=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EB=B0=8F=20cell=20=EB=A6=AC=ED=8E=99=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Descriptions - 메서드명 prefix 를 'init' 으로 수정 - 셀마다 nib() 메서드 생성 - Xib 구조체 만들어서 상수로 identifier 다룸 ### Related Issue close #22 --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 78 ++++++++++--------- .../Resouces/Constants/Xib.swift | 19 +++++ .../Cells/CardCell/FrontCardCell.swift | 4 +- .../CardList/CardListTableViewCell.swift | 4 +- ... BackCardCreationCollectionViewCell.swift} | 24 +++--- ...=> BackCardCreationCollectionViewCell.xib} | 2 +- .../BackgroundCollectionViewCell.swift} | 10 +-- .../BackgroundCollectionViewCell.xib} | 2 +- ...FrontCardCreationCollectionViewCell.swift} | 24 +++--- ...> FrontCardCreationCollectionViewCell.xib} | 4 +- ...=> RequiredFlavorCollectionViewCell.swift} | 11 ++- ...b => RequiredFlavorCollectionViewCell.xib} | 4 +- .../Sources/SceneDelegate.swift | 2 +- .../CardCreationViewController.swift | 12 ++- .../CardList/CardListViewController.swift | 4 +- 15 files changed, 112 insertions(+), 92 deletions(-) create mode 100644 NADA-iOS-forRelease/Resouces/Constants/Xib.swift rename NADA-iOS-forRelease/Sources/Cells/CreationCard/{BackCardCreationCell.swift => BackCardCreationCollectionViewCell.swift} (84%) rename NADA-iOS-forRelease/Sources/Cells/CreationCard/{BackCardCreationCell.xib => BackCardCreationCollectionViewCell.xib} (99%) rename NADA-iOS-forRelease/Sources/Cells/CreationCard/{CardBackgroundSetting/CardBackgroundSettingCell.swift => Background/BackgroundCollectionViewCell.swift} (82%) rename NADA-iOS-forRelease/Sources/Cells/CreationCard/{CardBackgroundSetting/CardBackgroundSettingCell.xib => Background/BackgroundCollectionViewCell.xib} (97%) rename NADA-iOS-forRelease/Sources/Cells/CreationCard/{FrontCardCreationCell.swift => FrontCardCreationCollectionViewCell.swift} (88%) rename NADA-iOS-forRelease/Sources/Cells/CreationCard/{FrontCardCreationCell.xib => FrontCardCreationCollectionViewCell.xib} (99%) rename NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/{RequiredFlavorCell.swift => RequiredFlavorCollectionViewCell.swift} (75%) rename NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/{RequiredFlavorCell.xib => RequiredFlavorCollectionViewCell.xib} (97%) diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index d6b81646..9f85247b 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -19,17 +19,18 @@ 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 */; }; F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */; }; - F82FF8252702000000E57F8B /* RequiredFlavorCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F82FF8232702000000E57F8B /* RequiredFlavorCell.swift */; }; - F82FF8262702000000E57F8B /* RequiredFlavorCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F82FF8242702000000E57F8B /* RequiredFlavorCell.xib */; }; + F82FF8252702000000E57F8B /* RequiredFlavorCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F82FF8232702000000E57F8B /* RequiredFlavorCollectionViewCell.swift */; }; + F82FF8262702000000E57F8B /* RequiredFlavorCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F82FF8242702000000E57F8B /* RequiredFlavorCollectionViewCell.xib */; }; F83206AA26F61E3700D61711 /* FrontCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F83206A826F61E3700D61711 /* FrontCardCell.swift */; }; F83206AB26F61E3700D61711 /* FrontCardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F83206A926F61E3700D61711 /* FrontCardCell.xib */; }; F84BAF9D26FDB417004CA335 /* CardCreationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84BAF9C26FDB417004CA335 /* CardCreationViewController.swift */; }; - F84BAFAD26FDB543004CA335 /* FrontCardCreationCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84BAFAB26FDB543004CA335 /* FrontCardCreationCell.swift */; }; - F84BAFAE26FDB543004CA335 /* FrontCardCreationCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F84BAFAC26FDB543004CA335 /* FrontCardCreationCell.xib */; }; - F84BAFB126FDB552004CA335 /* BackCardCreationCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84BAFAF26FDB552004CA335 /* BackCardCreationCell.swift */; }; - F84BAFB226FDB552004CA335 /* BackCardCreationCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F84BAFB026FDB552004CA335 /* BackCardCreationCell.xib */; }; - F858079E2700354E00872484 /* CardBackgroundSettingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F858079C2700354E00872484 /* CardBackgroundSettingCell.swift */; }; - F858079F2700354E00872484 /* CardBackgroundSettingCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F858079D2700354E00872484 /* CardBackgroundSettingCell.xib */; }; + F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84BAFAB26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift */; }; + F84BAFAE26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F84BAFAC26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib */; }; + F84BAFB126FDB552004CA335 /* BackCardCreationCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84BAFAF26FDB552004CA335 /* BackCardCreationCollectionViewCell.swift */; }; + F84BAFB226FDB552004CA335 /* BackCardCreationCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F84BAFB026FDB552004CA335 /* BackCardCreationCollectionViewCell.xib */; }; + F858079E2700354E00872484 /* BackgroundCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F858079C2700354E00872484 /* BackgroundCollectionViewCell.swift */; }; + F858079F2700354E00872484 /* BackgroundCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F858079D2700354E00872484 /* BackgroundCollectionViewCell.xib */; }; + 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 */; }; @@ -64,17 +65,18 @@ 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 = ""; }; F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardCreation.storyboard; sourceTree = ""; }; - F82FF8232702000000E57F8B /* RequiredFlavorCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequiredFlavorCell.swift; sourceTree = ""; }; - F82FF8242702000000E57F8B /* RequiredFlavorCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RequiredFlavorCell.xib; sourceTree = ""; }; + F82FF8232702000000E57F8B /* RequiredFlavorCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequiredFlavorCollectionViewCell.swift; sourceTree = ""; }; + F82FF8242702000000E57F8B /* RequiredFlavorCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RequiredFlavorCollectionViewCell.xib; sourceTree = ""; }; F83206A826F61E3700D61711 /* FrontCardCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontCardCell.swift; sourceTree = ""; }; F83206A926F61E3700D61711 /* FrontCardCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FrontCardCell.xib; sourceTree = ""; }; F84BAF9C26FDB417004CA335 /* CardCreationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCreationViewController.swift; sourceTree = ""; }; - F84BAFAB26FDB543004CA335 /* FrontCardCreationCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontCardCreationCell.swift; sourceTree = ""; }; - F84BAFAC26FDB543004CA335 /* FrontCardCreationCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FrontCardCreationCell.xib; sourceTree = ""; }; - F84BAFAF26FDB552004CA335 /* BackCardCreationCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackCardCreationCell.swift; sourceTree = ""; }; - F84BAFB026FDB552004CA335 /* BackCardCreationCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BackCardCreationCell.xib; sourceTree = ""; }; - F858079C2700354E00872484 /* CardBackgroundSettingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardBackgroundSettingCell.swift; sourceTree = ""; }; - F858079D2700354E00872484 /* CardBackgroundSettingCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CardBackgroundSettingCell.xib; sourceTree = ""; }; + F84BAFAB26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontCardCreationCollectionViewCell.swift; sourceTree = ""; }; + F84BAFAC26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FrontCardCreationCollectionViewCell.xib; sourceTree = ""; }; + F84BAFAF26FDB552004CA335 /* BackCardCreationCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackCardCreationCollectionViewCell.swift; sourceTree = ""; }; + F84BAFB026FDB552004CA335 /* BackCardCreationCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BackCardCreationCollectionViewCell.xib; sourceTree = ""; }; + F858079C2700354E00872484 /* BackgroundCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundCollectionViewCell.swift; sourceTree = ""; }; + F858079D2700354E00872484 /* BackgroundCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BackgroundCollectionViewCell.xib; sourceTree = ""; }; + F8F5D0A9270800FD00D99D2E /* Xib.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Xib.swift; sourceTree = ""; }; 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 = ""; }; F8FC438726C01CDD0033E151 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; @@ -161,8 +163,8 @@ F82FF8222701FFE300E57F8B /* RequiredFlavor */ = { isa = PBXGroup; children = ( - F82FF8232702000000E57F8B /* RequiredFlavorCell.swift */, - F82FF8242702000000E57F8B /* RequiredFlavorCell.xib */, + F82FF8232702000000E57F8B /* RequiredFlavorCollectionViewCell.swift */, + F82FF8242702000000E57F8B /* RequiredFlavorCollectionViewCell.xib */, ); path = RequiredFlavor; sourceTree = ""; @@ -188,11 +190,11 @@ isa = PBXGroup; children = ( F82FF8222701FFE300E57F8B /* RequiredFlavor */, - F858079B2700348000872484 /* CardBackgroundSetting */, - F84BAFAB26FDB543004CA335 /* FrontCardCreationCell.swift */, - F84BAFAC26FDB543004CA335 /* FrontCardCreationCell.xib */, - F84BAFAF26FDB552004CA335 /* BackCardCreationCell.swift */, - F84BAFB026FDB552004CA335 /* BackCardCreationCell.xib */, + F858079B2700348000872484 /* Background */, + F84BAFAB26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift */, + F84BAFAC26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib */, + F84BAFAF26FDB552004CA335 /* BackCardCreationCollectionViewCell.swift */, + F84BAFB026FDB552004CA335 /* BackCardCreationCollectionViewCell.xib */, ); path = CreationCard; sourceTree = ""; @@ -214,13 +216,13 @@ path = Assets; sourceTree = ""; }; - F858079B2700348000872484 /* CardBackgroundSetting */ = { + F858079B2700348000872484 /* Background */ = { isa = PBXGroup; children = ( - F858079C2700354E00872484 /* CardBackgroundSettingCell.swift */, - F858079D2700354E00872484 /* CardBackgroundSettingCell.xib */, + F858079C2700354E00872484 /* BackgroundCollectionViewCell.swift */, + F858079D2700354E00872484 /* BackgroundCollectionViewCell.xib */, ); - path = CardBackgroundSetting; + path = Background; sourceTree = ""; }; F8FC437926C01CDD0033E151 = { @@ -361,6 +363,7 @@ F8FC43B926C022900033E151 /* ViewController.swift */, F8FC43BB26C022A20033E151 /* Storyboard.swift */, 390515B92706D29B00C5F7A5 /* Color.swift */, + F8F5D0A9270800FD00D99D2E /* Xib.swift */, ); path = Constants; sourceTree = ""; @@ -443,12 +446,12 @@ buildActionMask = 2147483647; files = ( F8FC43BF26C025180033E151 /* .swiftlint.yml in Resources */, - F82FF8262702000000E57F8B /* RequiredFlavorCell.xib in Resources */, - F858079F2700354E00872484 /* CardBackgroundSettingCell.xib in Resources */, - F84BAFAE26FDB543004CA335 /* FrontCardCreationCell.xib in Resources */, + F82FF8262702000000E57F8B /* RequiredFlavorCollectionViewCell.xib in Resources */, + F858079F2700354E00872484 /* BackgroundCollectionViewCell.xib in Resources */, + F84BAFAE26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib in Resources */, F83206AB26F61E3700D61711 /* FrontCardCell.xib in Resources */, 3979709826FA0BF0003FB4F5 /* Login.storyboard in Resources */, - F84BAFB226FDB552004CA335 /* BackCardCreationCell.xib in Resources */, + F84BAFB226FDB552004CA335 /* BackCardCreationCollectionViewCell.xib in Resources */, 39523E5C2701A48900536900 /* CardListTableViewCell.xib in Resources */, F8FC439226C01CDE0033E151 /* LaunchScreen.storyboard in Resources */, F8FC438F26C01CDE0033E151 /* Assets.xcassets in Resources */, @@ -527,7 +530,7 @@ files = ( F84BAF9D26FDB417004CA335 /* CardCreationViewController.swift in Sources */, F8FC43B126C020A70033E151 /* TempNetwork.swift in Sources */, - F858079E2700354E00872484 /* CardBackgroundSettingCell.swift in Sources */, + F858079E2700354E00872484 /* BackgroundCollectionViewCell.swift in Sources */, F8FC438A26C01CDD0033E151 /* MainViewController.swift in Sources */, 3909242F26FA15E800236C51 /* UIView+Extension.swift in Sources */, 39523E09270184A700536900 /* CardListViewController.swift in Sources */, @@ -536,7 +539,8 @@ F8FC43AF26C0209A0033E151 /* TempModel.swift in Sources */, F8FC43A726C020780033E151 /* TempExtensions.swift in Sources */, F8FC43B826C0227D0033E151 /* Const.swift in Sources */, - F82FF8252702000000E57F8B /* RequiredFlavorCell.swift in Sources */, + F8F5D0AA270800FD00D99D2E /* Xib.swift in Sources */, + F82FF8252702000000E57F8B /* RequiredFlavorCollectionViewCell.swift in Sources */, F8FC43B326C020B90033E151 /* TempProtocols.swift in Sources */, F8FC43B526C020C10033E151 /* TempViews.swift in Sources */, 39523E5B2701A48900536900 /* CardListTableViewCell.swift in Sources */, @@ -544,9 +548,9 @@ 39523E5F2701AA9000536900 /* CardListDataModel.swift in Sources */, F8FC43AD26C020940033E151 /* TempClass.swift in Sources */, 390515BA2706D29B00C5F7A5 /* Color.swift in Sources */, - F84BAFB126FDB552004CA335 /* BackCardCreationCell.swift in Sources */, + F84BAFB126FDB552004CA335 /* BackCardCreationCollectionViewCell.swift in Sources */, F8FC43BC26C022A20033E151 /* Storyboard.swift in Sources */, - F84BAFAD26FDB543004CA335 /* FrontCardCreationCell.swift in Sources */, + F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */, F8FC43A926C0207F0033E151 /* TempFont.swift in Sources */, F8FC438626C01CDD0033E151 /* AppDelegate.swift in Sources */, F8FC438826C01CDD0033E151 /* SceneDelegate.swift in Sources */, @@ -698,7 +702,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = T8C9SSEX5G; + DEVELOPMENT_TEAM = 4QG3GC35LA; INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -718,7 +722,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = T8C9SSEX5G; + DEVELOPMENT_TEAM = 4QG3GC35LA; INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/NADA-iOS-forRelease/Resouces/Constants/Xib.swift b/NADA-iOS-forRelease/Resouces/Constants/Xib.swift new file mode 100644 index 00000000..6dc31830 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Constants/Xib.swift @@ -0,0 +1,19 @@ +// +// Xib.swift +// NADA-iOS-forRelease +// +// Created by kimhyungyu on 2021/10/02. +// + +import Foundation + +extension Const { + struct Xib { + static let requiredCollectionViewCell = "RequiredFlavorCollectionViewCell" + static let frontCardCreationCollectionViewCell = "FrontCardCreationCollectionViewCell" + static let backCardCreationCollectionViewCell = "BackCardCreationCollectionViewCell" + static let cardListTableViewCell = "CardListTableViewCell" + static let frontCardCell = "FrontCardCell" + static let backgroundCollectionViewCell = "BackgroundCollectionViewCell" + } +} diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift index 472e5272..41c88544 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift @@ -10,8 +10,6 @@ import VerticalCardSwiper class FrontCardCell: CardCell { - // MARK: - Properties - // MARK: - @IBOutlet Properties @IBOutlet weak var backgroundImageView: UIImageView! @IBOutlet weak var cardNameLabel: UILabel! @@ -43,7 +41,7 @@ extension FrontCardCell { instagramTextLabel.text = "Instagram" } - func setCell(_ backgroundImage: String, + func initCell(_ backgroundImage: String, _ cardName: String, _ detailCardName: String, _ userName: String, diff --git a/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift index 51550da0..177cf78a 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift @@ -8,8 +8,6 @@ import UIKit class CardListTableViewCell: UITableViewCell { - - static let identifier: String = "CardListTableViewCell" @IBOutlet weak var pinButton: UIButton! @IBOutlet weak var titleLabel: UILabel! @@ -41,7 +39,7 @@ class CardListTableViewCell: UITableViewCell { } } - func setData(title: String, + func initData(title: String, date: String) { titleLabel.text = title dateLabel.text = date diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift similarity index 84% rename from NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCell.swift rename to NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift index f1c4cb73..53be8d8a 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift @@ -7,11 +7,11 @@ import UIKit -class BackCardCreationCell: UICollectionViewCell { +class BackCardCreationCollectionViewCell: UICollectionViewCell { // MARK: - Properties - static let identifier = "BackCardCreationCell" + static let identifier = "BackCardCreationCollectionViewCell" private let flavorList = ["민초", "반민초", "소주", "맥주", "부먹", "찍먹", "양념", "후라이드"] private var optionalInfoList = [UITextField]() @@ -41,9 +41,9 @@ class BackCardCreationCell: UICollectionViewCell { } } -extension BackCardCreationCell { +extension BackCardCreationCollectionViewCell { private func setUI() { - setUITextFieldList() + initUITextFieldList() // scrollView.showsVerticalScrollIndicator = false scrollView.backgroundColor = .black bgView.backgroundColor = .black @@ -68,7 +68,7 @@ extension BackCardCreationCell { $0.backgroundColor = .systemGray2 } } - private func setUITextFieldList() { + private func initUITextFieldList() { optionalInfoList.append(contentsOf: [firstQuestionTextField, firstAnswerTextField, secondQuestionTextField, @@ -77,26 +77,28 @@ extension BackCardCreationCell { private func registerCell() { requiredCollectionView.delegate = self requiredCollectionView.dataSource = self - let cell = UINib(nibName: RequiredFlavorCell.identifier, bundle: nil) - requiredCollectionView.register(cell, forCellWithReuseIdentifier: RequiredFlavorCell.identifier) + requiredCollectionView.register(RequiredFlavorCollectionViewCell.nib(), forCellWithReuseIdentifier: Const.Xib.requiredCollectionViewCell) + } + static func nib() -> UINib { + return UINib(nibName: "BackCardCreationCollectionViewCell", bundle: nil) } } // MARK: - UICollectionViewDelegate -extension BackCardCreationCell: UICollectionViewDelegate { +extension BackCardCreationCollectionViewCell: UICollectionViewDelegate { } // MARK: - UICollectionViewDataSource -extension BackCardCreationCell: UICollectionViewDataSource { +extension BackCardCreationCollectionViewCell: UICollectionViewDataSource { func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { return flavorList.count } func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { - guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: RequiredFlavorCell.identifier, for: indexPath) as? RequiredFlavorCell else { + guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: Const.Xib.requiredCollectionViewCell, for: indexPath) as? RequiredFlavorCollectionViewCell else { return UICollectionViewCell() } cell.initCell(flavor: flavorList[indexPath.row]) @@ -107,7 +109,7 @@ extension BackCardCreationCell: UICollectionViewDataSource { // MARK: - UICollectionViewDelegateFlowLayout -extension BackCardCreationCell: UICollectionViewDelegateFlowLayout { +extension BackCardCreationCollectionViewCell: UICollectionViewDelegateFlowLayout { func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat { return 12 } diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCell.xib b/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.xib similarity index 99% rename from NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCell.xib rename to NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.xib index fd5e5aa7..e03f70e2 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.xib @@ -11,7 +11,7 @@ - + diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/CardBackgroundSetting/CardBackgroundSettingCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.swift similarity index 82% rename from NADA-iOS-forRelease/Sources/Cells/CreationCard/CardBackgroundSetting/CardBackgroundSettingCell.swift rename to NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.swift index 71a284d0..d118ec31 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/CardBackgroundSetting/CardBackgroundSettingCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.swift @@ -7,10 +7,7 @@ import UIKit -class CardBackgroundSettingCell: UICollectionViewCell { - - // MARK: - Properties - static let identifier = "CardBackgroundSettingCell" +class BackgroundCollectionViewCell: UICollectionViewCell { // MARK: - @IBOutlet Properties @IBOutlet weak var bgView: UIView! @@ -26,7 +23,7 @@ class CardBackgroundSettingCell: UICollectionViewCell { // MARK: - Extensions -extension CardBackgroundSettingCell { +extension BackgroundCollectionViewCell { private func setUI() { bgView.backgroundColor = .white // bgView.isHidden = true @@ -46,4 +43,7 @@ extension CardBackgroundSettingCell { func cellUnselected() { bgView.isHidden = true } + static func nib() -> UINib { + return UINib(nibName: "BackgroundCollectionViewCell", bundle: nil) + } } diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/CardBackgroundSetting/CardBackgroundSettingCell.xib b/NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.xib similarity index 97% rename from NADA-iOS-forRelease/Sources/Cells/CreationCard/CardBackgroundSetting/CardBackgroundSettingCell.xib rename to NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.xib index 5adac095..cbd163b1 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/CardBackgroundSetting/CardBackgroundSettingCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.xib @@ -12,7 +12,7 @@ - + diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift similarity index 88% rename from NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCell.swift rename to NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift index b207be30..0bd83cad 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift @@ -7,11 +7,10 @@ import UIKit -class FrontCardCreationCell: UICollectionViewCell { +class FrontCardCreationCollectionViewCell: UICollectionViewCell { // MARK: - Properties - static let identifier = "FrontCardCreationCell" private let backgroundList = ["img", "img", "img", "img", "img", "img"] private var requiredInfoList = [UITextField]() private var optionalInfoList = [UITextField]() @@ -50,9 +49,9 @@ class FrontCardCreationCell: UICollectionViewCell { // MARK: - Extensions -extension FrontCardCreationCell { +extension FrontCardCreationCollectionViewCell { private func setUI() { - setUITextFieldList() + initUITextFieldList() // scrollView.showsVerticalScrollIndicator = false scrollView.backgroundColor = .black bgView.backgroundColor = .black @@ -95,7 +94,7 @@ extension FrontCardCreationCell { $0.backgroundColor = .systemGray2 } } - private func setUITextFieldList() { + private func initUITextFieldList() { requiredInfoList.append(contentsOf: [cardNameTextField, userNameTextField, birthTextField, @@ -108,29 +107,32 @@ extension FrontCardCreationCell { private func registerCell() { cardBackgroundSettingCollectionView.delegate = self cardBackgroundSettingCollectionView.dataSource = self - let cell = UINib(nibName: CardBackgroundSettingCell.identifier, bundle: nil) - cardBackgroundSettingCollectionView.register(cell, forCellWithReuseIdentifier: CardBackgroundSettingCell.identifier) + + cardBackgroundSettingCollectionView.register(BackgroundCollectionViewCell.nib(), forCellWithReuseIdentifier: Const.Xib.backgroundCollectionViewCell) } private func setNotificationTextField() { } + static func nib() -> UINib { + return UINib(nibName: "FrontCardCreationCollectionViewCell", bundle: nil) + } } // MARK: - UICollectionViewDelegate -extension FrontCardCreationCell: UICollectionViewDelegate { +extension FrontCardCreationCollectionViewCell: UICollectionViewDelegate { } // MARK: - UICollectionViewDataSource -extension FrontCardCreationCell: UICollectionViewDataSource { +extension FrontCardCreationCollectionViewCell: UICollectionViewDataSource { func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { return backgroundList.count } func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { - guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: CardBackgroundSettingCell.identifier, for: indexPath) as? CardBackgroundSettingCell else { + guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: Const.Xib.backgroundCollectionViewCell, for: indexPath) as? BackgroundCollectionViewCell else { return UICollectionViewCell() } cell.initCell(image: backgroundList[indexPath.row]) @@ -141,7 +143,7 @@ extension FrontCardCreationCell: UICollectionViewDataSource { // MARK: - UICollectionViewDelegateFlowLayout -extension FrontCardCreationCell: UICollectionViewDelegateFlowLayout { +extension FrontCardCreationCollectionViewCell: UICollectionViewDelegateFlowLayout { func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets { return UIEdgeInsets(top: 0, left: 28, bottom: 7, right: 28) } diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCell.xib b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.xib similarity index 99% rename from NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCell.xib rename to NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.xib index 12ab51a2..1730d1b2 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.xib @@ -11,7 +11,7 @@ - + @@ -216,7 +216,7 @@ - + diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift similarity index 75% rename from NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCell.swift rename to NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift index bbf7b9a0..382cdc20 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift @@ -7,11 +7,7 @@ import UIKit -class RequiredFlavorCell: UICollectionViewCell { - - // MARK: - Properteis - - static let identifier = "RequiredFlavorCell" +class RequiredFlavorCollectionViewCell: UICollectionViewCell { // MARK: - @IBOutlet Properties @@ -26,7 +22,7 @@ class RequiredFlavorCell: UICollectionViewCell { } } -extension RequiredFlavorCell { +extension RequiredFlavorCollectionViewCell { private func setUI() { bgView.backgroundColor = .systemGray2 bgView.cornerRadius = 10 @@ -37,4 +33,7 @@ extension RequiredFlavorCell { func initCell(flavor: String) { flavorLabel.text = flavor } + static func nib() -> UINib { + return UINib(nibName: "RequiredFlavorCollectionViewCell", bundle: nil) + } } diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCell.xib b/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.xib similarity index 97% rename from NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCell.xib rename to NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.xib index 4fce469a..055bb820 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.xib @@ -11,7 +11,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/NADA-iOS-forRelease/Sources/SceneDelegate.swift b/NADA-iOS-forRelease/Sources/SceneDelegate.swift index 894d0403..82c1957e 100644 --- a/NADA-iOS-forRelease/Sources/SceneDelegate.swift +++ b/NADA-iOS-forRelease/Sources/SceneDelegate.swift @@ -20,7 +20,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { window = UIWindow(frame: windowScene.coordinateSpace.bounds) window?.windowScene = windowScene - window?.rootViewController = UIStoryboard(name: Const.Storyboard.Name.CardList, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.CardListViewController) + window?.rootViewController = UIStoryboard(name: Const.Storyboard.Name.CardCreation, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.CardCreationViewController) window?.makeKeyAndVisible() } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift index 2a5c494f..97289195 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift @@ -79,11 +79,9 @@ extension CardCreationViewController { cardCreationCollectionView.delegate = self cardCreationCollectionView.dataSource = self - - let frontCardCreationCell = UINib(nibName: FrontCardCreationCell.identifier, bundle: nil) - let backCardCreationCell = UINib(nibName: BackCardCreationCell.identifier, bundle: nil) - cardCreationCollectionView.register(frontCardCreationCell, forCellWithReuseIdentifier: FrontCardCreationCell.identifier) - cardCreationCollectionView.register(backCardCreationCell, forCellWithReuseIdentifier: BackCardCreationCell.identifier) + + cardCreationCollectionView.register(FrontCardCreationCollectionViewCell.nib(), forCellWithReuseIdentifier: Const.Xib.frontCardCreationCollectionViewCell) + cardCreationCollectionView.register(BackgroundCollectionViewCell.nib(), forCellWithReuseIdentifier: Const.Xib.backCardCreationCollectionViewCell) } } @@ -103,12 +101,12 @@ extension CardCreationViewController: UICollectionViewDataSource { func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { if collectionView == cardCreationCollectionView { if indexPath.row == 0 { - guard let frontCreationCell = collectionView.dequeueReusableCell(withReuseIdentifier: FrontCardCreationCell.identifier, for: indexPath) as? FrontCardCreationCell else { + guard let frontCreationCell = collectionView.dequeueReusableCell(withReuseIdentifier: Const.Xib.frontCardCreationCollectionViewCell, for: indexPath) as? FrontCardCreationCollectionViewCell else { return UICollectionViewCell() } return frontCreationCell } else if indexPath.row == 1 { - guard let backCreationCell = collectionView.dequeueReusableCell(withReuseIdentifier: BackCardCreationCell.identifier, for: indexPath) as? BackCardCreationCell else { + guard let backCreationCell = collectionView.dequeueReusableCell(withReuseIdentifier: Const.Xib.backCardCreationCollectionViewCell, for: indexPath) as? BackgroundCollectionViewCell else { return UICollectionViewCell() } return backCreationCell diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift index 82d7a9d1..b7dc31d7 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift @@ -68,9 +68,9 @@ extension CardListViewController: UITableViewDataSource { } func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - guard let serviceCell = tableView.dequeueReusableCell(withIdentifier: CardListTableViewCell.identifier, for: indexPath) as? CardListTableViewCell else { return UITableViewCell() } + guard let serviceCell = tableView.dequeueReusableCell(withIdentifier: Const.Xib.cardListTableViewCell, for: indexPath) as? CardListTableViewCell else { return UITableViewCell() } - serviceCell.setData(title: cardItems[indexPath.row].title, + serviceCell.initData(title: cardItems[indexPath.row].title, date: cardItems[indexPath.row].date) return serviceCell