From 4fcd1fa91e563caa26a35a64d1f34a4caf654496 Mon Sep 17 00:00:00 2001 From: kim-seonwoo Date: Sun, 7 Jan 2024 16:59:03 +0900 Subject: [PATCH 1/6] =?UTF-8?q?[Add/#26]=20NavigationBar=20-=20=20?= =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=97=90=EC=85=8B=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ios_point.imageset/Contents.json | 23 ++++++++++++++++++ .../ios_point.imageset/ios_point.png | Bin 0 -> 791 bytes .../ios_point.imageset/ios_point@2x.png | Bin 0 -> 1412 bytes .../ios_point.imageset/ios_point@3x.png | Bin 0 -> 2052 bytes 4 files changed, 23 insertions(+) create mode 100644 HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/ios_point.imageset/Contents.json create mode 100644 HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/ios_point.imageset/ios_point.png create mode 100644 HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/ios_point.imageset/ios_point@2x.png create mode 100644 HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/ios_point.imageset/ios_point@3x.png diff --git a/HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/ios_point.imageset/Contents.json b/HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/ios_point.imageset/Contents.json new file mode 100644 index 0000000..f78062d --- /dev/null +++ b/HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/ios_point.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "ios_point.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ios_point@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ios_point@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/ios_point.imageset/ios_point.png b/HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/ios_point.imageset/ios_point.png new file mode 100644 index 0000000000000000000000000000000000000000..da9d0cd3014739b99ccd23c7eaedc4c00985fd95 GIT binary patch literal 791 zcmV+y1L*vTP)X1^@s6D=Y3@00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP7{=Cx9bUE5iC8Z>(ckx&R7I*zX)GZ&(l zK-splf+%_mU@-&tMK{{Qh`CbVzn)ZJtk&PaktLFVmzZD_I|>WrC|qFux+bf@6FYSB z5IkF%gC+39<+^pwXQM(shp@@(LP@U>41&v#B+tuOsoP1Ku3ImWWYToA#Cb9{1fPSS z;M>nqK@`0iWB9~p5X;*S4r}{CFg$Nk48R0Ro@4roI0#-oKyK@?TT>pl0Dmu>l>O!~ zI>?(5hMDUe(}Pu^F!@aiV%JgjlH`1zACZZ>oUnqBu;GCoRn{*S!bydf_4$#KM3_PZ zWziWFaMt8$XjweQg=g54FN8@+-`a*3qm=>D8w7%?T3P$|U>Gj1&O{lWY-54rTXttw zS~OEx-DC)z8B{5)DOE>g6kT#rtvkz25_H~21I4v^DX{vU>jbiC)=^2!vNn}1h7@eg zR1TY!NG05K-vCZnK96fs@W6{p2gr$rC!aYsuFRnSQko{b2)QO|q=&*u$9pD0ihkxP zDCkiL_)_$=CQR0|2h{w$Yw!SzC5!YK&{k@7g~g(We(?`Ilz&;FeyukN*9&;+U&YvTTGu~{1K^mu=<%*-Ax^`PJ1ZBK-ctv~Bx!rI9|42{ VH=ZG|k%a&N002ovPDHLkV1frCUjqOD literal 0 HcmV?d00001 diff --git a/HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/ios_point.imageset/ios_point@2x.png b/HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/ios_point.imageset/ios_point@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4379e9647935ab76f143d2a52234f7b78659bb43 GIT binary patch literal 1412 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 Date: Sun, 7 Jan 2024 17:00:08 +0900 Subject: [PATCH 2/6] =?UTF-8?q?[Feat/#26]=20Image=20-=20=ED=8F=AC=EC=9D=B8?= =?UTF-8?q?=ED=8A=B8=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=A6=AC=ED=84=B0?= =?UTF-8?q?=EB=9F=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HMH_iOS/HMH_iOS/Global/Literals/Literal/Image.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/HMH_iOS/HMH_iOS/Global/Literals/Literal/Image.swift b/HMH_iOS/HMH_iOS/Global/Literals/Literal/Image.swift index 3ed7b41..e3edab3 100644 --- a/HMH_iOS/HMH_iOS/Global/Literals/Literal/Image.swift +++ b/HMH_iOS/HMH_iOS/Global/Literals/Literal/Image.swift @@ -10,6 +10,7 @@ import UIKit enum ImageLiterals { enum NavigationBar { static var icArrowLeft: UIImage { .load(named: "ic_back")} + static var icPoint: UIImage { .load(named: "ios_point")} } enum TabBar { From 578e23e564f43ccc1c77d4e0c47c85c49ec77c52 Mon Sep 17 00:00:00 2001 From: kim-seonwoo Date: Sun, 7 Jan 2024 17:00:38 +0900 Subject: [PATCH 3/6] =?UTF-8?q?[Fix/#26]=20NavigationBar=20-=20=EB=B0=B1?= =?UTF-8?q?=EA=B7=B8=EB=9D=BC=EC=9A=B4=EB=93=9C=20=EC=BB=AC=EB=9F=AC=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/UIComponets/HMHNavigationBar.swift | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift b/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift index cb26a12..f2c6566 100644 --- a/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift +++ b/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift @@ -18,6 +18,7 @@ final class HMHNavigationBar: UIView { } private var type: NavigationBarType = .normal + private var isGray: Bool = false private lazy var backArrowButton = UIButton().then { $0.setImage(ImageLiterals.NavigationBar.icArrowLeft, for: .normal) @@ -25,7 +26,6 @@ final class HMHNavigationBar: UIView { } private lazy var pointButton = UIButton().then { - $0.backgroundColor = .blue $0.isHidden = true } @@ -39,17 +39,19 @@ final class HMHNavigationBar: UIView { $0.isHidden = true } - init(leftItem type: NavigationBarType, isBackButton: Bool, isTitleLabel: Bool, isPointImage: Bool, titleText: String? = nil) { + init(leftItem type: NavigationBarType, isBackButton: Bool, isTitleLabel: Bool, isPointImage: Bool, isBackGroundGray: Bool, titleText: String? = nil) { super.init(frame: .zero) self.type = type backArrowButton.isHidden = !isBackButton titleLabel.isHidden = !isTitleLabel pointButton.isHidden = !isPointImage + isGray = isBackGroundGray titleLabel.text = titleText setUI() addTarget() + configureNavigationBar() } required init?(coder: NSCoder) { @@ -72,6 +74,9 @@ final class HMHNavigationBar: UIView { } private func setConstraints() { + self.snp.makeConstraints { + $0.height.equalTo(63.adjustedHeight) + } switch type { case .normal: backArrowButton.snp.makeConstraints { @@ -103,6 +108,9 @@ final class HMHNavigationBar: UIView { backArrowButton.addTarget(self, action: #selector(backArrowButtonTapped), for: .touchUpInside) } + private func configureNavigationBar() { + self.backgroundColor = isGray ? .gray3 : .background + } @objc private func backArrowButtonTapped() { guard let navigationController = findViewController()?.navigationController else { From 8e54ed6c0f6d4042ea3373562e873725f10b61da Mon Sep 17 00:00:00 2001 From: kim-seonwoo Date: Sun, 7 Jan 2024 17:09:42 +0900 Subject: [PATCH 4/6] =?UTF-8?q?[Feat/#26]=20-=20NavigationBar=20pointView?= =?UTF-8?q?=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/UIComponets/HMHNavigationBar.swift | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift b/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift index f2c6566..6d7096d 100644 --- a/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift +++ b/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift @@ -29,6 +29,11 @@ final class HMHNavigationBar: UIView { $0.isHidden = true } + private let pointImageView = UIImageView().then { + $0.image = ImageLiterals.NavigationBar.icPoint + $0.tintColor = .gray3 + } + private let logoImageView = UIImageView().then { $0.backgroundColor = .blue } @@ -67,7 +72,7 @@ final class HMHNavigationBar: UIView { switch type { case .normal: self.addSubviews(backArrowButton, titleLabel, pointButton) - + pointButton.addSubview(pointImageView) case .logo: self.addSubviews(logoImageView) } @@ -95,6 +100,10 @@ final class HMHNavigationBar: UIView { $0.size.equalTo(24.adjusted) } + pointImageView.snp.makeConstraints { + $0.edges.equalToSuperview() + } + case .logo: logoImageView.snp.makeConstraints { $0.centerY.equalToSuperview() @@ -109,7 +118,7 @@ final class HMHNavigationBar: UIView { } private func configureNavigationBar() { - self.backgroundColor = isGray ? .gray3 : .background + self.backgroundColor = isGray ? .gray7 : .background } @objc private func backArrowButtonTapped() { From 42f68edd164570c3711bb59349551d3e6c627445 Mon Sep 17 00:00:00 2001 From: kim-seonwoo Date: Sun, 7 Jan 2024 17:13:33 +0900 Subject: [PATCH 5/6] =?UTF-8?q?[Fix/#26]=20NavigationBar=20-=20=EC=A4=84?= =?UTF-8?q?=EB=B0=94=EA=BF=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Presentation/Common/UIComponets/HMHNavigationBar.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift b/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift index 6d7096d..f9d5a9d 100644 --- a/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift +++ b/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift @@ -44,7 +44,12 @@ final class HMHNavigationBar: UIView { $0.isHidden = true } - init(leftItem type: NavigationBarType, isBackButton: Bool, isTitleLabel: Bool, isPointImage: Bool, isBackGroundGray: Bool, titleText: String? = nil) { + init(leftItem type: NavigationBarType, + isBackButton: Bool, + isTitleLabel: Bool, + isPointImage: Bool, + isBackGroundGray: Bool, + titleText: String? = nil) { super.init(frame: .zero) self.type = type From b962ae84e3ed3b490f56f0abbee886f4bd859c20 Mon Sep 17 00:00:00 2001 From: kim-seonwoo Date: Mon, 8 Jan 2024 12:08:10 +0900 Subject: [PATCH 6/6] =?UTF-8?q?[Fix/#26]=20NavigationBar=20-=20SE=20?= =?UTF-8?q?=EC=82=AC=EC=9D=B4=EC=A6=88=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/UIComponets/HMHNavigationBar.swift | 91 +++++++++++++------ 1 file changed, 64 insertions(+), 27 deletions(-) diff --git a/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift b/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift index f9d5a9d..363807e 100644 --- a/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift +++ b/HMH_iOS/HMH_iOS/Presentation/Common/UIComponets/HMHNavigationBar.swift @@ -84,36 +84,73 @@ final class HMHNavigationBar: UIView { } private func setConstraints() { - self.snp.makeConstraints { - $0.height.equalTo(63.adjustedHeight) - } - switch type { - case .normal: - backArrowButton.snp.makeConstraints { - $0.centerY.equalToSuperview() - $0.leading.equalToSuperview().inset(20.adjusted) - $0.size.equalTo(24.adjusted) + //SE이외의 기기 일때 + if UIScreen.main.isLongerThan812pt { + self.snp.makeConstraints { + $0.height.equalTo(113.adjusted) } - - titleLabel.snp.makeConstraints { - $0.center.equalToSuperview() + switch type { + case .normal: + backArrowButton.snp.makeConstraints { + $0.centerY.equalTo(titleLabel) + $0.leading.equalToSuperview().inset(20.adjusted) + $0.size.equalTo(24.adjusted) + } + + titleLabel.snp.makeConstraints { + $0.top.equalToSuperview().offset(68.adjusted) + $0.centerX.equalToSuperview() + } + + pointButton.snp.makeConstraints { + $0.centerY.equalTo(titleLabel) + $0.trailing.equalToSuperview().inset(20.adjusted) + $0.size.equalTo(24.adjusted) + } + + pointImageView.snp.makeConstraints { + $0.edges.equalToSuperview() + } + + case .logo: + logoImageView.snp.makeConstraints { + $0.centerY.equalToSuperview().offset(50.adjusted) + $0.leading.equalToSuperview().inset(20.adjusted) + $0.size.equalTo(24.adjusted) + } } - - pointButton.snp.makeConstraints { - $0.centerY.equalToSuperview() - $0.trailing.equalToSuperview().inset(20.adjusted) - $0.size.equalTo(24.adjusted) + } else { + self.snp.makeConstraints { + $0.height.equalTo(83.adjusted) } - - pointImageView.snp.makeConstraints { - $0.edges.equalToSuperview() - } - - case .logo: - logoImageView.snp.makeConstraints { - $0.centerY.equalToSuperview() - $0.leading.equalToSuperview().inset(20.adjusted) - $0.size.equalTo(24.adjusted) + switch type { + case .normal: + backArrowButton.snp.makeConstraints { + $0.centerY.equalTo(titleLabel) + $0.leading.equalToSuperview().inset(20.adjusted) + $0.size.equalTo(24.adjusted) + } + + titleLabel.snp.makeConstraints { + $0.centerX.equalToSuperview() + $0.bottom.equalToSuperview().offset(-18.adjusted) + } + + pointButton.snp.makeConstraints { + $0.centerY.equalTo(titleLabel) + $0.trailing.equalToSuperview().inset(20.adjusted) + $0.size.equalTo(24.adjusted) + } + + pointImageView.snp.makeConstraints { + $0.edges.equalToSuperview() + } + case .logo: + logoImageView.snp.makeConstraints { + $0.centerY.equalToSuperview().offset(50.adjusted) + $0.leading.equalToSuperview().inset(20.adjusted) + $0.size.equalTo(24.adjusted) + } } } }