[FEAT] 2.0 업로드 UI (#142)

ACON-iOS/ACON-iOS.xcodeproj/project.pbxproj

@@ -98,6 +98,7 @@
 		74054ECA2D32534200D1CDE4 /* MultitaskDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74054EC92D32533800D1CDE4 /* MultitaskDelegate.swift */; };
 		74054ECE2D32549F00D1CDE4 /* ACLocationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74054ECD2D32549800D1CDE4 /* ACLocationManager.swift */; };
 		741056172D6A4C4E002E8200 /* AmplitudeLiterals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741056162D6A4C48002E8200 /* AmplitudeLiterals.swift */; };
+		741368002DD516680075D06A /* SearchSuggestionCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741367FF2DD516610075D06A /* SearchSuggestionCollectionViewCell.swift */; };
 		7414295B2D5D2FC400B69528 /* ProfileSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7414295A2D5D2FBA00B69528 /* ProfileSettingViewController.swift */; };
 		7414295D2D5D313200B69528 /* UITableViewCell+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7414295C2D5D312C00B69528 /* UITableViewCell+.swift */; };
 		741429602D5D391000B69528 /* SettingType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7414295F2D5D390B00B69528 /* SettingType.swift */; };
@@ -117,8 +118,6 @@
 		741E68A22D3D5FA200DF99EF /* ACService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741E68A12D3D5F9700DF99EF /* ACService.swift */; };
 		741E68AC2D3D6DA800DF99EF /* HeaderType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741E68AB2D3D6DA400DF99EF /* HeaderType.swift */; };
 		74205D2F2D40351700D11557 /* SocialType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74205D2E2D40351400D11557 /* SocialType.swift */; };
-		74220DD42D34363B000684BF /* SpotUploadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74220DD32D343633000684BF /* SpotUploadViewController.swift */; };
-		74220DD62D3436C2000684BF /* SpotUploadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74220DD52D3436BE000684BF /* SpotUploadView.swift */; };
 		742544062D413CCD004F950F /* SpotListCollectionViewFooter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742544052D413CC6004F950F /* SpotListCollectionViewFooter.swift */; };
 		743069892D3D2F5A0033178C /* NetworkResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 743069882D3D2F540033178C /* NetworkResult.swift */; };
 		743900912DC50926002F91B1 /* UIVisualEffectView+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 743900902DC50918002F91B1 /* UIVisualEffectView+.swift */; };
@@ -167,7 +166,7 @@
 		747BB6CE2DCA66F000352874 /* GlassButtonState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 747BB6CD2DCA66EB00352874 /* GlassButtonState.swift */; };
 		747F4FBD2D3D9477003DECBF /* SplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 747F4FBC2D3D9470003DECBF /* SplashViewController.swift */; };
 		747F4FBF2D3D9D44003DECBF /* SplashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 747F4FBE2D3D9D40003DECBF /* SplashView.swift */; };
-		747F4FC12D3DC80B003DECBF /* finishedUpload.json in Resources */ = {isa = PBXBuildFile; fileRef = 747F4FC02D3DC80B003DECBF /* finishedUpload.json */; };
+		747FB9002DDB95980027F252 /* finishedUpload.json in Resources */ = {isa = PBXBuildFile; fileRef = 747FB8FF2DDB95980027F252 /* finishedUpload.json */; };
 		748D6F412D2BC482007690B4 /* Moya in Frameworks */ = {isa = PBXBuildFile; productRef = 748D6F402D2BC482007690B4 /* Moya */; };
 		748D6F442D2BC509007690B4 /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = 748D6F432D2BC509007690B4 /* SnapKit */; };
 		748D6F472D2BC519007690B4 /* Then in Frameworks */ = {isa = PBXBuildFile; productRef = 748D6F462D2BC519007690B4 /* Then */; };
