Merge pull request #66 from AVIRO-official/develop

[Ver 1.2.5]

AVIRO.xcodeproj/project.pbxproj

@@ -109,6 +109,7 @@
 		C541521D2AC125E100F39826 /* TutorialTopLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C541521C2AC125E100F39826 /* TutorialTopLabel.swift */; };
 		C54386762B33F05500BD2CAF /* ReviewPushView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C54386752B33F05500BD2CAF /* ReviewPushView.swift */; };
 		C54386792B3432FE00BD2CAF /* ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C54386782B3432FE00BD2CAF /* ViewModel.swift */; };
+		C54733D32BE20EF4004E961C /* SearchUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = C54733D22BE20EF4004E961C /* SearchUtility.swift */; };
 		C5476B4D2B2F1F1F00F5FC6E /* AVIROTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5476B4C2B2F1F1F00F5FC6E /* AVIROTests.swift */; };
 		C5476B612B3028FA00F5FC6E /* ChallengeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5476B602B3028FA00F5FC6E /* ChallengeViewController.swift */; };
 		C5476B682B303BE800F5FC6E /* MyInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5476B672B303BE800F5FC6E /* MyInfoView.swift */; };
@@ -240,6 +241,7 @@
 		C5E306E72A6FB4ED00C11CF7 /* MenuField.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5E306E62A6FB4ED00C11CF7 /* MenuField.swift */; };
 		C5E430B32A5DADBE00CB67EC /* SecondRegistrationPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5E430B22A5DADBE00CB67EC /* SecondRegistrationPresenter.swift */; };
 		C5E430B52A5DAE9800CB67EC /* SecondRegistrationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5E430B42A5DAE9800CB67EC /* SecondRegistrationViewController.swift */; };
+		C5E797652C1EEE85000E7929 /* PlaceDeleteRequestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5E797642C1EEE85000E7929 /* PlaceDeleteRequestView.swift */; };
 		C5E7B7A92A4D3CDF00CA2090 /* AVIROUser+DTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5E7B7A82A4D3CDF00CA2090 /* AVIROUser+DTO.swift */; };
 		C5EB50EA2A1C705900B29CC1 /* SettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5EB50E92A1C705900B29CC1 /* SettingViewController.swift */; };
 		C5EB51082A209F6900B29CC1 /* HomeSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5EB51072A209F6900B29CC1 /* HomeSearchViewController.swift */; };
@@ -388,6 +390,7 @@
 		C54386752B33F05500BD2CAF /* ReviewPushView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewPushView.swift; sourceTree = "<group>"; };
 		C54386782B3432FE00BD2CAF /* ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModel.swift; sourceTree = "<group>"; };
 		C54657862ABF2D82003A0BCB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		C54733D22BE20EF4004E961C /* SearchUtility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchUtility.swift; sourceTree = "<group>"; };
 		C5476B4A2B2F1F1F00F5FC6E /* AVIROTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AVIROTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		C5476B4C2B2F1F1F00F5FC6E /* AVIROTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVIROTests.swift; sourceTree = "<group>"; };
 		C5476B602B3028FA00F5FC6E /* ChallengeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChallengeViewController.swift; sourceTree = "<group>"; };
@@ -521,6 +524,7 @@
 		C5E306E62A6FB4ED00C11CF7 /* MenuField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuField.swift; sourceTree = "<group>"; };
 		C5E430B22A5DADBE00CB67EC /* SecondRegistrationPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondRegistrationPresenter.swift; sourceTree = "<group>"; };
 		C5E430B42A5DAE9800CB67EC /* SecondRegistrationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondRegistrationViewController.swift; sourceTree = "<group>"; };
+		C5E797642C1EEE85000E7929 /* PlaceDeleteRequestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaceDeleteRequestView.swift; sourceTree = "<group>"; };
 		C5E7B7A82A4D3CDF00CA2090 /* AVIROUser+DTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AVIROUser+DTO.swift"; sourceTree = "<group>"; };
 		C5EB50E92A1C705900B29CC1 /* SettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingViewController.swift; sourceTree = "<group>"; };
 		C5EB51072A209F6900B29CC1 /* HomeSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeSearchViewController.swift; sourceTree = "<group>"; };
@@ -1464,6 +1468,7 @@
 				C5A201B12A98502500A54381 /* TimeUtility.swift */,
 				C5C20BAB2AD504D500855BBB /* AmplitudeUtility.swift */,
 				C5F33DFC2ADED19000A29FB9 /* SystemUtility.swift */,
