From 0094b0d4e4b0146775b179900ee978bfcb971542 Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Thu, 18 Nov 2021 15:20:00 +0900 Subject: [PATCH] =?UTF-8?q?[FEAT]=20#68=20-=20=EB=A6=AC=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=B7=B0,=20=ED=83=AD=EB=B0=94,=20=EC=B9=B4=EB=93=9C=EB=92=B7?= =?UTF-8?q?=EB=A9=B4=20=EC=88=98=EC=A0=95=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 16 + .../Resouces/Storyboards/CardList.storyboard | 65 ---- .../Storyboards/Main/Front.storyboard | 13 +- .../Resouces/Storyboards/More/More.storyboard | 37 +++ .../Resouces/Storyboards/TabBar.storyboard | 11 +- .../Sources/Cells/CardCell/BackCardCell.swift | 22 +- .../Sources/Cells/CardCell/BackCardCell.xib | 282 ++++++++---------- .../Sources/Cells/CardCell/FrontCardCell.xib | 24 +- .../CardList/CardListTableViewCell.swift | 3 +- .../MoreList/MoreListTableViewCell.swift | 23 ++ .../Cells/MoreList/MoreListTableViewCell.xib | 46 +++ .../Main/FrontViewController.swift | 62 ++-- .../TabBar/TabBarViewController.swift | 12 +- 13 files changed, 313 insertions(+), 303 deletions(-) create mode 100644 NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.swift create mode 100644 NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.xib diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index fdf4c83f..512d6515 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -11,6 +11,8 @@ 390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 390515B72706CEBB00C5F7A5 /* Colors.xcassets */; }; 3909242F26FA15E800236C51 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3909242E26FA15E800236C51 /* UIView+Extension.swift */; }; 39288E12273F52B20072F403 /* CardListLookUpRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39288E11273F52B20072F403 /* CardListLookUpRequest.swift */; }; + 392F7FB4274621F1008CDBF5 /* MoreListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392F7FB2274621F1008CDBF5 /* MoreListTableViewCell.swift */; }; + 392F7FB5274621F1008CDBF5 /* MoreListTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 392F7FB3274621F1008CDBF5 /* MoreListTableViewCell.xib */; }; 39488E352706E17200BDC917 /* UIAlertController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39488E342706E17200BDC917 /* UIAlertController+Extension.swift */; }; 394F314C27081B3A00C83291 /* FrontViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 394F314B27081B3A00C83291 /* FrontViewController.swift */; }; 394F314F27081B4C00C83291 /* Front.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 394F314E27081B4C00C83291 /* Front.storyboard */; }; @@ -94,6 +96,8 @@ 390515B72706CEBB00C5F7A5 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = ""; }; 3909242E26FA15E800236C51 /* UIView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = ""; }; 39288E11273F52B20072F403 /* CardListLookUpRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListLookUpRequest.swift; sourceTree = ""; }; + 392F7FB2274621F1008CDBF5 /* MoreListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreListTableViewCell.swift; sourceTree = ""; }; + 392F7FB3274621F1008CDBF5 /* MoreListTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MoreListTableViewCell.xib; sourceTree = ""; }; 39488E342706E17200BDC917 /* UIAlertController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Extension.swift"; sourceTree = ""; }; 394F314B27081B3A00C83291 /* FrontViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontViewController.swift; sourceTree = ""; }; 394F314E27081B4C00C83291 /* Front.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Front.storyboard; sourceTree = ""; }; @@ -195,6 +199,15 @@ path = Pods; sourceTree = ""; }; + 392F7FB1274621CF008CDBF5 /* MoreList */ = { + isa = PBXGroup; + children = ( + 392F7FB2274621F1008CDBF5 /* MoreListTableViewCell.swift */, + 392F7FB3274621F1008CDBF5 /* MoreListTableViewCell.xib */, + ); + path = MoreList; + sourceTree = ""; + }; 394F314A2708157500C83291 /* Main */ = { isa = PBXGroup; children = ( @@ -527,6 +540,7 @@ F8FC439B26C01EC30033E151 /* Cells */ = { isa = PBXGroup; children = ( + 392F7FB1274621CF008CDBF5 /* MoreList */, F84BAFA126FDB4E5004CA335 /* CreationCard */, 39523E582701A47400536900 /* CardList */, F83206AC26F61E5800D61711 /* CardCell */, @@ -712,6 +726,7 @@ 39F5A3D1271461EA00191F94 /* BackCardCell.xib in Resources */, 39523E0B270184B100536900 /* CardList.storyboard in Resources */, F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */, + 392F7FB5274621F1008CDBF5 /* MoreListTableViewCell.xib in Resources */, 390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -830,6 +845,7 @@ F8FC43BC26C022A20033E151 /* Storyboard.swift in Sources */, F8C83FC1272FA06E0009DF0D /* UserAPI.swift in Sources */, F8C83FC3272FA17B0009DF0D /* URL.swift in Sources */, + 392F7FB4274621F1008CDBF5 /* MoreListTableViewCell.swift in Sources */, 77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */, F8C83FAE272F99940009DF0D /* MoyaLoggerPlugin.swift in Sources */, F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */, diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard index 5ef3b333..61dc448d 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard @@ -10,67 +10,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -137,14 +76,10 @@ - - - - diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard index e61972e3..bcf7d2c9 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard @@ -62,7 +62,7 @@ - + @@ -75,12 +75,10 @@ - + - - - + @@ -91,11 +89,11 @@ - + - + @@ -111,7 +109,6 @@ - diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard index a455754e..7e113127 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard @@ -4,6 +4,7 @@ + @@ -16,8 +17,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30,6 +64,9 @@ + + + diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/TabBar.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/TabBar.storyboard index 4e309290..03f5dbef 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/TabBar.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/TabBar.storyboard @@ -13,10 +13,19 @@ - + + + + + + + + + + diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift index 8b2a86c0..71af259f 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift @@ -20,10 +20,9 @@ class BackCardCell: CardCell { @IBOutlet weak var putSauceEatImageView: UIImageView! @IBOutlet weak var sauceChickenImageView: UIImageView! @IBOutlet weak var friedChickenImageView: UIImageView! - @IBOutlet weak var firstQuestionLabel: UILabel! - @IBOutlet weak var firstAnswerLabel: UILabel! - @IBOutlet weak var secondQuestionLabel: UILabel! - @IBOutlet weak var secondAnswerLabel: UILabel! + @IBOutlet weak var firstTmiLabel: UILabel! + @IBOutlet weak var secondTmiLabel: UILabel! + @IBOutlet weak var thirdTmiLabel: UILabel! // MARK: - View Life Cycle override func awakeFromNib() { @@ -52,10 +51,9 @@ extension BackCardCell { _ putSauceImage: String, _ yangnyumImage: String, _ friedImage: String, - _ firstQuestion: String, - _ firstAnswer: String, - _ secondQuestion: String, - _ secondAnswer: String) { + _ firstTmi: String, + _ secondTmi: String, + _ thirdTmi: String) { if let bgImage = UIImage(named: backgroundImage) { self.backgroundImageView.image = bgImage } @@ -83,9 +81,9 @@ extension BackCardCell { if let friedImage = UIImage(named: friedImage) { self.friedChickenImageView.image = friedImage } - self.firstQuestionLabel.text = firstQuestion - self.firstAnswerLabel.text = firstAnswer - self.secondQuestionLabel.text = secondQuestion - self.secondAnswerLabel.text = secondAnswer + + self.firstTmiLabel.text = firstTmi + self.secondTmiLabel.text = secondTmi + self.thirdTmiLabel.text = thirdTmi } } diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib index 847fe7cf..73445924 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib @@ -1,9 +1,9 @@ - + - + @@ -12,199 +12,166 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + + + - - - - + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -213,28 +180,25 @@ - - - - + + + - - - - - - - + + + + + + + - - - - - + + + diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib index f4fddab7..40906d0c 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib @@ -1,9 +1,9 @@ - + - + @@ -11,14 +11,14 @@ - + - + - + @@ -56,31 +56,31 @@ - + - + - + diff --git a/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift index 387da26c..9df820e9 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift @@ -13,7 +13,6 @@ class CardListTableViewCell: UITableViewCell { @IBOutlet weak var titleLabel: UILabel! @IBOutlet weak var reorderButton: UIButton! - override func awakeFromNib() { super.awakeFromNib() @@ -32,7 +31,7 @@ class CardListTableViewCell: UITableViewCell { // 핀 이미지 클릭 시 @IBAction func pinButtonClicked(_ sender: Any) { let pinImage = UIImage(named: "iconPin") - let reorderImage = UIImage(named: "iconReorder") + _ = UIImage(named: "iconReorder") if pinButton.currentImage == pinImage { pinButton.setImage(UIImage(named: "iconPinInactive"), for: UIControl.State.normal) diff --git a/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.swift new file mode 100644 index 00000000..479337e5 --- /dev/null +++ b/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.swift @@ -0,0 +1,23 @@ +// +// MoreListTableViewCell.swift +// NADA-iOS-forRelease +// +// Created by 민 on 2021/11/18. +// + +import UIKit + +class MoreListTableViewCell: UITableViewCell { + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.xib b/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.xib new file mode 100644 index 00000000..c8f1983f --- /dev/null +++ b/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.xib @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift index d3273d54..923fafe7 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift @@ -32,10 +32,9 @@ class FrontViewController: UIViewController { private var putSauceImageList = [String]() private var yangnyumImageList = [String]() private var friedImageList = [String]() - private var firstQuestionList = [String]() - private var firstAnswerList = [String]() - private var secondQuestionList = [String]() - private var secondAnswerList = [String]() + private var firstTmiList = [String]() + private var secondTmiList = [String]() + private var thirdTmiLabel = [String]() var isFrontCard: [Bool] = [true, true] @@ -121,42 +120,39 @@ extension FrontViewController { } private func setBackList() { - mintImageList.append(contentsOf: ["opt1Select", - "opt1Select" + mintImageList.append(contentsOf: ["iconTasteOnMincho", + "iconTasteOnMincho" ]) - noMintImageList.append(contentsOf: ["opt2Unselect", - "opt2Unselect" + noMintImageList.append(contentsOf: ["iconTasteOffBanmincho", + "iconTasteOffBanmincho" ]) - sojuImageList.append(contentsOf: ["opt3Unselect", - "opt3Unselect" + sojuImageList.append(contentsOf: ["iconTasteOnSoju", + "iconTasteOnSoju" ]) - beerImageList.append(contentsOf: ["opt4Select", - "opt4Select" + beerImageList.append(contentsOf: ["iconTasteOffBeer", + "iconTasteOffBeer" ]) - pourImageList.append(contentsOf: ["opt5Unselect", - "opt5Unselect" + pourImageList.append(contentsOf: ["iconTasteOffBumeok", + "iconTasteOffBumeok" ]) - putSauceImageList.append(contentsOf: ["opt6Select", - "opt6Select" + putSauceImageList.append(contentsOf: ["iconTasteOnZzik", + "iconTasteOnZzik" ]) - yangnyumImageList.append(contentsOf: ["opt7Select", - "opt7Select" + yangnyumImageList.append(contentsOf: ["iconTasteOffSeasoned", + "iconTasteOffSeasoned" ]) - friedImageList.append(contentsOf: ["opt8Unselect", - "opt8Unselect" + friedImageList.append(contentsOf: ["iconTasteOnFried", + "iconTasteOnFried" ]) - firstQuestionList.append(contentsOf: ["Q1. 직접 질문 추가", - "" - ]) - firstAnswerList.append(contentsOf: ["질문에 대한 대답입니다.", - "" - ]) - secondQuestionList.append(contentsOf: ["Q2. 직접 질문 추가", - "" - ]) - secondAnswerList.append(contentsOf: ["질문에 대한 대답입니다.", - "" - ]) + firstTmiList.append(contentsOf: ["첫번째", + "첫번째" + ]) + secondTmiList.append(contentsOf: ["두번째리따리따", + "두번째" + ]) + thirdTmiLabel.append(contentsOf: ["세번째리따라라ㅏㄹ", + "세번째" + ]) } } @@ -196,7 +192,7 @@ extension FrontViewController: VerticalCardSwiperDatasource { guard let backCell = verticalCardSwiperView.dequeueReusableCell(withReuseIdentifier: "BackCardCell", for: index) as? BackCardCell else { return CardCell() } - backCell.initCell(imageList[index], mintImageList[index], noMintImageList[index], sojuImageList[index], beerImageList[index], pourImageList[index], putSauceImageList[index], yangnyumImageList[index], friedImageList[index], firstQuestionList[index], firstAnswerList[index], secondQuestionList[index], secondAnswerList[index]) + backCell.initCell(imageList[index], mintImageList[index], noMintImageList[index], sojuImageList[index], beerImageList[index], pourImageList[index], putSauceImageList[index], yangnyumImageList[index], friedImageList[index], firstTmiList[index], secondTmiList[index], thirdTmiLabel[index]) return backCell } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift index 22056ff3..623feeea 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift @@ -14,16 +14,6 @@ class TabBarViewController: UITabBarController { // Do any additional setup after loading the view. } - - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. - } - */ } +