@@ -350,6 +349,7 @@
 		74054EC92D32533800D1CDE4 /* MultitaskDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultitaskDelegate.swift; sourceTree = "<group>"; };
 		74054ECD2D32549800D1CDE4 /* ACLocationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ACLocationManager.swift; sourceTree = "<group>"; };
 		741056162D6A4C48002E8200 /* AmplitudeLiterals.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AmplitudeLiterals.swift; sourceTree = "<group>"; };
+		741367FF2DD516610075D06A /* SearchSuggestionCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchSuggestionCollectionViewCell.swift; sourceTree = "<group>"; };
 		7414295A2D5D2FBA00B69528 /* ProfileSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileSettingViewController.swift; sourceTree = "<group>"; };
 		7414295C2D5D312C00B69528 /* UITableViewCell+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableViewCell+.swift"; sourceTree = "<group>"; };
 		7414295F2D5D390B00B69528 /* SettingType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingType.swift; sourceTree = "<group>"; };
@@ -369,8 +369,6 @@
 		741E68A12D3D5F9700DF99EF /* ACService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ACService.swift; sourceTree = "<group>"; };
 		741E68AB2D3D6DA400DF99EF /* HeaderType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderType.swift; sourceTree = "<group>"; };
 		74205D2E2D40351400D11557 /* SocialType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialType.swift; sourceTree = "<group>"; };
-		74220DD32D343633000684BF /* SpotUploadViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpotUploadViewController.swift; sourceTree = "<group>"; };
-		74220DD52D3436BE000684BF /* SpotUploadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpotUploadView.swift; sourceTree = "<group>"; };
 		742544052D413CC6004F950F /* SpotListCollectionViewFooter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpotListCollectionViewFooter.swift; sourceTree = "<group>"; };
 		743069882D3D2F540033178C /* NetworkResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkResult.swift; sourceTree = "<group>"; };
 		743900902DC50918002F91B1 /* UIVisualEffectView+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIVisualEffectView+.swift"; sourceTree = "<group>"; };
@@ -417,7 +415,7 @@
 		747BB6CD2DCA66EB00352874 /* GlassButtonState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlassButtonState.swift; sourceTree = "<group>"; };
 		747F4FBC2D3D9470003DECBF /* SplashViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashViewController.swift; sourceTree = "<group>"; };
 		747F4FBE2D3D9D40003DECBF /* SplashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashView.swift; sourceTree = "<group>"; };
-		747F4FC02D3DC80B003DECBF /* finishedUpload.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = finishedUpload.json; sourceTree = "<group>"; };
+		747FB8FF2DDB95980027F252 /* finishedUpload.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = finishedUpload.json; sourceTree = "<group>"; };
 		748D6F612D2BCA1C007690B4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		748D6F622D2BCA1C007690B4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		748D6F632D2BCA1C007690B4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -862,8 +860,6 @@
 				741A07562D3558F700778219 /* ReviewFinishedView.swift */,
 				741A06C92D35415200778219 /* DropAcornViewController.swift */,
 				741A06C72D3532E000778219 /* DropAcornView.swift */,
-				74220DD52D3436BE000684BF /* SpotUploadView.swift */,
-				74220DD32D343633000684BF /* SpotUploadViewController.swift */,
 				D6EA38142D42B88F002B68B9 /* SearchEmptyView.swift */,
 			);
 			path = View;