+				C54733D22BE20EF4004E961C /* SearchUtility.swift */,
 			);
 			path = Utility;
 			sourceTree = "<group>";
@@ -1683,6 +1688,7 @@
 				C5C2907A2A85E51B00ED5DCE /* PlaceReviewsView.swift */,
 				C5166E4A2A939442003495AA /* SubView */,
 				C5C961902A8D9EA10016E2F8 /* TableView */,
+				C5E797642C1EEE85000E7929 /* PlaceDeleteRequestView.swift */,
 			);
 			path = SubView;
 			sourceTree = "<group>";
@@ -2396,6 +2402,7 @@
 				C58EC7CE2AB1B57100401FF7 /* AVIROEditOperationTime+DTO.swift in Sources */,
 				C50DB7542A9B838F0078B501 /* ChangeableAddressPresenter.swift in Sources */,
 				C5DCBC9D2B91D9F5003502BA /* MyPlaceListViewController.swift in Sources */,
+				C5E797652C1EEE85000E7929 /* PlaceDeleteRequestView.swift in Sources */,
 				C58EC7D42AB1B5C400401FF7 /* AVIROEditURL+DTO.swift in Sources */,
 				C50F6B022A6BC8E400E942F5 /* EnrollField.swift in Sources */,
 				C552D5342ABE8CA500933D8A /* AVIRODeleteAPI.swift in Sources */,
@@ -2435,6 +2442,7 @@
 				C50E6F6F2A8F10B500703B9E /* UILabel+Extension.swift in Sources */,
 				C52066352A7F3FAE0038ECCD /* HistoryTableViewCell.swift in Sources */,
 				C5C90EB72AA7078300AB3668 /* EditOperationHoursModel.swift in Sources */,
+				C54733D32BE20EF4004E961C /* SearchUtility.swift in Sources */,
 				C528E4BA2A5F9A3E002BD72E /* ThridRegistrationViewController.swift in Sources */,
 				C528E4BC2A5F9AB6002BD72E /* ThridRegistrationPresenter.swift in Sources */,
 				C51000612ABAE61F00F65C1F /* ReportReviewModel.swift in Sources */,
@@ -2669,7 +2677,7 @@
 				CODE_SIGN_ENTITLEMENTS = AVIRO/AVIRO.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = C4K2HXA435;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AVIRO/App/Info.plist;
@@ -2687,7 +2695,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.4;
+				MARKETING_VERSION = 1.2.5;
 				PRODUCT_BUNDLE_IDENTIFIER = SeonghunJeon.VeganRestaurant;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2706,7 +2714,7 @@
 				CODE_SIGN_ENTITLEMENTS = AVIRO/AVIRO.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = C4K2HXA435;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AVIRO/App/Info.plist;
@@ -2724,7 +2732,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.4;
+				MARKETING_VERSION = 1.2.5;
 				PRODUCT_BUNDLE_IDENTIFIER = SeonghunJeon.VeganRestaurant;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

AVIRO.xcodeproj/xcshareddata/xcschemes/AVIRO.xcscheme

@@ -68,11 +68,6 @@
             value = "disable"
             isEnabled = "YES">
          </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "IDEPreferLogStreaming"
-            value = "YES"
-            isEnabled = "YES">
-         </EnvironmentVariable>
       </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction

AVIRO/App/AppController.swift

