Merge pull request #65 from AVIRO-official/Feature/Tutorial

(24.06.15-17) [Feat]: Tutorial 기능 추가

AVIRO.xcodeproj/project.pbxproj

@@ -241,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 */; };
@@ -523,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>"; };
@@ -1686,6 +1688,7 @@
 				C5C2907A2A85E51B00ED5DCE /* PlaceReviewsView.swift */,
 				C5166E4A2A939442003495AA /* SubView */,
 				C5C961902A8D9EA10016E2F8 /* TableView */,
+				C5E797642C1EEE85000E7929 /* PlaceDeleteRequestView.swift */,
 			);
 			path = SubView;
 			sourceTree = "<group>";
@@ -2399,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 */,
@@ -2673,7 +2677,7 @@
 				CODE_SIGN_ENTITLEMENTS = AVIRO/AVIRO.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = C4K2HXA435;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AVIRO/App/Info.plist;
@@ -2710,7 +2714,7 @@
 				CODE_SIGN_ENTITLEMENTS = AVIRO/AVIRO.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = C4K2HXA435;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AVIRO/App/Info.plist;

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/Assets/SpeechBubble1.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "SpeechBubble1.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/Assets/SpeechBubble2.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "SpeechBubble2.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/Assets/SpeechBubble3.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "SpeechBubble3.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/All_Clicked_Fav.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "All_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/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/Custom/Constants/Enum+.swift

@@ -17,6 +17,8 @@ enum APP: String {
 // MARK: UserDefaults Key
 enum UDKey: String {
     case tutorial
+    case tutorialHome
+    case tutorialChallenge
     case hideUntil
     case timeForUpdate
 }

AVIRO/Custom/Constants/UIImage+Extension.swift

@@ -48,13 +48,13 @@ extension UIImage {
     static let someIconClicked = UIImage(named: "SomeMapClicked")!
     static let requestIconClicked = UIImage(named: "RequestMapClicked")!
 
-    static let allIconStar = UIImage(named: "AllMapStar")!
-    static let someIconStar = UIImage(named: "SomeMapStar")!
-    static let requestIconStar = UIImage(named: "RequestMapStar")!
+    static let allIconStar = UIImage(named: "All_Default_Fav")!
+    static let someIconStar = UIImage(named: "Some_Default_Fav")!
+    static let requestIconStar = UIImage(named: "Request_Default_Fav")!
 
-    static let allIconStarClicked = UIImage(named: "AllMapStarClicked")!
-    static let someIconStarClicked = UIImage(named: "SomeMapStarClicked")!
-    static let requestIconStarClicked = UIImage(named: "RequestMapStarClicked")!
+    static let allIconStarClicked = UIImage(named: "All_Clicked_Fav")!
+    static let someIconStarClicked = UIImage(named: "Some_Clicked_Fav")!
+    static let requestIconStarClicked = UIImage(named: "Request_Clicked_Fav")!
 
     static let allOptionButton = UIImage(named: "AllOption")!
     static let someOptionButton = UIImage(named: "SomeOption")!
@@ -197,6 +197,10 @@ extension UIImage {
     static let btn_pencil = UIImage(named: "Btn_pencil")!
     static let btn_plus_square = UIImage(named: "Btn_plus_square")!
 
+    static let speechBubble1 = UIImage(named: "SpeechBubble1")
+    static let speechBubble2 = UIImage(named: "SpeechBubble2")
+    static let speechBubble3 = UIImage(named: "SpeechBubble3")
+
     // MARK: Challenge
     static let challengeInfoGreen = UIImage(named: "Challenge_Info_Green")!
     static let challengeInfoYellow = UIImage(named: "Challenge_Info_Yellow")!

AVIRO/Custom/SubClass/UIButton/PlaceView/EditInfoButton.swift

@@ -22,7 +22,10 @@ final class EditInfoButton: UIButton {
         self.setTitleColor(.keywordBlue, for: .normal)
         self.titleLabel?.font = CFont.font.medium14
 
-        self.setImage(UIImage.editInfo, for: .normal)
+        self.setImage(
+            UIImage.editInfo.withRenderingMode(.alwaysTemplate),
+            for: .normal
+        )
 
         self.backgroundColor = .gray7
 

AVIRO/Manager/APIManager/AVIROManager/AVIROAPI.swift

@@ -300,9 +300,7 @@ final class AVIROAPI: AVIROAPIMangerProtocol {
             completionHandler(.failure(.urlError))
             return
         }
-
-        print(url)
-
+
         performRequest(
             with: url,
             headers: requestAPI.headers,

AVIRO/Scene/Base/TabBar/AVIROTabBarController.swift

@@ -190,6 +190,7 @@ final class AVIROTabBarController: UIViewController, TabBarFromSubVCDelegate {
         self.view.backgroundColor = .clear
 
         setupButtons()
+
         checkWellcomeShow()
     }
 
@@ -242,8 +243,13 @@ final class AVIROTabBarController: UIViewController, TabBarFromSubVCDelegate {
             redDotView.topAnchor.constraint(equalTo: imageView.topAnchor, constant: -3)
         ])
     }
+
     // MARK: - Wellcome VC
     private func checkWellcomeShow() {
+        guard UserDefaults.standard.bool(
+            forKey: UDKey.tutorialHome.rawValue
+        ) else { return }
+
         guard let compareDate = UserDefaults.standard.object(
             forKey: UDKey.hideUntil.rawValue
         ) as? Date else {
@@ -296,6 +302,10 @@ final class AVIROTabBarController: UIViewController, TabBarFromSubVCDelegate {
         welcomeViewController = nil
     }
 
+    func activeCheckWellcome() {
+        checkWellcomeShow()
+    }
+
     // MARK: - TabBar Click After
     private func updateView() {
         deleteView()

AVIRO/Scene/Base/TabBar/AVIROTabBarSettingDelegate.swift

@@ -14,4 +14,5 @@ protocol TabBarFromSubVCDelegate: AnyObject {
 
     func setSelectedIndex(_ index: Int, withData data: [String: Any])
     func activeBlurEffectView(with active: Bool)
+    func activeCheckWellcome()
 }