diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index a7c6bbb7..b529b16d 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -11,8 +11,18 @@ 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 */; }; + 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 */; }; 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 */; }; 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 */; }; @@ -39,8 +49,18 @@ 3979709726FA0BF0003FB4F5 /* Login.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Login.storyboard; sourceTree = ""; }; 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 = ""; }; 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 = ""; }; 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 = ""; }; @@ -99,6 +119,15 @@ name = Frameworks; sourceTree = ""; }; + F82FF8222701FFE300E57F8B /* RequiredFlavor */ = { + isa = PBXGroup; + children = ( + F82FF8232702000000E57F8B /* RequiredFlavorCell.swift */, + F82FF8242702000000E57F8B /* RequiredFlavorCell.xib */, + ); + path = RequiredFlavor; + sourceTree = ""; + }; F83206AC26F61E5800D61711 /* CardCell */ = { isa = PBXGroup; children = ( @@ -108,6 +137,35 @@ path = CardCell; sourceTree = ""; }; + F84BAF9E26FDB425004CA335 /* CardCreation */ = { + isa = PBXGroup; + children = ( + F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */, + ); + path = CardCreation; + sourceTree = ""; + }; + F84BAFA126FDB4E5004CA335 /* CreationCard */ = { + isa = PBXGroup; + children = ( + F82FF8222701FFE300E57F8B /* RequiredFlavor */, + F858079B2700348000872484 /* CardBackgroundSetting */, + F84BAFAB26FDB543004CA335 /* FrontCardCreationCell.swift */, + F84BAFAC26FDB543004CA335 /* FrontCardCreationCell.xib */, + F84BAFAF26FDB552004CA335 /* BackCardCreationCell.swift */, + F84BAFB026FDB552004CA335 /* BackCardCreationCell.xib */, + ); + path = CreationCard; + sourceTree = ""; + }; + F84BAFB326FDB8AA004CA335 /* CardCreation */ = { + isa = PBXGroup; + children = ( + F84BAF9C26FDB417004CA335 /* CardCreationViewController.swift */, + ); + path = CardCreation; + sourceTree = ""; + }; F857FC8A26C03A5C00A48D01 /* Assets */ = { isa = PBXGroup; children = ( @@ -116,6 +174,15 @@ path = Assets; sourceTree = ""; }; + F858079B2700348000872484 /* CardBackgroundSetting */ = { + isa = PBXGroup; + children = ( + F858079C2700354E00872484 /* CardBackgroundSettingCell.swift */, + F858079D2700354E00872484 /* CardBackgroundSettingCell.xib */, + ); + path = CardBackgroundSetting; + sourceTree = ""; + }; F8FC437926C01CDD0033E151 = { isa = PBXGroup; children = ( @@ -176,6 +243,7 @@ F8FC439B26C01EC30033E151 /* Cells */ = { isa = PBXGroup; children = ( + F84BAFA126FDB4E5004CA335 /* CreationCard */, F83206AC26F61E5800D61711 /* CardCell */, ); path = Cells; @@ -216,6 +284,7 @@ F8FC43A026C01F040033E151 /* ViewControllers */ = { isa = PBXGroup; children = ( + F84BAFB326FDB8AA004CA335 /* CardCreation */, 3979709426FA0BD8003FB4F5 /* Login */, F8FC438926C01CDD0033E151 /* MainViewController.swift */, ); @@ -233,6 +302,7 @@ F8FC43A226C01F2B0033E151 /* Storyboards */ = { isa = PBXGroup; children = ( + F84BAF9E26FDB425004CA335 /* CardCreation */, F8FC439026C01CDE0033E151 /* LaunchScreen.storyboard */, F8FC438B26C01CDD0033E151 /* Main.storyboard */, 3979709726FA0BF0003FB4F5 /* Login.storyboard */, @@ -328,11 +398,16 @@ buildActionMask = 2147483647; files = ( F8FC43BF26C025180033E151 /* .swiftlint.yml in Resources */, + F82FF8262702000000E57F8B /* RequiredFlavorCell.xib in Resources */, + F858079F2700354E00872484 /* CardBackgroundSettingCell.xib in Resources */, + F84BAFAE26FDB543004CA335 /* FrontCardCreationCell.xib in Resources */, F83206AB26F61E3700D61711 /* FrontCardCell.xib in Resources */, 3979709826FA0BF0003FB4F5 /* Login.storyboard in Resources */, + F84BAFB226FDB552004CA335 /* BackCardCreationCell.xib in Resources */, F8FC439226C01CDE0033E151 /* LaunchScreen.storyboard in Resources */, F8FC438F26C01CDE0033E151 /* Assets.xcassets in Resources */, F8FC438D26C01CDD0033E151 /* Main.storyboard in Resources */, + F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -402,7 +477,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + F84BAF9D26FDB417004CA335 /* CardCreationViewController.swift in Sources */, F8FC43B126C020A70033E151 /* TempNetwork.swift in Sources */, + F858079E2700354E00872484 /* CardBackgroundSettingCell.swift in Sources */, F8FC438A26C01CDD0033E151 /* MainViewController.swift in Sources */, 3909242F26FA15E800236C51 /* UIView+Extension.swift in Sources */, F83206AA26F61E3700D61711 /* FrontCardCell.swift in Sources */, @@ -410,11 +487,14 @@ F8FC43AF26C0209A0033E151 /* TempModel.swift in Sources */, F8FC43A726C020780033E151 /* TempExtensions.swift in Sources */, F8FC43B826C0227D0033E151 /* Const.swift in Sources */, + F82FF8252702000000E57F8B /* RequiredFlavorCell.swift in Sources */, F8FC43B326C020B90033E151 /* TempProtocols.swift in Sources */, F8FC43B526C020C10033E151 /* TempViews.swift in Sources */, F8FC43BA26C022900033E151 /* ViewController.swift in Sources */, F8FC43AD26C020940033E151 /* TempClass.swift in Sources */, + F84BAFB126FDB552004CA335 /* BackCardCreationCell.swift in Sources */, F8FC43BC26C022A20033E151 /* Storyboard.swift in Sources */, + F84BAFAD26FDB543004CA335 /* FrontCardCreationCell.swift in Sources */, F8FC43A926C0207F0033E151 /* TempFont.swift in Sources */, F8FC438626C01CDD0033E151 /* AppDelegate.swift in Sources */, F8FC438826C01CDD0033E151 /* SceneDelegate.swift in Sources */, diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack24Dp1.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack24Dp1.imageset/Contents.json new file mode 100644 index 00000000..cfea8750 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack24Dp1.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "addPhotoAlternateBlack24Dp1.png", + "scale" : "1x", + "idiom" : "universal" + }, + { + "filename" : "addPhotoAlternateBlack24Dp1@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "addPhotoAlternateBlack24Dp1@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack24Dp1.imageset/addPhotoAlternateBlack24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack24Dp1.imageset/addPhotoAlternateBlack24Dp1.png new file mode 100644 index 00000000..33be0bb9 Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack24Dp1.imageset/addPhotoAlternateBlack24Dp1.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack24Dp1.imageset/addPhotoAlternateBlack24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack24Dp1.imageset/addPhotoAlternateBlack24Dp1@2x.png new file mode 100644 index 00000000..6c46f776 Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack24Dp1.imageset/addPhotoAlternateBlack24Dp1@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack24Dp1.imageset/addPhotoAlternateBlack24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack24Dp1.imageset/addPhotoAlternateBlack24Dp1@3x.png new file mode 100644 index 00000000..309d6455 Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack24Dp1.imageset/addPhotoAlternateBlack24Dp1@3x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack24Dp.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack24Dp.imageset/Contents.json new file mode 100644 index 00000000..d8e7a640 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack24Dp.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "closeBlack24Dp.png", + "scale" : "1x" + }, + { + "filename" : "closeBlack24Dp@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "scale" : "3x", + "idiom" : "universal", + "filename" : "closeBlack24Dp@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack24Dp.imageset/closeBlack24Dp.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack24Dp.imageset/closeBlack24Dp.png new file mode 100644 index 00000000..26b12e7b Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack24Dp.imageset/closeBlack24Dp.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack24Dp.imageset/closeBlack24Dp@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack24Dp.imageset/closeBlack24Dp@2x.png new file mode 100644 index 00000000..178fa3ca Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack24Dp.imageset/closeBlack24Dp@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack24Dp.imageset/closeBlack24Dp@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack24Dp.imageset/closeBlack24Dp@3x.png new file mode 100644 index 00000000..2a88d187 Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack24Dp.imageset/closeBlack24Dp@3x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Constants/Storyboard.swift b/NADA-iOS-forRelease/Resouces/Constants/Storyboard.swift index 3577966c..2874402a 100644 --- a/NADA-iOS-forRelease/Resouces/Constants/Storyboard.swift +++ b/NADA-iOS-forRelease/Resouces/Constants/Storyboard.swift @@ -12,6 +12,7 @@ extension Const { struct Name { static let Main = "Main" + static let CardCreation = "CardCreation" } } diff --git a/NADA-iOS-forRelease/Resouces/Constants/ViewController.swift b/NADA-iOS-forRelease/Resouces/Constants/ViewController.swift index efb06d64..e683c89c 100644 --- a/NADA-iOS-forRelease/Resouces/Constants/ViewController.swift +++ b/NADA-iOS-forRelease/Resouces/Constants/ViewController.swift @@ -12,6 +12,7 @@ extension Const { struct Identifier { static let MainViewController = "MainViewController" + static let CardCreationViewController = "CardCreationViewController" } } diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreation.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreation.storyboard new file mode 100644 index 00000000..870f6efa --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreation.storyboard @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift index 57810f72..472e5272 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift @@ -13,6 +13,7 @@ class FrontCardCell: CardCell { // MARK: - Properties // MARK: - @IBOutlet Properties + @IBOutlet weak var backgroundImageView: UIImageView! @IBOutlet weak var cardNameLabel: UILabel! @IBOutlet weak var detailCardNameLabel: UILabel! @IBOutlet weak var userNameLabel: UILabel! @@ -42,7 +43,8 @@ extension FrontCardCell { instagramTextLabel.text = "Instagram" } - func setCell(_ cardName: String, + func setCell(_ backgroundImage: String, + _ cardName: String, _ detailCardName: String, _ userName: String, _ birth: String, @@ -51,6 +53,9 @@ extension FrontCardCell { _ linkImage: String, _ linkText: String, _ linkID: String) { + if let bgImage = UIImage(named: backgroundImage) { + self.backgroundImageView.image = bgImage + } self.cardNameLabel.text = cardName self.detailCardNameLabel.text = detailCardName self.userNameLabel.text = userName diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib index 555c81f1..53a4d08a 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib @@ -1,8 +1,9 @@ - + - + + @@ -16,6 +17,9 @@ + + +