@@ -32,6 +32,7 @@ final class AppController {
         window.backgroundColor = .gray7
 
         checkState()
+//        setTabBarView()
     }
 
     func setupLoginViewAfterLogout(in window: UIWindow, with type: LoginViewToastType) {

AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bar.imageset/Contents.json → AVIRO/App/Assets.xcassets/ImageSet/Assets/SpeechBubble1.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Off_btn_Bar.png",
+      "filename" : "SpeechBubble1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Off_btn_Bar@2x.png",
+      "filename" : "SpeechBubble1@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Off_btn_Bar@3x.png",
+      "filename" : "SpeechBubble1@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bread.imageset/Contents.json → AVIRO/App/Assets.xcassets/ImageSet/Assets/SpeechBubble2.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Off_btn_Bread.png",
+      "filename" : "SpeechBubble2.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Off_btn_Bread@2x.png",
+      "filename" : "SpeechBubble2@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Off_btn_Bread@3x.png",
+      "filename" : "SpeechBubble2@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Coffee.imageset/Contents.json → AVIRO/App/Assets.xcassets/ImageSet/Assets/SpeechBubble3.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Off_btn_Coffee.png",
+      "filename" : "SpeechBubble3.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Off_btn_Coffee@2x.png",
+      "filename" : "SpeechBubble3@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Off_btn_Coffee@3x.png",
+      "filename" : "SpeechBubble3@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Restaurant.imageset/Contents.json → AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Fav.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Off_btn_Restaurant.png",
+      "filename" : "All_Clicked_Fav.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Off_btn_Restaurant@2x.png",
+      "filename" : "All_Clicked_Fav@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Off_btn_Restaurant@3x.png",
+      "filename" : "All_Clicked_Fav@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Fav.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "All_Default_Fav.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Fav.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Request_Clicked_Fav.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Fav.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Request_Default_Fav.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Fav.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Some_Clicked_Fav.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Fav.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Some_Default_Fav.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AVIRO/App/LaunchScreenViewController.swift

@@ -11,26 +11,14 @@ import Lottie
 
 final class LaunchScreenViewController: UIViewController {
 
-    private lazy var aviroImage: UIImageView = {
+    private lazy var aviro: UIImageView = {
         let imageView = UIImageView()
 
         imageView.image = .launchAVIRO
 
         return imageView
     }()
 
-    private lazy var titleLabel: UILabel = {
-        let lbl = UILabel()
-
-        lbl.text = "가장 쉬운 비건 맛집 찾기"
-        lbl.font = .pretendard(size: 15, weight: .semibold)
-        lbl.textColor = .gray7
-        lbl.numberOfLines = 1
-        lbl.textAlignment = .center
-
-        return lbl
-    }()
-
     private var isUpdateRequire: Bool = true {
         didSet {
             if !isUpdateRequire {
@@ -56,19 +44,15 @@ final class LaunchScreenViewController: UIViewController {
 
     private func setupLayout() {
         [
-            aviroImage,
-            titleLabel
+            aviro
         ].forEach {
             $0.translatesAutoresizingMaskIntoConstraints = false
             view.addSubview($0)
         }
 
         NSLayoutConstraint.activate([
-            aviroImage.centerXAnchor.constraint(equalTo: self.view.centerXAnchor),
-            aviroImage.centerYAnchor.constraint(equalTo: self.view.centerYAnchor, constant: -5),
-
-            titleLabel.topAnchor.constraint(equalTo: aviroImage.bottomAnchor, constant: 16),
-            titleLabel.centerXAnchor.constraint(equalTo: aviroImage.centerXAnchor)
+            aviro.centerXAnchor.constraint(equalTo: self.view.centerXAnchor),
+            aviro.centerYAnchor.constraint(equalTo: self.view.centerYAnchor)
         ])
     }
 
@@ -79,7 +63,6 @@ final class LaunchScreenViewController: UIViewController {
 
             let splitLatestVersion = latestVersion.split(separator: ".").map { $0 }
             let splitCurrentVersion = currentVersion.split(separator: ".").map { $0 }
-            print(latestVersion)
 
             if splitCurrentVersion[0] < splitLatestVersion[0] {
                 self?.showUpdateAlert(latestVersion)