From 3dba6672b7ddf51db9036f5c5d90fd2a1e818f68 Mon Sep 17 00:00:00 2001
From: MinjaeLee <2alswo7@khu.ac.kr>
Date: Sun, 28 Nov 2021 10:52:57 +0900
Subject: [PATCH 1/9] =?UTF-8?q?[FIX]=20#89=20-=20BackCardCell,=20initCell?=
=?UTF-8?q?=20bool=ED=98=95=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Sources/Cells/CardCell/BackCardCell.swift | 80 ++++++++++++-------
.../Sources/Cells/CardCell/BackCardCell.xib | 34 ++++----
.../Sources/Cells/CardCell/FrontCardCell.xib | 2 +-
.../Main/FrontViewController.swift | 48 +++++------
4 files changed, 92 insertions(+), 72 deletions(-)
diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift
index 48e7eb59..550b9d91 100644
--- a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift
+++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift
@@ -12,6 +12,7 @@ class BackCardCell: CardCell {
// MARK: - @IBOutlet Properties
@IBOutlet weak var backgroundImageView: UIImageView!
+ @IBOutlet weak var tasteTitleLabel: UILabel!
@IBOutlet weak var mintImageView: UIImageView!
@IBOutlet weak var noMintImageView: UIImageView!
@IBOutlet weak var sojuImageView: UIImageView!
@@ -20,6 +21,7 @@ class BackCardCell: CardCell {
@IBOutlet weak var putSauceEatImageView: UIImageView!
@IBOutlet weak var sauceChickenImageView: UIImageView!
@IBOutlet weak var friedChickenImageView: UIImageView!
+ @IBOutlet weak var tmiTitleLabel: UILabel!
@IBOutlet weak var firstTmiLabel: UILabel!
@IBOutlet weak var secondTmiLabel: UILabel!
@IBOutlet weak var thirdTmiLabel: UILabel!
@@ -32,56 +34,80 @@ class BackCardCell: CardCell {
// MARK: - Functions
static func nib() -> UINib {
- return UINib(nibName: Const.Xib.backCardCell, bundle: nil)
+ return UINib(nibName: Const.Xib.backCardCell, bundle: Bundle(for: BackCardCell.self))
}
}
// MARK: - Extensions
extension BackCardCell {
private func setUI() {
-
+ tasteTitleLabel.font = .title02
+ tasteTitleLabel.textColor = .white
+ tmiTitleLabel.font = .title02
+ tmiTitleLabel.textColor = .white
+ firstTmiLabel.font = .textRegular04
+ firstTmiLabel.textColor = .white
+ secondTmiLabel.font = .textRegular04
+ secondTmiLabel.textColor = .white
+ thirdTmiLabel.font = .textRegular04
+ thirdTmiLabel.textColor = .white
}
func initCell(_ backgroundImage: String,
- _ mintImage: String,
- _ noMintImage: String,
- _ sojuImage: String,
- _ beerImage: String,
- _ pourImage: String,
- _ putSauceImage: String,
- _ yangnyumImage: String,
- _ friedImage: String,
+ _ isMintImage: Bool,
+ _ isNoMintImage: Bool,
+ _ isSojuImage: Bool,
+ _ isBeerImage: Bool,
+ _ isPourImage: Bool,
+ _ isPutSauceImage: Bool,
+ _ isYangnyumImage: Bool,
+ _ isFriedImage: Bool,
_ firstTmi: String,
_ secondTmi: String,
_ thirdTmi: String) {
if let bgImage = UIImage(named: backgroundImage) {
self.backgroundImageView.image = bgImage
}
- if let mtImage = UIImage(named: mintImage) {
- self.mintImageView.image = mtImage
+ if isMintImage == true {
+ self.mintImageView.image = UIImage(named: "iconTasteOnMincho")
+ } else {
+ self.mintImageView.image = UIImage(named: "iconTasteOffMincho")
}
- if let noMtImage = UIImage(named: noMintImage) {
- self.noMintImageView.image = noMtImage
+ if isNoMintImage == true {
+ self.noMintImageView.image = UIImage(named: "iconTasteOnBanmincho")
+ } else {
+ self.noMintImageView.image = UIImage(named: "iconTasteOffBanmincho")
}
- if let sojuImage = UIImage(named: sojuImage) {
- self.sojuImageView.image = sojuImage
+ if isSojuImage == true {
+ self.sojuImageView.image = UIImage(named: "iconTasteOnSoju")
+ } else {
+ self.sojuImageView.image = UIImage(named: "iconTasteOffSoju")
}
- if let beerImage = UIImage(named: beerImage) {
- self.beerImageView.image = beerImage
+ if isBeerImage == true {
+ self.beerImageView.image = UIImage(named: "iconTasteOnBeer")
+ } else {
+ self.beerImageView.image = UIImage(named: "iconTasteOffBeer")
}
- if let bumukImage = UIImage(named: pourImage) {
- self.pourEatImageView.image = bumukImage
+ if isPourImage == true {
+ self.pourEatImageView.image = UIImage(named: "iconTasteOnBumeok")
+ } else {
+ self.pourEatImageView.image = UIImage(named: "iconTasteOffBumeok")
}
- if let jjikmukImage = UIImage(named: putSauceImage) {
- self.putSauceEatImageView.image = jjikmukImage
+ if isPutSauceImage == true {
+ self.putSauceEatImageView.image = UIImage(named: "iconTasteOnZzik")
+ } else {
+ self.putSauceEatImageView.image = UIImage(named: "iconTasteOffZzik")
}
- if let yangnyumImage = UIImage(named: yangnyumImage) {
- self.sauceChickenImageView.image = yangnyumImage
+ if isYangnyumImage == true {
+ self.sauceChickenImageView.image = UIImage(named: "iconTasteOnSeasoned")
+ } else {
+ self.sauceChickenImageView.image = UIImage(named: "iconTasteOffSeasoned")
}
- if let friedImage = UIImage(named: friedImage) {
- self.friedChickenImageView.image = friedImage
+ if isFriedImage == true {
+ self.friedChickenImageView.image = UIImage(named: "iconTasteOnFried")
+ } else {
+ self.friedChickenImageView.image = UIImage(named: "iconTasteOffFried")
}
-
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 7a47f13b..ee726ef4 100644
--- a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib
+++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib
@@ -7,14 +7,6 @@
-
-
- SpoqaHanSansNeo-Bold
-
-
- SpoqaHanSansNeo-Regular
-
-
@@ -39,15 +31,15 @@
@@ -108,20 +100,20 @@
@@ -197,7 +189,9 @@
+
+
diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib
index f978a243..5ac3e9e4 100644
--- a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib
+++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib
@@ -21,7 +21,7 @@
-
+
diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift
index fea68b0e..224a4b51 100644
--- a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift
+++ b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift
@@ -24,14 +24,14 @@ class FrontViewController: UIViewController {
private var linkIDList = [String]()
// ๋ท๋ฉด
- private var mintImageList = [String]()
- private var noMintImageList = [String]()
- private var sojuImageList = [String]()
- private var beerImageList = [String]()
- private var pourImageList = [String]()
- private var putSauceImageList = [String]()
- private var yangnyumImageList = [String]()
- private var friedImageList = [String]()
+ private var mintImageList = [Bool]()
+ private var noMintImageList = [Bool]()
+ private var sojuImageList = [Bool]()
+ private var beerImageList = [Bool]()
+ private var pourImageList = [Bool]()
+ private var putSauceImageList = [Bool]()
+ private var yangnyumImageList = [Bool]()
+ private var friedImageList = [Bool]()
private var firstTmiList = [String]()
private var secondTmiList = [String]()
private var thirdTmiLabel = [String]()
@@ -121,29 +121,29 @@ extension FrontViewController {
}
private func setBackList() {
- mintImageList.append(contentsOf: ["iconTasteOnMincho",
- "iconTasteOnMincho"
+ mintImageList.append(contentsOf: [true,
+ false
])
- noMintImageList.append(contentsOf: ["iconTasteOffBanmincho",
- "iconTasteOffBanmincho"
+ noMintImageList.append(contentsOf: [false,
+ true
])
- sojuImageList.append(contentsOf: ["iconTasteOnSoju",
- "iconTasteOnSoju"
+ sojuImageList.append(contentsOf: [true,
+ false
])
- beerImageList.append(contentsOf: ["iconTasteOffBeer",
- "iconTasteOffBeer"
+ beerImageList.append(contentsOf: [false,
+ true
])
- pourImageList.append(contentsOf: ["iconTasteOffBumeok",
- "iconTasteOffBumeok"
+ pourImageList.append(contentsOf: [false,
+ true
])
- putSauceImageList.append(contentsOf: ["iconTasteOnZzik",
- "iconTasteOnZzik"
+ putSauceImageList.append(contentsOf: [true,
+ false
])
- yangnyumImageList.append(contentsOf: ["iconTasteOffSeasoned",
- "iconTasteOffSeasoned"
+ yangnyumImageList.append(contentsOf: [false,
+ true
])
- friedImageList.append(contentsOf: ["iconTasteOnFried",
- "iconTasteOnFried"
+ friedImageList.append(contentsOf: [true,
+ false
])
firstTmiList.append(contentsOf: ["์ฒซ๋ฒ์งธ",
"์ฒซ๋ฒ์งธ"
From bd182353652f7ed579188c11b23b93f55204eb15 Mon Sep 17 00:00:00 2001
From: MinjaeLee <2alswo7@khu.ac.kr>
Date: Sun, 28 Nov 2021 11:01:49 +0900
Subject: [PATCH 2/9] =?UTF-8?q?[FIX]=20#89=20-=20=EB=AF=B8=EB=A6=AC?=
=?UTF-8?q?=EB=B3=B4=EA=B8=B0=20=EB=B7=B0=20setBackCardWith=20=EB=A9=94?=
=?UTF-8?q?=EC=84=9C=EB=93=9C=20=EB=B6=80=EB=B6=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CardCreationPreviewViewController.swift | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift
index f9f554af..89dcf46e 100644
--- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift
+++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift
@@ -8,7 +8,7 @@
import UIKit
class CardCreationPreviewViewController: UIViewController {
-
+
var backgroundImage: Data?
var frontCardDataModel: FrontCardDataModel?
var backCardDataModel: BackCardDataModel?
@@ -25,7 +25,7 @@ class CardCreationPreviewViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
-
+
setUI()
}
@IBAction func touchCompleteButton(_ sender: Any) {
@@ -79,12 +79,12 @@ extension CardCreationPreviewViewController {
guard let frontCard = FrontCardCell.nib().instantiate(withOwner: self, options: nil).first as? FrontCardCell else { return }
// FIXME: - @IBDesignables err
-// guard let frontCard = Bundle(for: FrontCardCell.self).loadNibNamed(Const.Xib.frontCardCell, owner: self, options: nil)?.first as? FrontCardCell else { return }
+ // guard let frontCard = Bundle(for: FrontCardCell.self).loadNibNamed(Const.Xib.frontCardCell, owner: self, options: nil)?.first as? FrontCardCell else { return }
frontCard.frame = CGRect(x: 0, y: 0, width: cardView.frame.width, height: cardView.frame.height)
// FIXME: - ๊ฐค๋ฌ๋ฆฌ ์ถ๊ฐ/์ฃผ์ํด์
-// guard let frontCardDataModel = frontCardDataModel else { return }
-// frontCard.initCell("", frontCardDataModel.title, frontCardDataModel.description, frontCardDataModel.name, frontCardDataModel.birthDate, frontCardDataModel.mbti, frontCardDataModel.instagramID, frontCardDataModel.linkURL)
+ // guard let frontCardDataModel = frontCardDataModel else { return }
+ // frontCard.initCell("", frontCardDataModel.title, frontCardDataModel.description, frontCardDataModel.name, frontCardDataModel.birthDate, frontCardDataModel.mbti, frontCardDataModel.instagramID, frontCardDataModel.linkURL)
// FIXME: - dummy data
frontCard.initCell("card", "nada", "NADA์ ์งฑ๊ท์ผ๋ฅ์ด ใ
๋ง์ด๋~", "๊ฐ๋นก์ณํ๋ ์ค์ผ์น~", "1999/05/12", "ENFP", "yaeoni", "github.com/yaeoni")
@@ -95,10 +95,12 @@ extension CardCreationPreviewViewController {
guard let backCard = BackCardCell.nib().instantiate(withOwner: self, options: nil).first as? BackCardCell else { return }
guard let backCardDataModel = backCardDataModel else { return }
backCard.frame = CGRect(x: 0, y: 0, width: cardView.frame.width, height: cardView.frame.height)
- // TODO: - BackCardCell.initCell ์์ ๋๋ฉด ๋ฐ์ํ๊ธฐ
-// backCard.initCell("card", <#T##mintImage: String##String#>, <#T##noMintImage: String##String#>, <#T##sojuImage: String##String#>, <#T##beerImage: String##String#>, <#T##pourImage: String##String#>, <#T##putSauceImage: String##String#>, <#T##yangnyumImage: String##String#>, <#T##friedImage: String##String#>, <#T##firstTmi: String##String#>, <#T##secondTmi: String##String#>, <#T##thirdTmi: String##String#>)
+
+ // FIXME: - dummy data
+ backCard.initCell("card", false, true, false, true, false, true, false, true, "ํฐ์ ์์ด", "๋ชจ์ฐ์ง", "๋ชจ๋ฅด๊ฒ ๋ค")
+ cardView.addSubview(backCard)
}
-
+
// MARK: - Network
func cardCreationWithAPI(request: CardCreationRequest, image: UIImage) {
From b534a79113a9435d10061f6ed7e25c2e4e545d03 Mon Sep 17 00:00:00 2001
From: MinjaeLee <2alswo7@khu.ac.kr>
Date: Sun, 28 Nov 2021 11:10:13 +0900
Subject: [PATCH 3/9] =?UTF-8?q?[FIX]=20#89=20-=20=EB=AA=85=ED=95=A8=20?=
=?UTF-8?q?=EA=B7=B8=EB=A3=B9=20=EB=B7=B0=20=EB=AA=85=ED=95=A8=20=EA=B8=80?=
=?UTF-8?q?=20=EC=83=89=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CardInGroupCollectionViewCell.xib | 22 ++++++++-----------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.xib b/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.xib
index 11a841f0..e2f72212 100644
--- a/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.xib
+++ b/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.xib
@@ -1,10 +1,9 @@
-
+
-
-
+
@@ -36,31 +35,31 @@
@@ -73,7 +72,7 @@
@@ -86,7 +85,7 @@
@@ -144,9 +143,6 @@
-
-
-
From aac14979905b970267492824aefe746ff1707c8f Mon Sep 17 00:00:00 2001
From: MinjaeLee <2alswo7@khu.ac.kr>
Date: Sun, 28 Nov 2021 12:39:34 +0900
Subject: [PATCH 4/9] =?UTF-8?q?[FIX]=20#89=20-=20=EB=8D=94=EB=B3=B4?=
=?UTF-8?q?=EA=B8=B0=20=EB=B7=B0=20=EA=B5=AC=EB=B6=84=EC=84=A0=EA=B3=BC=20?=
=?UTF-8?q?=EB=B0=B0=EA=B2=BD=EC=83=89=20=EC=9D=B4=EC=8A=88=20=ED=95=B4?=
=?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Resouces/Storyboards/More/More.storyboard | 6 ++++--
.../Sources/Cells/MoreList/MoreListTableViewCell.swift | 1 +
.../Sources/Cells/MoreList/MoreListTableViewCell.xib | 1 +
.../ViewControllers/More/MoreViewController.swift | 10 +++++++++-
4 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard
index 3ce39232..1310fb1d 100644
--- a/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard
+++ b/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard
@@ -41,8 +41,11 @@
-
+
+
+
+
@@ -52,7 +55,6 @@
-
diff --git a/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.swift
index ed70db0a..517c7f6e 100644
--- a/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.swift
+++ b/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.swift
@@ -11,6 +11,7 @@ class MoreListTableViewCell: UITableViewCell {
@IBOutlet weak var titleLabel: UILabel!
@IBOutlet weak var modeSwitch: UISwitch!
+ @IBOutlet weak var separatorView: UIView!
override func awakeFromNib() {
super.awakeFromNib()
diff --git a/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.xib b/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.xib
index 610cb9f1..2d40e388 100644
--- a/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.xib
+++ b/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.xib
@@ -54,6 +54,7 @@
+
diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift
index cc2c624b..180d7d4e 100644
--- a/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift
+++ b/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift
@@ -47,6 +47,9 @@ extension MoreViewController: UITableViewDataSource {
}
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+ if section == 2 {
+ return 0
+ }
return 5
}
@@ -55,14 +58,19 @@ extension MoreViewController: UITableViewDataSource {
if indexPath.section == 0 {
serviceCell.titleLabel.text = firstItems[indexPath.row]
+ if indexPath.row == firstItems.count - 1 {
+ serviceCell.separatorView.isHidden = true
+ }
} else if indexPath.section == 1 {
serviceCell.titleLabel.text = secondItems[indexPath.row]
serviceCell.modeSwitch.isHidden = true
+ if indexPath.row == secondItems.count - 1 {
+ serviceCell.separatorView.isHidden = true
+ }
} else if indexPath.section == 2 {
serviceCell.titleLabel.text = thirdItems[indexPath.row]
serviceCell.modeSwitch.isHidden = true
}
-
return serviceCell
}
}
From 9b67c552fae73c634c036e73d51702d03eb33e3f Mon Sep 17 00:00:00 2001
From: MinjaeLee <2alswo7@khu.ac.kr>
Date: Sun, 28 Nov 2021 16:15:03 +0900
Subject: [PATCH 5/9] =?UTF-8?q?[FIX]=20#89=20-=20=EB=B0=94=ED=85=80?=
=?UTF-8?q?=EC=8B=9C=ED=8A=B8=20present=20=EC=A7=80=EC=97=B0=EC=9D=B4?=
=?UTF-8?q?=EC=8A=88=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Colors.xcassets/quaternary.colorset/Contents.json | 6 +++---
.../Colors.xcassets/secondary.colorset/Contents.json | 6 +++---
.../BottomSheet/CommonBottomSheetViewController.swift | 2 +-
.../ViewControllers/Group/GroupViewController.swift | 6 ++++--
.../GroupEdit/GroupEditViewController.swift | 7 ++++---
5 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/quaternary.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/quaternary.colorset/Contents.json
index 94e0a763..a290db51 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/quaternary.colorset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/quaternary.colorset/Contents.json
@@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
- "blue" : "0x76",
- "green" : "0x6C",
- "red" : "0x66"
+ "blue" : "118",
+ "green" : "108",
+ "red" : "102"
}
},
"idiom" : "universal"
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/secondary.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/secondary.colorset/Contents.json
index e46bd787..0dc1dac8 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/secondary.colorset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/secondary.colorset/Contents.json
@@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
- "blue" : "0xF5",
- "green" : "0xF3",
- "red" : "0xF1"
+ "blue" : "245",
+ "green" : "243",
+ "red" : "241"
}
},
"idiom" : "universal"
diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift
index a0f68554..0a07d795 100644
--- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift
+++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift
@@ -15,7 +15,7 @@ import UIKit
3) InheritanceViewController์ ํ
์คํธ ํ๋, ํผ์ปค ๋ทฐ, ๋ฒํผ ๋ฑ ๊ฐ ํ๋ฉด์ ๋ง๋ ์ถ๊ฐ ๊ธฐ๋ฅ ๊ตฌํ
4) .setHeight ๋ฉ์๋ ํ๋ผ๋ฏธํฐ๋ก ๋์ด๊ฐ์ ์กฐ์ (default๊ฐ์ 475)
5) .setTitle ๋ฉ์๋ ํ๋ผ๋ฏธํฐ๋ก ๊ฐ์ฅ ์๋จ ํ์ดํ ๋ผ๋ฒจ์ ๋ค์ด๊ฐ ๋ด์ฉ ์
๋ ฅ (String)
- 6) present ๋ฐฉ์์ผ๋ก ํ๋ฉด์ ํ์ถ
+ 6) present ๋ฐฉ์์ผ๋ก ํ๋ฉด์ ํ์ถ (์ฃผ์!! ์ด๋ present animated๋ false๋ก ๋ฌ์ผ ์ง์ฐ์์ด ๋ฐํ
์ํธ๊ฐ ์ฌ๋ผ์ต๋๋ค ^_^)
*/
class CommonBottomSheetViewController: UIViewController {
diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift
index f06e63ac..49258246 100644
--- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift
+++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift
@@ -12,9 +12,11 @@ class GroupViewController: UIViewController {
// MARK: - Properties
// ๋ค๋น๊ฒ์ด์
๋ฐ
@IBAction func presentToAddWithIdView(_ sender: Any) {
- let nextVC = AddWithIdBottomSheetViewController().setTitle("ID๋ก ๋ช
ํจ ์ถ๊ฐ").setHeight(184)
+ let nextVC = AddWithIdBottomSheetViewController()
+ .setTitle("ID๋ก ๋ช
ํจ ์ถ๊ฐ")
+ .setHeight(184)
nextVC.modalPresentationStyle = .overFullScreen
- self.present(nextVC, animated: true, completion: nil)
+ self.present(nextVC, animated: false, completion: nil)
}
@IBAction func presentToAddWithQrView(_ sender: Any) {
diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/GroupEdit/GroupEditViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/GroupEdit/GroupEditViewController.swift
index 9797c349..008469eb 100644
--- a/NADA-iOS-forRelease/Sources/ViewControllers/GroupEdit/GroupEditViewController.swift
+++ b/NADA-iOS-forRelease/Sources/ViewControllers/GroupEdit/GroupEditViewController.swift
@@ -31,9 +31,11 @@ class GroupEditViewController: UIViewController {
}
@IBAction func presentToAddGroupBottom(_ sender: UIButton) {
- let nextVC = AddGroupBottomSheetViewController().setTitle("๊ทธ๋ฃน ์ถ๊ฐ").setHeight(184)
+ let nextVC = AddGroupBottomSheetViewController()
+ .setTitle("๊ทธ๋ฃน ์ถ๊ฐ")
+ .setHeight(184)
nextVC.modalPresentationStyle = .overFullScreen
- self.present(nextVC, animated: true, completion: nil)
+ self.present(nextVC, animated: false, completion: nil)
}
}
@@ -63,7 +65,6 @@ extension GroupEditViewController: UITableViewDelegate {
// MARK: - TableView DataSource
extension GroupEditViewController: UITableViewDataSource {
-
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return cardItems.count
}
From 8bd439fda3e07bedc323a2e8e563f515ac2aceed Mon Sep 17 00:00:00 2001
From: MinjaeLee <2alswo7@khu.ac.kr>
Date: Sun, 28 Nov 2021 22:42:54 +0900
Subject: [PATCH 6/9] =?UTF-8?q?[FIX]=20#89=20-=20=EB=A9=94=EC=9D=B8?=
=?UTF-8?q?=EB=B7=B0=20=EB=8D=94=EB=AF=B8=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
=?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Cells/CardCell/FrontCardCell.swift | 4 +--
.../Main/FrontViewController.swift | 28 +++++++++----------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift
index 56f2adb1..5522f8c8 100644
--- a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift
+++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift
@@ -48,9 +48,9 @@ extension FrontCardCell {
birthLabel.textColor = .white
mbtiLabel.font = .textRegular02
mbtiLabel.textColor = .white
- instagramIDLabel.font = .textRegular02
+ instagramIDLabel.font = .textRegular03
instagramIDLabel.textColor = .white
- linkURLLabel.font = .textRegular02
+ linkURLLabel.font = .textRegular04
linkURLLabel.textColor = .white
}
diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift
index 224a4b51..cde75efd 100644
--- a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift
+++ b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift
@@ -91,23 +91,23 @@ extension FrontViewController {
imageList.append(contentsOf: ["card",
"card"
])
- cardNameList.append(contentsOf: ["SOPT 28๊ธฐ ๋ช
ํจ",
- "SOPT 28๊ธฐ ๋ช
ํจ"
+ cardNameList.append(contentsOf: ["SOPT ๋ช
ํจ",
+ "SOPT ๋ช
ํจ"
])
- detailCardNameList.append(contentsOf: ["28๊ธฐ ๋์์ธํํธ์",
- "28๊ธฐ ๋์์ธํํธ์"
+ detailCardNameList.append(contentsOf: ["29๊ธฐ ๋์์ธํํธ",
+ "29๊ธฐ ๋์์ธํํธ"
])
- userNameList.append(contentsOf: ["๊นํ์",
- "๊นํ์"
+ userNameList.append(contentsOf: ["์ด์ฑ์ฐ",
+ "์ด์ฑ์ฐ"
])
- birthList.append(contentsOf: ["2002/11/06 (20์ธ)",
- "2002/11/06 (20์ธ)"
+ birthList.append(contentsOf: ["1998.01.09 (24)",
+ "1998.01.09 (24)"
])
- mbtiList.append(contentsOf: ["ISTJ",
- "ISTJ"
+ mbtiList.append(contentsOf: ["ENFP",
+ "ENFP"
])
- instagramIDList.append(contentsOf: ["@passio84ever",
- "@passio84ever"
+ instagramIDList.append(contentsOf: ["chaens_",
+ "chaens_"
])
linkImageList.append(contentsOf: ["testLink",
"testLink"
@@ -115,8 +115,8 @@ extension FrontViewController {
linkTextList.append(contentsOf: ["Blog",
"Blog"
])
- linkIDList.append(contentsOf: ["blog.naver.com/\npark_yunjung",
- "blog.naver.com/\npark_yunjung"
+ linkIDList.append(contentsOf: ["https://github.com/TeamNADA",
+ "https://github.com/TeamNADA"
])
}
From 30524132c8572503766b5aabb6088b1df265abe3 Mon Sep 17 00:00:00 2001
From: MinjaeLee <2alswo7@khu.ac.kr>
Date: Mon, 29 Nov 2021 11:26:49 +0900
Subject: [PATCH 7/9] =?UTF-8?q?[FIX]=20#89=20-=20=EB=B0=94=ED=85=80?=
=?UTF-8?q?=EC=8B=9C=ED=8A=B8=20=EB=8B=A4=ED=81=AC=EB=AA=A8=EB=93=9C=20?=
=?UTF-8?q?=EB=8C=80=EC=9D=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Resouces/Storyboards/Group/GroupEdit.storyboard | 13 ++++++-------
.../CommonBottomSheetViewController.swift | 7 ++++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Group/GroupEdit.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Group/GroupEdit.storyboard
index 45666276..7172c595 100644
--- a/NADA-iOS-forRelease/Resouces/Storyboards/Group/GroupEdit.storyboard
+++ b/NADA-iOS-forRelease/Resouces/Storyboards/Group/GroupEdit.storyboard
@@ -6,7 +6,6 @@
-
@@ -57,7 +56,7 @@
-
+
@@ -73,11 +72,11 @@
-
+
-
+
@@ -100,11 +99,11 @@
+
+
+
-
-
-
diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift
index 0a07d795..d8cec02d 100644
--- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift
+++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift
@@ -37,7 +37,7 @@ class CommonBottomSheetViewController: UIViewController {
// ๋ฐํ
์ํธ ๋ทฐ
let bottomSheetView: UIView = {
let view = UIView()
- view.backgroundColor = .white
+ view.backgroundColor = .background
view.layer.cornerRadius = 27
view.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
@@ -49,7 +49,7 @@ class CommonBottomSheetViewController: UIViewController {
// ์์ฐ์ค๋ฌ์ด ์ ๋๋ฉ์ด์
์ ์ํ..์ปค๋ฒ..
let bottomSheetCoverView: UIView = {
let view = UIView()
- view.backgroundColor = .white
+ view.backgroundColor = .background
view.layer.cornerRadius = 27
view.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
@@ -70,7 +70,8 @@ class CommonBottomSheetViewController: UIViewController {
// ๋ฐํ
์ํธ ๋ฉ์ธ ๋ผ๋ฒจ
public let titleLabel: UILabel = {
let label = UILabel()
- label.font = .systemFont(ofSize: 20, weight: .bold)
+ label.font = .title01
+ label.textColor = .primary
label.textAlignment = .center
label.sizeToFit()
From edf37c57c9dd5a13478707851255b3796ffada68 Mon Sep 17 00:00:00 2001
From: MinjaeLee <2alswo7@khu.ac.kr>
Date: Mon, 29 Nov 2021 11:40:49 +0900
Subject: [PATCH 8/9] =?UTF-8?q?[FIX]=20#89=20-=20push=20=ED=83=AD=EB=B0=94?=
=?UTF-8?q?=20=EA=B0=80=EB=A6=AC=EA=B8=B0=EC=99=80=20=EB=8B=A4=ED=81=AC?=
=?UTF-8?q?=EB=AA=A8=EB=93=9C=20=EB=8C=80=EC=9D=91=20=EC=84=B8=EB=B6=80?=
=?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Resouces/Extensions/UIColor+Extension.swift | 15 +++++++++++++++
.../Storyboards/Group/GroupEdit.storyboard | 2 +-
.../Cells/GroupEdit/GroupEditTableViewCell.xib | 4 ++++
.../CommonBottomSheetViewController.swift | 2 +-
4 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift
index aef44bc3..71381f5e 100644
--- a/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift
+++ b/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift
@@ -119,4 +119,19 @@ extension UIColor {
return UIColor(white: 1.0, alpha: 1.0)
}
}
+
+ @nonobjc class var bottomDimmedBackground: UIColor {
+ if #available(iOS 13, *) {
+ return UIColor { (traitCollection: UITraitCollection) -> UIColor in
+ if traitCollection.userInterfaceStyle == .light {
+ return UIColor(white: 0.0, alpha: 0.4)
+ } else {
+ return UIColor(white: 0.0, alpha: 0.6)
+ }
+ }
+ } else {
+ return UIColor(white: 0.0, alpha: 0.4)
+ }
+ }
+
}
diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Group/GroupEdit.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Group/GroupEdit.storyboard
index 7172c595..fa09cc89 100644
--- a/NADA-iOS-forRelease/Resouces/Storyboards/Group/GroupEdit.storyboard
+++ b/NADA-iOS-forRelease/Resouces/Storyboards/Group/GroupEdit.storyboard
@@ -17,7 +17,7 @@
-
+
diff --git a/NADA-iOS-forRelease/Sources/Cells/GroupEdit/GroupEditTableViewCell.xib b/NADA-iOS-forRelease/Sources/Cells/GroupEdit/GroupEditTableViewCell.xib
index b4025310..1fedfebe 100644
--- a/NADA-iOS-forRelease/Sources/Cells/GroupEdit/GroupEditTableViewCell.xib
+++ b/NADA-iOS-forRelease/Sources/Cells/GroupEdit/GroupEditTableViewCell.xib
@@ -37,6 +37,7 @@
+
@@ -54,6 +55,9 @@
+
+
+
diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift
index d8cec02d..9a3dd947 100644
--- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift
+++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift
@@ -30,7 +30,7 @@ class CommonBottomSheetViewController: UIViewController {
// ๊ธฐ์กด ํ๋ฉด์ ํ๋ ค์ง๊ฒ ๋ง๋ค๊ธฐ ์ํ ๋ทฐ
private let dimmedBackView: UIView = {
let view = UIView()
- view.backgroundColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.5)
+ view.backgroundColor = .bottomDimmedBackground
return view
}()
From eaf66a6ad5b6d6d741d441afe5f7c5162c237743 Mon Sep 17 00:00:00 2001
From: MinjaeLee <2alswo7@khu.ac.kr>
Date: Mon, 29 Nov 2021 13:37:45 +0900
Subject: [PATCH 9/9] =?UTF-8?q?[REFACTOR]=20#89=20-=20BackCardCell=20?=
=?UTF-8?q?=EC=A1=B0=EA=B1=B4=EB=AC=B8=20=EC=82=BC=ED=95=AD=EC=97=B0?=
=?UTF-8?q?=EC=82=B0=EC=9E=90=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Sources/Cells/CardCell/BackCardCell.swift | 56 ++++++-------------
1 file changed, 16 insertions(+), 40 deletions(-)
diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift
index 550b9d91..0c665bf7 100644
--- a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift
+++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift
@@ -68,46 +68,22 @@ extension BackCardCell {
if let bgImage = UIImage(named: backgroundImage) {
self.backgroundImageView.image = bgImage
}
- if isMintImage == true {
- self.mintImageView.image = UIImage(named: "iconTasteOnMincho")
- } else {
- self.mintImageView.image = UIImage(named: "iconTasteOffMincho")
- }
- if isNoMintImage == true {
- self.noMintImageView.image = UIImage(named: "iconTasteOnBanmincho")
- } else {
- self.noMintImageView.image = UIImage(named: "iconTasteOffBanmincho")
- }
- if isSojuImage == true {
- self.sojuImageView.image = UIImage(named: "iconTasteOnSoju")
- } else {
- self.sojuImageView.image = UIImage(named: "iconTasteOffSoju")
- }
- if isBeerImage == true {
- self.beerImageView.image = UIImage(named: "iconTasteOnBeer")
- } else {
- self.beerImageView.image = UIImage(named: "iconTasteOffBeer")
- }
- if isPourImage == true {
- self.pourEatImageView.image = UIImage(named: "iconTasteOnBumeok")
- } else {
- self.pourEatImageView.image = UIImage(named: "iconTasteOffBumeok")
- }
- if isPutSauceImage == true {
- self.putSauceEatImageView.image = UIImage(named: "iconTasteOnZzik")
- } else {
- self.putSauceEatImageView.image = UIImage(named: "iconTasteOffZzik")
- }
- if isYangnyumImage == true {
- self.sauceChickenImageView.image = UIImage(named: "iconTasteOnSeasoned")
- } else {
- self.sauceChickenImageView.image = UIImage(named: "iconTasteOffSeasoned")
- }
- if isFriedImage == true {
- self.friedChickenImageView.image = UIImage(named: "iconTasteOnFried")
- } else {
- self.friedChickenImageView.image = UIImage(named: "iconTasteOffFried")
- }
+ self.mintImageView.image = isMintImage == true ?
+ UIImage(named: "iconTasteOnMincho") : UIImage(named: "iconTasteOffMincho")
+ self.noMintImageView.image = isNoMintImage == true ?
+ UIImage(named: "iconTasteOnBanmincho") : UIImage(named: "iconTasteOffBanmincho")
+ self.sojuImageView.image = isSojuImage == true ?
+ UIImage(named: "iconTasteOnSoju") : UIImage(named: "iconTasteOffSoju")
+ self.beerImageView.image = isBeerImage == true ?
+ UIImage(named: "iconTasteOnBeer") : UIImage(named: "iconTasteOffBeer")
+ self.pourEatImageView.image = isPourImage == true ?
+ UIImage(named: "iconTasteOnBumeok") : UIImage(named: "iconTasteOffBumeok")
+ self.putSauceEatImageView.image = isPutSauceImage == true ?
+ UIImage(named: "iconTasteOnZzik") : UIImage(named: "iconTasteOffZzik")
+ self.sauceChickenImageView.image = isYangnyumImage == true ?
+ UIImage(named: "iconTasteOnSeasoned") : UIImage(named: "iconTasteOffSeasoned")
+ self.friedChickenImageView.image = isFriedImage == true ?
+ UIImage(named: "iconTasteOnFried") : UIImage(named: "iconTasteOffFried")
self.firstTmiLabel.text = firstTmi
self.secondTmiLabel.text = secondTmi
self.thirdTmiLabel.text = thirdTmi