Skip to content

Commit 3e0f3b7

Browse files
Jeon0976Jeon0976
authored
Merge pull request #56 from AVIRO-official/develop
[Ver 1.2.2]
2 parents 362b9bf + d205f12 commit 3e0f3b7

File tree

20 files changed

+331
-229
lines changed

20 files changed

+331
-229
lines changed

‎AVIRO.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@
125125
C54B591F2B9606C500C0B190 /* UITextView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C54B591E2B9606C500C0B190 /* UITextView+Extension.swift */; };
126126
C54B76612B88B2D10095E110 /* FranchiseToggleButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = C54B76602B88B2D10095E110 /* FranchiseToggleButton.swift */; };
127127
C54BC0DB2A2C2D0D00B65439 /* UIColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C54BC0DA2A2C2D0D00B65439 /* UIColor+Extension.swift */; };
128-
C5503B592B9F51C60050643F /* WellcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5503B582B9F51C60050643F /* WellcomeViewController.swift */; };
129-
C5503B5C2B9F54C20050643F /* WellcomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5503B5B2B9F54C20050643F /* WellcomeCollectionViewCell.swift */; };
128+
C5503B592B9F51C60050643F /* WelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5503B582B9F51C60050643F /* WelcomeViewController.swift */; };
129+
C5503B5C2B9F54C20050643F /* WelcomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5503B5B2B9F54C20050643F /* WelcomeCollectionViewCell.swift */; };
130130
C5503B5E2B9F55D70050643F /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5503B5D2B9F55D70050643F /* UIView+Extension.swift */; };
131131
C552D5342ABE8CA500933D8A /* AVIRODeleteAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C552D5332ABE8CA500933D8A /* AVIRODeleteAPI.swift */; };
132132
C5538AAF2A1BB81200661DE2 /* AVIROEnrollPlace+DTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5538AAE2A1BB81200661DE2 /* AVIROEnrollPlace+DTO.swift */; };
@@ -403,8 +403,8 @@
403403
C54B591E2B9606C500C0B190 /* UITextView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextView+Extension.swift"; sourceTree = "<group>"; };
404404
C54B76602B88B2D10095E110 /* FranchiseToggleButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FranchiseToggleButton.swift; sourceTree = "<group>"; };
405405
C54BC0DA2A2C2D0D00B65439 /* UIColor+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extension.swift"; sourceTree = "<group>"; };
406-
C5503B582B9F51C60050643F /* WellcomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WellcomeViewController.swift; sourceTree = "<group>"; };
407-
C5503B5B2B9F54C20050643F /* WellcomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WellcomeCollectionViewCell.swift; sourceTree = "<group>"; };
406+
C5503B582B9F51C60050643F /* WelcomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeViewController.swift; sourceTree = "<group>"; };
407+
C5503B5B2B9F54C20050643F /* WelcomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeCollectionViewCell.swift; sourceTree = "<group>"; };
408408
C5503B5D2B9F55D70050643F /* UIView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
409409
C552D5332ABE8CA500933D8A /* AVIRODeleteAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVIRODeleteAPI.swift; sourceTree = "<group>"; };
410410
C5538AAE2A1BB81200661DE2 /* AVIROEnrollPlace+DTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AVIROEnrollPlace+DTO.swift"; sourceTree = "<group>"; };
@@ -1321,13 +1321,13 @@
13211321
path = UITextLabel;
13221322
sourceTree = "<group>";
13231323
};
1324-
C5503B5A2B9F51D10050643F /* Wellcome */ = {
1324+
C5503B5A2B9F51D10050643F /* Welcome */ = {
13251325
isa = PBXGroup;
13261326
children = (
1327-
C5503B582B9F51C60050643F /* WellcomeViewController.swift */,
1328-
C5503B5B2B9F54C20050643F /* WellcomeCollectionViewCell.swift */,
1327+
C5503B582B9F51C60050643F /* WelcomeViewController.swift */,
1328+
C5503B5B2B9F54C20050643F /* WelcomeCollectionViewCell.swift */,
13291329
);
1330-
path = Wellcome;
1330+
path = Welcome;
13311331
sourceTree = "<group>";
13321332
};
13331333
C56295032B3188160067BBE5 /* ReviewWriteView */ = {
@@ -1783,7 +1783,7 @@
17831783
children = (
17841784
C5D93D9D2A581E9100629C39 /* Tutorial */,
17851785
C567C14D2A5658C700D4B426 /* Login */,
1786-
C5503B5A2B9F51D10050643F /* Wellcome */,
1786+
C5503B5A2B9F51D10050643F /* Welcome */,
17871787
C5EB50ED2A1C76FC00B29CC1 /* Home */,
17881788
C5351B722A1B369000116D50 /* Enroll */,
17891789
C5AAEB472B2F044000507C73 /* Challenge */,
@@ -2294,7 +2294,7 @@
22942294
C52066292A7CD5FC0038ECCD /* HistoryTableModel.swift in Sources */,
22952295
C5FD92EB2A9C786600CF4673 /* PublicAPIRequestComponents.swift in Sources */,
22962296
C58C49C82AC9B67600DE04B7 /* AppleUserLoginModel.swift in Sources */,
2297-
C5503B592B9F51C60050643F /* WellcomeViewController.swift in Sources */,
2297+
C5503B592B9F51C60050643F /* WelcomeViewController.swift in Sources */,
22982298
C54B591F2B9606C500C0B190 /* UITextView+Extension.swift in Sources */,
22992299
C58FBF902AC2B83A00AB6EFC /* AVIROAPIManagerProtocol.swift in Sources */,
23002300
C5DCBC9F2B91D9FE003502BA /* MyCommentListViewModel.swift in Sources */,
@@ -2305,7 +2305,7 @@
23052305
C52066382A808DAD0038ECCD /* HistoryHeaderView.swift in Sources */,
23062306
C5C290742A85E4EC00ED5DCE /* PlaceSegmentedControlView.swift in Sources */,
23072307
C52FA3472A175B20005E70DC /* HomeViewController.swift in Sources */,
2308-
C5503B5C2B9F54C20050643F /* WellcomeCollectionViewCell.swift in Sources */,
2308+
C5503B5C2B9F54C20050643F /* WelcomeCollectionViewCell.swift in Sources */,
23092309
C5FD92E32A9C6C1E00CF4673 /* EditLocationAddressTextTableViewCell.swift in Sources */,
23102310
C54BC0DB2A2C2D0D00B65439 /* UIColor+Extension.swift in Sources */,
23112311
C52FA3432A175B20005E70DC /* AppDelegate.swift in Sources */,
@@ -2661,7 +2661,7 @@
26612661
CODE_SIGN_ENTITLEMENTS = AVIRO/AVIRO.entitlements;
26622662
CODE_SIGN_IDENTITY = "Apple Development";
26632663
CODE_SIGN_STYLE = Automatic;
2664-
CURRENT_PROJECT_VERSION = 9;
2664+
CURRENT_PROJECT_VERSION = 1;
26652665
DEVELOPMENT_TEAM = C4K2HXA435;
26662666
GENERATE_INFOPLIST_FILE = YES;
26672667
INFOPLIST_FILE = AVIRO/App/Info.plist;
@@ -2679,7 +2679,7 @@
26792679
"$(inherited)",
26802680
"@executable_path/Frameworks",
26812681
);
2682-
MARKETING_VERSION = 1.2.1;
2682+
MARKETING_VERSION = 1.2.2;
26832683
PRODUCT_BUNDLE_IDENTIFIER = SeonghunJeon.VeganRestaurant;
26842684
PRODUCT_NAME = "$(TARGET_NAME)";
26852685
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2698,7 +2698,7 @@
26982698
CODE_SIGN_ENTITLEMENTS = AVIRO/AVIRO.entitlements;
26992699
CODE_SIGN_IDENTITY = "Apple Development";
27002700
CODE_SIGN_STYLE = Automatic;
2701-
CURRENT_PROJECT_VERSION = 9;
2701+
CURRENT_PROJECT_VERSION = 1;
27022702
DEVELOPMENT_TEAM = C4K2HXA435;
27032703
GENERATE_INFOPLIST_FILE = YES;
27042704
INFOPLIST_FILE = AVIRO/App/Info.plist;
@@ -2716,7 +2716,7 @@
27162716
"$(inherited)",
27172717
"@executable_path/Frameworks",
27182718
);
2719-
MARKETING_VERSION = 1.2.1;
2719+
MARKETING_VERSION = 1.2.2;
27202720
PRODUCT_BUNDLE_IDENTIFIER = SeonghunJeon.VeganRestaurant;
27212721
PRODUCT_NAME = "$(TARGET_NAME)";
27222722
PROVISIONING_PROFILE_SPECIFIER = "";

‎AVIRO/Custom/Extension/UIView(Animation)+Extension.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ extension UIView {
9494
/// - completion: 애니메이션이 완료된 후 실행할 작업입니다. 필요에 따라 클로저 형태로 작업을 제공할 수 있습니다.
9595
///
9696
/// 처음 시작 시 animation이 시작하고 animation이 진행 중 일땐 진행 중인 animation이 끝나면 시작됩니다.
97-
func animateTouchResponse(
97+
func activeTouchActionEffect(
9898
isTouchDown: Bool,
9999
scale: CGFloat = 0.96,
100100
duration: Double = 0.05,

‎AVIRO/Custom/Extension/UIView+Extension.swift‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@ extension UIView {
1111
func roundTopCorners(cornerRadius: CGFloat) {
1212
self.clipsToBounds = true
1313
self.layer.cornerRadius = cornerRadius
14-
self.layer.maskedCorners = CACornerMask(arrayLiteral: [.layerMinXMinYCorner, .layerMaxXMinYCorner])
14+
self.layer.maskedCorners = CACornerMask(arrayLiteral: [
15+
.layerMinXMinYCorner, .layerMaxXMinYCorner]
16+
)
17+
}
18+
19+
func roundBottomCorners(cornerRadius: CGFloat) {
20+
self.clipsToBounds = true
21+
self.layer.cornerRadius = cornerRadius
22+
self.layer.maskedCorners = CACornerMask(arrayLiteral: [
23+
.layerMinXMaxYCorner, .layerMaxXMaxYCorner]
24+
)
1525
}
1626
}

‎AVIRO/Custom/SubClass/UITextLabel/PlaceView/ReviewLabel.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ final class ReviewLabel: UILabel {
4444
}
4545

4646
private func setAttribute() {
47-
self.lineBreakMode = .byCharWrapping
4847
self.layer.cornerRadius = 10
4948
self.layer.masksToBounds = true
5049
}
@@ -64,12 +63,16 @@ final class ReviewLabel: UILabel {
6463
}
6564

6665
private func whenIsAbbreviated(_ text: String) {
66+
self.lineBreakMode = .byTruncatingTail
6767
self.numberOfLines = 4
68+
6869
self.text = text
6970
}
7071

7172
private func whenShowAllLabel(_ text: String) {
73+
self.lineBreakMode = .byClipping
7274
self.numberOfLines = 0
75+
7376
self.text = text
7477
}
7578

‎AVIRO/Custom/Utility/LocationUtility.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Created by 전성훈 on 2023/08/13.
66
//
77

8-
import UIKit
8+
import Foundation
99

1010
final class LocationUtility {
1111
/// 내 위치로부터 얼마나 떨어져있는지 확인 하는 함수

‎AVIRO/Scene/Base/TabBar/AVIROTabBarController.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ final class AVIROTabBarController: UIViewController, TabBarFromSubVCDelegate {
1212
private var amplitude: AmplitudeProtocol!
1313

1414
private var viewControllers: [UINavigationController] = []
15-
private var wellcomeViewController: WellcomeViewController?
15+
private var wellcomeViewController: WelcomeViewController?
1616

1717
private var types: [TabBarType] = []
1818
private var buttons: [TabBarButton] = []
@@ -55,7 +55,7 @@ final class AVIROTabBarController: UIViewController, TabBarFromSubVCDelegate {
5555
view.backgroundColor = .clear
5656
view.isHidden = true
5757

58-
wellcomeViewController = WellcomeViewController.create()
58+
wellcomeViewController = WelcomeViewController.create()
5959

6060
if let wellcomeVC = wellcomeViewController {
6161
add(child: wellcomeVC, container: view)
@@ -71,7 +71,7 @@ final class AVIROTabBarController: UIViewController, TabBarFromSubVCDelegate {
7171
let blurEffect = UIBlurEffect(style: .dark)
7272

7373
view.effect = blurEffect
74-
view.alpha = 0.3
74+
view.alpha = 0.6
7575
view.isHidden = true
7676

7777
return view
@@ -286,18 +286,18 @@ final class AVIROTabBarController: UIViewController, TabBarFromSubVCDelegate {
286286
private func showWellcomeVC() {
287287
wellcomeViewController?.tabBarDelegate = self
288288
wellcomeViewController?.loadWellcomeImage { [weak self] in
289-
self?.wellcomeViewController?.didNoShowButtonTapped = {
289+
self?.wellcomeViewController?.didTappedNoShowButton = {
290290
UserDefaults.standard.set(Date(), forKey: UDKey.hideUntil.rawValue)
291291
self?.amplitude.wellcomeNoShow()
292292
self?.removeWellcomVC()
293293
}
294294

295-
self?.wellcomeViewController?.didCloseButtonTapped = {
295+
self?.wellcomeViewController?.didTappedCloseButton = {
296296
self?.amplitude.wellcomeClose()
297297
self?.removeWellcomVC()
298298
}
299299

300-
self?.wellcomeViewController?.didCheckButtonTapped = {
300+
self?.wellcomeViewController?.didTappedCheckButton = {
301301
self?.amplitude.wellcomeClick()
302302
self?.removeWellcomVC()
303303

‎AVIRO/Scene/Feature/Challenge/MyBookmarkList/ViewController/MyBookmarkListViewController.swift‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ final class MyBookmarkListViewController: UIViewController {
144144
}
145145

146146
private func setupAttribute() {
147-
navigationItem.title = "내가 등록한 가게"
147+
navigationItem.title = "즐겨찾기"
148148
navigationController?.navigationBar.isHidden = false
149149
self.view.backgroundColor = .gray7
150150

@@ -281,25 +281,25 @@ final class MyBookmarkListViewController: UIViewController {
281281
}
282282

283283
internal func adjustHeaderInset() {
284-
let sectionHeaderHeight: CGFloat = 48
285-
286-
let bookmarkYOffset = bookmarkTableView.contentOffset.y
287-
288-
if bookmarkYOffset <= sectionHeaderHeight && bookmarkYOffset == 0 {
289-
bookmarkTableView.contentInset = UIEdgeInsets(
290-
top: -bookmarkTableView.contentOffset.y,
291-
left: 0,
292-
bottom: 0,
293-
right: 0
294-
)
295-
} else if bookmarkTableView.contentOffset.y >= sectionHeaderHeight {
296-
bookmarkTableView.contentInset = UIEdgeInsets(
297-
top: 0,
298-
left: 0,
299-
bottom: 0,
300-
right: 0
301-
)
302-
}
284+
// let sectionHeaderHeight: CGFloat = -10
285+
//
286+
// let bookmarkYOffset = bookmarkTableView.contentOffset.y
287+
//
288+
// if bookmarkYOffset <= sectionHeaderHeight {
289+
// bookmarkTableView.contentInset = UIEdgeInsets(
290+
// top: -bookmarkTableView.contentOffset.y,
291+
// left: 0,
292+
// bottom: 0,
293+
// right: 0
294+
// )
295+
// } else if bookmarkTableView.contentOffset.y >= sectionHeaderHeight {
296+
// bookmarkTableView.contentInset = UIEdgeInsets(
297+
// top: 0,
298+
// left: 0,
299+
// bottom: 0,
300+
// right: 0
301+
// )
302+
// }
303303
}
304304

305305
internal func bookmarkCellDidTapped(with placeId: String) {
@@ -309,8 +309,8 @@ final class MyBookmarkListViewController: UIViewController {
309309
}
310310

311311
internal func noPlaceButtonTapped() {
312-
noPlaceButton.animateTouchResponse(isTouchDown: true) { [weak self] in
313-
self?.noPlaceButton.animateTouchResponse(isTouchDown: false) {
312+
noPlaceButton.activeTouchActionEffect(isTouchDown: true) { [weak self] in
313+
self?.noPlaceButton.activeTouchActionEffect(isTouchDown: false) {
314314
DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
315315
self?.tabBarDelegate?.selectedIndex = 0
316316
}

‎AVIRO/Scene/Feature/Challenge/MyBookmarkList/ViewController/MyBookmarkTable/MyBookmarkListTableViewCell.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,19 @@ final class MyBookmarkListTableViewCell: UITableViewCell {
134134
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
135135
super.touchesBegan(touches, with: event)
136136

137-
self.animateTouchResponse(isTouchDown: true)
137+
self.activeTouchActionEffect(isTouchDown: true)
138138
}
139139

140140
override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
141141
super.touchesEnded(touches, with: event)
142142

143143
// 애니메이션 진행 중일 경우 완료 후 onTouchRelease 호출
144144
if self.isAnimating {
145-
self.animateTouchResponse(isTouchDown: false) { [weak self] in
145+
self.activeTouchActionEffect(isTouchDown: false) { [weak self] in
146146
self?.onTouchRelease?()
147147
}
148148
} else {
149-
animateTouchResponse(isTouchDown: false) { [weak self] in
149+
activeTouchActionEffect(isTouchDown: false) { [weak self] in
150150
self?.onTouchRelease?()
151151
}
152152
}
@@ -155,7 +155,7 @@ final class MyBookmarkListTableViewCell: UITableViewCell {
155155
override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent?) {
156156
super.touchesCancelled(touches, with: event)
157157

158-
self.animateTouchResponse(isTouchDown: false)
158+
self.activeTouchActionEffect(isTouchDown: false)
159159
}
160160

161161
override func prepareForReuse() {

‎AVIRO/Scene/Feature/Challenge/MyCommentList/ViewController/MyCommentListTable/MyCommentListTableViewCell.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,19 @@ final class MyCommentListTableViewCell: UITableViewCell {
9898
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
9999
super.touchesBegan(touches, with: event)
100100

101-
self.animateTouchResponse(isTouchDown: true)
101+
self.activeTouchActionEffect(isTouchDown: true)
102102
}
103103

104104
override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
105105
super.touchesEnded(touches, with: event)
106106

107107
// 애니메이션 진행 중일 경우 완료 후 onTouchRelease 호출
108108
if self.isAnimating {
109-
self.animateTouchResponse(isTouchDown: false) { [weak self] in
109+
self.activeTouchActionEffect(isTouchDown: false) { [weak self] in
110110
self?.onTouchRelease?()
111111
}
112112
} else {
113-
animateTouchResponse(isTouchDown: false) { [weak self] in
113+
activeTouchActionEffect(isTouchDown: false) { [weak self] in
114114
self?.onTouchRelease?()
115115
}
116116
}
@@ -119,7 +119,7 @@ final class MyCommentListTableViewCell: UITableViewCell {
119119
override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent?) {
120120
super.touchesCancelled(touches, with: event)
121121

122-
self.animateTouchResponse(isTouchDown: false)
122+
self.activeTouchActionEffect(isTouchDown: false)
123123
}
124124

125125
override func prepareForReuse() {

‎AVIRO/Scene/Feature/Challenge/MyCommentList/ViewController/MyCommentListViewController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@ final class MyCommentListViewController: UIViewController {
320320
}
321321

322322
internal func noPlaceButtonTapped() {
323-
noPlaceButton.animateTouchResponse(isTouchDown: true) { [weak self] in
324-
self?.noPlaceButton.animateTouchResponse(isTouchDown: false) {
323+
noPlaceButton.activeTouchActionEffect(isTouchDown: true) { [weak self] in
324+
self?.noPlaceButton.activeTouchActionEffect(isTouchDown: false) {
325325
DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
326326
self?.tabBarDelegate?.selectedIndex = 0
327327
}

0 commit comments

Comments
 (0)