@@ -928,6 +924,7 @@
 		745C7E072D35A0130074DBDB /* Cell */ = {
 			isa = PBXGroup;
 			children = (
+				741367FF2DD516610075D06A /* SearchSuggestionCollectionViewCell.swift */,
 				745C7E0C2D35A03F0074DBDB /* SearchKeywordCollectionViewCell.swift */,
 			);
 			path = Cell;
@@ -1389,7 +1386,6 @@
 		74BF921A2D3972C500B923E3 /* Lottie */ = {
 			isa = PBXGroup;
 			children = (
-				747F4FC02D3DC80B003DECBF /* finishedUpload.json */,
 				15C0ED5F2D42CD8800C9ED83 /* drop1Acorn.json */,
 				15C0ED602D42CD8800C9ED83 /* drop2Acorn.json */,
 				15C0ED612D42CD8800C9ED83 /* drop3Acorn.json */,
@@ -1399,6 +1395,7 @@
 				745000D52D403F0200262CBE /* checkLottie.json */,
 				745000D62D403F0200262CBE /* lodingLottie.json */,
 				749C90E72DD4D37100455211 /* splashLottie.json */,
+				747FB8FF2DDB95980027F252 /* finishedUpload.json */,
 			);
 			path = Lottie;
 			sourceTree = "<group>";
@@ -1673,6 +1670,7 @@
 			files = (
 				74FA77842DD43709006846C9 /* SplashBGM.mp3 in Resources */,
 				15BFF8B92D665BAD00909C4F /* Debug.xcconfig in Resources */,
+				747FB9002DDB95980027F252 /* finishedUpload.json in Resources */,
 				15BFF8BA2D665BAD00909C4F /* Release.xcconfig in Resources */,
 				748D6F6C2D2BCA1C007690B4 /* Assets.xcassets in Resources */,
 				74B25C322D2FF022008BDCB7 /* Shared.xcconfig in Resources */,
@@ -1689,7 +1687,6 @@
 				748D6F6E2D2BCA1C007690B4 /* LaunchScreen.storyboard in Resources */,
 				746AA0352DAD0EFF00E28B66 /* GoogleService-Info.plist in Resources */,
 				749C90E82DD4D37100455211 /* splashLottie.json in Resources */,
-				747F4FC12D3DC80B003DECBF /* finishedUpload.json in Resources */,
 				748D6F9D2D2BD641007690B4 /* Pretendard-SemiBold.otf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1800,7 +1797,6 @@
 				743900972DC8696A002F91B1 /* GlassButtonType.swift in Sources */,
 				745C7E0D2D35A04A0074DBDB /* SearchKeywordCollectionViewCell.swift in Sources */,
 				748D6FA62D2C3F44007690B4 /* BaseView.swift in Sources */,
-				74220DD62D3436C2000684BF /* SpotUploadView.swift in Sources */,
 				15CD25702D3F86E700320006 /* CustomRefreshControl.swift in Sources */,
 				D652597E2D628EB000B8176E /* WithdrawalConfirmationViewController.swift in Sources */,
 				746FF3C02D3D8669001CDAAC /* ACWebViewController.swift in Sources */,
@@ -1860,7 +1856,6 @@
 				1547A6F22D33AD4500E96616 /* SpotModel.swift in Sources */,
 				746261732D3EA78700A4E84F /* GetReiviewVerificationRequest.swift in Sources */,
 				743900912DC50926002F91B1 /* UIVisualEffectView+.swift in Sources */,
-				74220DD42D34363B000684BF /* SpotUploadViewController.swift in Sources */,
 				741A07592D355F1400778219 /* ReviewFinishedViewController.swift in Sources */,
 				15A3F6AC2D37AB7B00577E16 /* SpotListCollectionViewHeader.swift in Sources */,
 				74D297F62D63456400DDEE31 /* GetPresignedURLRequest.swift in Sources */,
@@ -1978,6 +1973,7 @@
 				151003EE2D5FC48B00409DF4 /* ProfileService.swift in Sources */,
 				151003F02D5FC4C600409DF4 /* ProfileTargetType.swift in Sources */,
 				745C7E152D35AEC10074DBDB /* SpotSearchViewModel.swift in Sources */,
+				741368002DD516680075D06A /* SearchSuggestionCollectionViewCell.swift in Sources */,
 				15CF62C22D577B600000A10F /* ProfileValidMessageType.swift in Sources */,
 				D6E452932D3AA47500CBED02 /* ProfileView.swift in Sources */,
 				15A48BFE2D57546A003C2421 /* ProfileImageEditButton.swift in Sources */,

ACON-iOS/ACON-iOS/Global/Extensions/String+.swift

@@ -101,5 +101,12 @@ extension String {
 
         return hasKoreanChars ? .korean : .other
     }
+
+
+    // MARK: - 말줄임표
+
+    func abbreviatedString(_ maxLength: Int) -> String {
+         return self.count <= maxLength ? self : "\(self.prefix(maxLength))..."
+     }
 
 }

ACON-iOS/ACON-iOS/Global/Literals/StringLiterals.swift

@@ -105,17 +105,17 @@ enum StringLiterals {
 
         static let next = "다음"
 
-        static let shallWeDropAcorns = "도토리를 떨어트려\n리뷰를 남겨 볼까요?"
+        static let shallWeDropAcorns = "도토리를 떨어트려 리뷰를 남겨볼까요?"
 
         static let useAcornToReview = "도토리를 사용해 리뷰를 남겨주세요."
 
         static let acornsIHave = "보유한 도토리 수"
 
         static let reviewWithAcornsHere = "도토리로 리뷰남기기"
 
-        static let finishedReview = "가게명에 대한\n리뷰 작성을 완료했어요!"
+        static let finishedReview = "에 대한\n리뷰 작성을 완료했어요!"
 
-        static let wishYouPreference = "당신의 취향이 가득 담긴 장소였길 바라요."
+        static let wishYouPreference = "당신의 취향이 가득 담긴 장소였길 바라요"
 
         static let closeAfterFiveSeconds = "5초 후 탭이 자동으로 닫힙니다."
 
@@ -127,9 +127,15 @@ enum StringLiterals {
 
         static let searchSpot = "가게명을 검색해주세요"
 
-        static let noMatchingSpots = "앗! 일치하는 장소가 없어요."
+        static let noMatchingSpots = "앗... 검색결과가 없어요"
 
-        static let clickAcorn = "도토리를 터치해보세요"
+        static let addPlaceTitle = "현재 장소를 바로 등록할 수 있어요"
+
+        static let addPlaceDescriptuon = "더욱 더 정확하게 추천이 가능해요"
+
+        static let addPlaceButton = "5초만에 등록하러 가기"
+
+        static let clickAcorn = "도토리를 선택해보세요"
 
         static let noAcorn = "도토리가 부족해요!"
 

ACON-iOS/ACON-iOS/Global/UIComponents/ACTextField.swift

@@ -54,6 +54,8 @@ final class ACTextField: UIView {
 
     private let animationView = LottieAnimationView(name: "loadingWhite")
 
+    private var glassmorphismView: GlassmorphismView?
+
 
     // MARK: - Initializer
 
@@ -63,7 +65,8 @@ final class ACTextField: UIView {
         borderColor: UIColor = .gray600,
         borderWidth: CGFloat = 1,
         cornerRadius: CGFloat = 4,
-        fontStyle: ACFontType = .t4R
+        fontStyle: ACFontType = .t4R,
+        doneButton: Bool = true
     ) {
         self.icon = icon
         self.bgColor = backgroundColor
@@ -78,7 +81,7 @@ final class ACTextField: UIView {
         setLayout()
         setStyle()
         addTarget()
-        addDoneButtonToKeyboard()
+        if doneButton { addDoneButtonToKeyboard() }
     }
 
     required init?(coder: NSCoder) {
@@ -268,5 +271,18 @@ extension ACTextField {
             }
         })
     }
+
+    func setGlassmorphism(_ glassmorphismType: GlassmorphismType) {
+        self.backgroundColor = .clear
+
+        glassmorphismView = GlassmorphismView(glassmorphismType).then {
+            self.insertSubview($0, at: 0)
+            $0.isUserInteractionEnabled = false
+        }
+
+        glassmorphismView?.snp.makeConstraints {
+            $0.edges.equalToSuperview()
+        }
+    }
 
 }

ACON-iOS/ACON-iOS/Global/Utils/ScreenUtils.swift

@@ -39,7 +39,7 @@ struct ScreenUtils {
     // MARK: - navBarView Height
 
     static var navViewHeight: CGFloat {
-        return ScreenUtils.heightRatio * 56
+        return ScreenUtils.heightRatio * 54
     }
 
     static var safeAreaTopHeight: CGFloat {

ACON-iOS/ACON-iOS/Presentation/TabBar/ACTabBarController.swift

@@ -109,7 +109,7 @@ extension ACTabBarController: UITabBarControllerDelegate {
                 presentLoginModal(AmplitudeLiterals.EventName.placeUpload)
                 return false
             }
-            let uploadVC = SpotUploadViewController()
+            let uploadVC = SpotSearchViewController()
             uploadVC.modalPresentationStyle = .fullScreen
             present(uploadVC, animated: true)
             return false

ACON-iOS/ACON-iOS/Presentation/TabBar/Type/ACTabBarItemType.swift

@@ -15,7 +15,7 @@ enum ACTabBarItemType: CaseIterable {
         // TODO: ViewController 인스턴스 수정
         switch self {
         case .spotList: return SpotListViewController()
-        case .upload: return SpotUploadViewController()
+        case .upload: return SpotSearchViewController()
         case .profile: return ProfileViewController()
         }
     }

ACON-iOS/ACON-iOS/Presentation/Upload/Model/UploadModel.swift

@@ -31,12 +31,12 @@ struct SearchKeywordModel: Equatable {
 
 struct SearchSuggestionModel: Equatable {
 
-    let spotId: Int64
+    let spotID: Int64
 
     let spotName: String
 
-    init(spotId: Int64, spotName: String) {
-        self.spotId = spotId
+    init(spotID: Int64, spotName: String) {
+        self.spotID = spotID
         self.spotName = spotName
     }
 

ACON-iOS/ACON-iOS/Presentation/Upload/View/Cell/SearchKeywordCollectionViewCell.swift

@@ -35,23 +35,24 @@ final class SearchKeywordCollectionViewCell: BaseCollectionViewCell {
         super.setLayout()
 
         spotNameLabel.snp.makeConstraints {
-            $0.top.equalToSuperview().inset(ScreenUtils.heightRatio*7)
-            $0.leading.equalToSuperview().inset(ScreenUtils.widthRatio*20)
-            $0.height.equalTo(20)
-            $0.width.equalTo(ScreenUtils.widthRatio*250)
+            $0.top.equalToSuperview().inset(ScreenUtils.heightRatio*12)
+            $0.leading.equalToSuperview().inset(ScreenUtils.widthRatio*16)
+            $0.height.equalTo(24)
+            $0.width.equalTo(ScreenUtils.widthRatio*256)
         }
 
         spotAddressLabel.snp.makeConstraints {
-            $0.bottom.equalToSuperview().inset(ScreenUtils.heightRatio*7)
-            $0.leading.equalToSuperview().inset(ScreenUtils.widthRatio*20)
-            $0.height.equalTo(14)
-            $0.width.equalTo(ScreenUtils.widthRatio*250)
+            $0.bottom.equalToSuperview().inset(ScreenUtils.heightRatio*12)
+            $0.leading.equalToSuperview().inset(ScreenUtils.widthRatio*16)
+            $0.height.equalTo(24)
+            $0.width.equalTo(ScreenUtils.widthRatio*256)
         }
 
         spotTypeLabel.snp.makeConstraints {
-            $0.centerY.equalToSuperview()
-            $0.trailing.equalToSuperview().inset(ScreenUtils.widthRatio*20)
-            $0.height.equalTo(14)
+            $0.top.equalToSuperview().inset(ScreenUtils.heightRatio*12)
+            $0.trailing.equalToSuperview().inset(ScreenUtils.widthRatio*16)
+            $0.height.equalTo(20)
+            $0.width.equalTo(ScreenUtils.widthRatio*40)
         }
     }
 
@@ -67,14 +68,13 @@ extension SearchKeywordCollectionViewCell {
 
     func bindData(_ relatedSearchData: SearchKeywordModel?, _ indexRow: Int) {
         spotNameLabel.setLabel(text: relatedSearchData?.spotName ?? "",
-                               style: .s2,
-                               color: .acWhite)
+                               style: .t4R)
         spotAddressLabel.setLabel(text: relatedSearchData?.spotAddress ?? "",
-                               style: .c1,
-                               color: .gray400)
+                                  style: .b1R,
+                                  color: .gray500)
         spotTypeLabel.setLabel(text: relatedSearchData?.spotType ?? "",
-                               style: .c1,
-                               color: .gray400,
+                              style: .b1R,
+                               color: .gray500,
                                alignment: .right)
     }