[FIX] #136 충돌 병합 수정

Fillin-iOS/Fillin-iOS.xcodeproj/project.pbxproj

@@ -116,11 +116,19 @@
 		77EB42232797D1CE00C726D8 /* FilmSelectService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77EB42222797D1CE00C726D8 /* FilmSelectService.swift */; };
 		77EB42262797DAFD00C726D8 /* FilmResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77EB42252797DAFD00C726D8 /* FilmResponse.swift */; };
 		9ADF3537C1D51ED22F4C921B /* Pods_Fillin_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F33300C623DFF466AFCE2914 /* Pods_Fillin_iOS.framework */; };
+		E80A726828CDDA66000A75B5 /* ReportFilmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E80A726728CDDA66000A75B5 /* ReportFilmViewController.swift */; };
+		E80A726A28CDDA7E000A75B5 /* ReportContactViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E80A726928CDDA7E000A75B5 /* ReportContactViewController.swift */; };
+		E822163528C860CC0090CEC5 /* ReportViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E822163428C860CC0090CEC5 /* ReportViewController.swift */; };
+		E822163728C860E10090CEC5 /* ReportlabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E822163628C860E10090CEC5 /* ReportlabViewController.swift */; };
 		E828BF9127991C14009C1475 /* Status.swift in Sources */ = {isa = PBXBuildFile; fileRef = E828BF9027991C14009C1475 /* Status.swift */; };
 		E86731CB279728EE00FCD0EE /* UIViewController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86731CA279728EE00FCD0EE /* UIViewController+Extension.swift */; };
 		E89934F727CD1EDE00DCB1A8 /* OnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E89934F627CD1EDE00DCB1A8 /* OnboardingViewController.swift */; };
 		E89934FA27CD2AA600DCB1A8 /* OnboardingDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E89934F927CD2AA600DCB1A8 /* OnboardingDataModel.swift */; };
 		E89934FD27CD2BCB00DCB1A8 /* OnboardingCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E89934FC27CD2BCB00DCB1A8 /* OnboardingCollectionViewCell.swift */; };
+		E8C1E0D028EABCEB006AB2C7 /* EditProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8C1E0CF28EABCEB006AB2C7 /* EditProfileViewController.swift */; };
+		E8DDE18528DEDECF00CC000D /* ReportPopUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8DDE18428DEDECF00CC000D /* ReportPopUpViewController.swift */; };
+		E8EB7A5628C090AB0091DA22 /* TermsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8EB7A5528C090AB0091DA22 /* TermsViewController.swift */; };
+		E8EB7A5828C093080091DA22 /* TermTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8EB7A5728C093080091DA22 /* TermTableViewCell.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -237,11 +245,19 @@
 		77EB42222797D1CE00C726D8 /* FilmSelectService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilmSelectService.swift; sourceTree = "<group>"; };
 		77EB42252797DAFD00C726D8 /* FilmResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilmResponse.swift; sourceTree = "<group>"; };
 		864A552B88FE473B50DE4171 /* Pods-Fillin-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Fillin-iOS.debug.xcconfig"; path = "Target Support Files/Pods-Fillin-iOS/Pods-Fillin-iOS.debug.xcconfig"; sourceTree = "<group>"; };
+		E80A726728CDDA66000A75B5 /* ReportFilmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportFilmViewController.swift; sourceTree = "<group>"; };
+		E80A726928CDDA7E000A75B5 /* ReportContactViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportContactViewController.swift; sourceTree = "<group>"; };
+		E822163428C860CC0090CEC5 /* ReportViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportViewController.swift; sourceTree = "<group>"; };
+		E822163628C860E10090CEC5 /* ReportlabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportlabViewController.swift; sourceTree = "<group>"; };
 		E828BF9027991C14009C1475 /* Status.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Status.swift; sourceTree = "<group>"; };
 		E86731CA279728EE00FCD0EE /* UIViewController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extension.swift"; sourceTree = "<group>"; };
 		E89934F627CD1EDE00DCB1A8 /* OnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewController.swift; sourceTree = "<group>"; };
 		E89934F927CD2AA600DCB1A8 /* OnboardingDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingDataModel.swift; sourceTree = "<group>"; };
 		E89934FC27CD2BCB00DCB1A8 /* OnboardingCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingCollectionViewCell.swift; sourceTree = "<group>"; };
+		E8C1E0CF28EABCEB006AB2C7 /* EditProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditProfileViewController.swift; sourceTree = "<group>"; };
+		E8DDE18428DEDECF00CC000D /* ReportPopUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportPopUpViewController.swift; sourceTree = "<group>"; };
+		E8EB7A5528C090AB0091DA22 /* TermsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TermsViewController.swift; sourceTree = "<group>"; };
+		E8EB7A5728C093080091DA22 /* TermTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TermTableViewCell.swift; sourceTree = "<group>"; };
 		F33300C623DFF466AFCE2914 /* Pods_Fillin_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Fillin_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -470,6 +486,7 @@
 		6F3B871B27968AEB00A4BD07 /* ViewControllers */ = {
 			isa = PBXGroup;
 			children = (
+				E822163328C860AD0090CEC5 /* ReportViewController */,
 				6F3B872527968AEB00A4BD07 /* SplashViewController */,
 				6F3B872127968AEB00A4BD07 /* OnboardingViewController */,
 				6F3B876627968AEB00A4BD07 /* LoginViewController */,
@@ -523,6 +540,9 @@
 				6F3B872927968AEB00A4BD07 /* MyPagePhotoCollectionViewCell.swift */,
 				6F3B872A27968AEB00A4BD07 /* MyPageViewController.xib */,
 				6F3B872B27968AEB00A4BD07 /* MyPageViewController.swift */,
+				E8EB7A5528C090AB0091DA22 /* TermsViewController.swift */,
+				E8EB7A5728C093080091DA22 /* TermTableViewCell.swift */,
+				E8C1E0CF28EABCEB006AB2C7 /* EditProfileViewController.swift */,
 			);
 			path = MyPageViewController;
 			sourceTree = "<group>";
@@ -822,6 +842,18 @@
 			path = DataModel;
 			sourceTree = "<group>";
 		};
+		E822163328C860AD0090CEC5 /* ReportViewController */ = {
+			isa = PBXGroup;
+			children = (
+				E822163428C860CC0090CEC5 /* ReportViewController.swift */,
+				E822163628C860E10090CEC5 /* ReportlabViewController.swift */,
+				E80A726928CDDA7E000A75B5 /* ReportContactViewController.swift */,
+				E80A726728CDDA66000A75B5 /* ReportFilmViewController.swift */,
+				E8DDE18428DEDECF00CC000D /* ReportPopUpViewController.swift */,
+			);
+			path = ReportViewController;
+			sourceTree = "<group>";
+		};
 		E89934F827CD2A9C00DCB1A8 /* DataModel */ = {
 			isa = PBXGroup;
 			children = (
@@ -1021,14 +1053,17 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E8C1E0D028EABCEB006AB2C7 /* EditProfileViewController.swift in Sources */,
 				6F3B87CB27968AEB00A4BD07 /* LoginViewController.swift in Sources */,
 				6F3B878927968AEB00A4BD07 /* GenericResponse.swift in Sources */,
 				77EB42212797D17600C726D8 /* FlimSelectAPI.swift in Sources */,
 				6F3B879627968AEB00A4BD07 /* FilmRollService.swift in Sources */,
+				E8EB7A5628C090AB0091DA22 /* TermsViewController.swift in Sources */,
 				6F3B87CD27968AEB00A4BD07 /* FillinNavigationBar.swift in Sources */,
 				6F3B87C527968AEB00A4BD07 /* ArrowCollectionViewCell.swift in Sources */,
 				6F8B71F92796F33A00F88EB3 /* StudioResponse.swift in Sources */,
 				6F3B877A27968AEB00A4BD07 /* UILabel+Extension.swift in Sources */,
+				E80A726828CDDA66000A75B5 /* ReportFilmViewController.swift in Sources */,
 				6F3B87AF27968AEB00A4BD07 /* FilmRollViewController+DataSource.swift in Sources */,
 				6F3B87CF27968AEB00A4BD07 /* SceneDelegate.swift in Sources */,
 				6F3B87B127968AEB00A4BD07 /* FilmRollViewController+Layout.swift in Sources */,
@@ -1038,6 +1073,7 @@
 				6F3B878727968AEB00A4BD07 /* MapLocation.swift in Sources */,
 				6F3B87AB27968AEB00A4BD07 /* AddPhotoViewController.swift in Sources */,
 				6F3B877427968AEB00A4BD07 /* Notification.swift in Sources */,
+				E80A726A28CDDA7E000A75B5 /* ReportContactViewController.swift in Sources */,
 				E86731CB279728EE00FCD0EE /* UIViewController+Extension.swift in Sources */,
 				6F3B87BA27968AEB00A4BD07 /* FilmCurationCollectionReusableView.swift in Sources */,
 				6F3B879727968AEB00A4BD07 /* FilmRollAPI.swift in Sources */,
@@ -1050,9 +1086,11 @@
 				6F3B879227968AEB00A4BD07 /* AddPhotoService.swift in Sources */,
 				6F3B87A127968AEB00A4BD07 /* MyPagePhotoCollectionViewCell.swift in Sources */,
 				6F3B878B27968AEB00A4BD07 /* HomeAPI.swift in Sources */,
+				E822163728C860E10090CEC5 /* ReportlabViewController.swift in Sources */,
 				6F3B87A327968AEB00A4BD07 /* MyPageViewController.swift in Sources */,
 				E89934F727CD1EDE00DCB1A8 /* OnboardingViewController.swift in Sources */,
 				6F3B878A27968AEB00A4BD07 /* HomeService.swift in Sources */,
+				E8DDE18528DEDECF00CC000D /* ReportPopUpViewController.swift in Sources */,
 				6F3B87B227968AEB00A4BD07 /* FilmRollViewController.swift in Sources */,
 				6F3B877227968AEB00A4BD07 /* UserDefaultsKey.swift in Sources */,
 				E828BF9127991C14009C1475 /* Status.swift in Sources */,
@@ -1083,6 +1121,7 @@
 				6F3B877827968AEB00A4BD07 /* UIFont+Extension.swift in Sources */,
 				6F3B878F27968AEB00A4BD07 /* MyPageService.swift in Sources */,
 				6F3B879927968AEB00A4BD07 /* StudioMapSearchTableViewCell.swift in Sources */,
+				E8EB7A5828C093080091DA22 /* TermTableViewCell.swift in Sources */,
 				6F3B87B627968AEB00A4BD07 /* FilmCurationCollectionViewCell.swift in Sources */,
 				6F3B879427968AEB00A4BD07 /* StudioMapService.swift in Sources */,
 				6F3B87AC27968AEB00A4BD07 /* FilmRollClickViewController.swift in Sources */,
@@ -1093,6 +1132,7 @@
 				6F3B87C327968AEB00A4BD07 /* PhotosTableViewCell.swift in Sources */,
 				6F3B877527968AEB00A4BD07 /* URL.swift in Sources */,
 				6F3B877627968AEB00A4BD07 /* Const.swift in Sources */,
+				E822163528C860CC0090CEC5 /* ReportViewController.swift in Sources */,
 				6F3B879F27968AEB00A4BD07 /* SplashViewController.swift in Sources */,
 				6F3B879527968AEB00A4BD07 /* HowTo.swift in Sources */,
 				6F3B878827968AEB00A4BD07 /* NetworkResult.swift in Sources */,

Fillin-iOS/Fillin-iOS/Resources/Assets/Assets.xcassets/btnAddProfile.imageset/Contents.json

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

Fillin-iOS/Fillin-iOS/Resources/Assets/Assets.xcassets/btnClear.imageset/Contents.json

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

Fillin-iOS/Fillin-iOS/Resources/Assets/Assets.xcassets/btnOpen.imageset/Contents.json

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

Fillin-iOS/Fillin-iOS/Resources/Assets/Assets.xcassets/goRightIcon.imageset/Contents.json

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

Fillin-iOS/Fillin-iOS/Resources/Assets/Assets.xcassets/img_feedback.imageset/Contents.json

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

Fillin-iOS/Fillin-iOS/Resources/Constants/Assets+Generated.swift

@@ -24,15 +24,19 @@ internal enum Asset {
   internal static let accentColor = ColorAsset(name: "AccentColor")
   internal static let appleLogo = ImageAsset(name: "AppleLogo")
   internal static let basicProfile = ImageAsset(name: "basicProfile")
+  internal static let btnAddProfile = ImageAsset(name: "btnAddProfile")
   internal static let btnAddphhoto = ImageAsset(name: "btnAddphhoto")
   internal static let btnBack = ImageAsset(name: "btnBack")
+  internal static let btnClear = ImageAsset(name: "btnClear")
   internal static let btnHome = ImageAsset(name: "btnHome")
   internal static let btnHomeFloating = ImageAsset(name: "btnHomeFloating")
   internal static let btnLike = ImageAsset(name: "btnLike")
   internal static let btnLiked = ImageAsset(name: "btnLiked")
   internal static let btnMore = ImageAsset(name: "btnMore")
+  internal static let btnOpen = ImageAsset(name: "btnOpen")
   internal static let btnScrap = ImageAsset(name: "btnScrap")
   internal static let btnlogin = ImageAsset(name: "btnlogin")
+  internal static let goRightIcon = ImageAsset(name: "goRightIcon")
   internal static let icnAddPhotoBig = ImageAsset(name: "icnAddPhotoBig")
   internal static let icnCall = ImageAsset(name: "icnCall")
   internal static let icnCamera = ImageAsset(name: "icnCamera")
@@ -66,6 +70,7 @@ internal enum Asset {
   internal static let imgOnboardingDot3 = ImageAsset(name: "imgOnboardingDot3")
   internal static let imgPhoto = ImageAsset(name: "imgPhoto")
   internal static let imgTrash = ImageAsset(name: "imgTrash")
+  internal static let imgFeedback = ImageAsset(name: "img_feedback")
   internal static let imgonboarding1frame = ImageAsset(name: "imgonboarding1frame")
   internal static let imgonboarding2frame = ImageAsset(name: "imgonboarding2frame")
   internal static let imgonboarding3frame = ImageAsset(name: "imgonboarding3frame")

Fillin-iOS/Fillin-iOS/Resources/Constants/Header.swift

@@ -9,15 +9,15 @@ import Foundation
 
 extension Const {
   struct Header {
-      static var tokenHeader = ["Content-Type": "application/json",
-                                "token": accessToken]
-      static var multiTokenHeader = ["Content-Type": "multipart/form-data",
-                                "token": accessToken]
-      static let loginHeader = ["Content-Type": "application/x-www-form-urlencoded"]
-//    static var tokenHeader = ["Content-Type": "application/json",
-//                              "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6OSwiZW1haWwiOm51bGwsImlhdCI6MTY0NjMyNjgxNCwiZXhwIjoxNjQ3NTM2NDE0LCJpc3MiOiJmaWxsaW4ifQ.BqXKeusdrBVWzt0HsIAM6wlG-VxcHw8qMEF9BSn0aEs"]
-//    static var multiTokenHeader = [
-//      "Content-Type": "multipart/form-data",
-//      "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6OSwiZW1haWwiOm51bGwsImlhdCI6MTY0NjMyNjgxNCwiZXhwIjoxNjQ3NTM2NDE0LCJpc3MiOiJmaWxsaW4ifQ.BqXKeusdrBVWzt0HsIAM6wlG-VxcHw8qMEF9BSn0aEs"]
+//      static var tokenHeader = ["Content-Type": "application/json",
+//                                "token": accessToken]
+//      static var multiTokenHeader = ["Content-Type": "multipart/form-data",
+//                                "token": accessToken]
+//      static let loginHeader = ["Content-Type": "application/x-www-form-urlencoded"]
+    static var tokenHeader = ["Content-Type": "application/json",
+                              "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6NDEsImVtYWlsIjoidGVzdEBnbWFpbC5jb20iLCJpYXQiOjE2NjE2ODI2NDYsImV4cCI6MTY2Mjg5MjI0NiwiaXNzIjoiZmlsbGluIn0.eMdMGx1snCx2RkbV-_aVP7or8wYyG0Gc4M5beH-Vthk"]
+    static var multiTokenHeader = [
+      "Content-Type": "multipart/form-data",
+      "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6NDEsImVtYWlsIjoidGVzdEBnbWFpbC5jb20iLCJpYXQiOjE2NjE2ODI2NDYsImV4cCI6MTY2Mjg5MjI0NiwiaXNzIjoiZmlsbGluIn0.eMdMGx1snCx2RkbV-_aVP7or8wYyG0Gc4M5beH-Vthk"]
   }
 }

Fillin-iOS/Fillin-iOS/Resources/Constants/URL.swift

@@ -7,7 +7,9 @@
 
 import Foundation
 extension Const {
-    struct URL {
-        static let baseURL = "https://asia-northeast3-fill-in-13efb.cloudfunctions.net/app/api"
-    }
+  struct URL {
+    static let baseURL = "https://asia-northeast3-fill-in-13efb.cloudfunctions.net/app/api"
+    static let infoTermURL = "https://66jxndoe.notion.site/FILL-IN-ecc509304b824e7c93e23d7a15783f59"
+    static let useTermURL = "https://66jxndoe.notion.site/FILL-IN-a800e45762a44f4fbcf07569a42f4dac"
+  }
 }

Fillin-iOS/Fillin-iOS/Resources/Extensions/UIColor+Extension.swift

@@ -84,5 +84,8 @@ extension UIColor {
   @nonobjc class var photobackgroundCover: UIColor {
     return UIColor(white: 0.0, alpha: 0.7)
   }
+  @nonobjc class var textviewGrey: UIColor {
+    return UIColor(red: 29.0 / 255.0, green: 29.0 / 255.0, blue: 29.0 / 255.0, alpha: 1.0)
+  }
 
 }

Fillin-iOS/Fillin-iOS/Sources/NetworkService/User/UserService.swift

@@ -48,7 +48,8 @@ extension UserService: TargetType {
     var headers: [String: String]? {
         switch self {
         case .login:
-          return Const.Header.loginHeader
+//          return Const.Header.loginHeader
+          return Const.Header.tokenHeader
         }
     }
 }

Fillin-iOS/Fillin-iOS/Sources/SceneDelegate.swift

@@ -23,22 +23,22 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         window?.rootViewController = SplashViewController()
         window?.makeKeyAndVisible()
 
-        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-            var homeNavigationController: UINavigationController
-            
-            if self.appDelegate?.isLogin == true {
-                homeNavigationController = UINavigationController(rootViewController: HomeViewController())
-            } else {
-                if UserDefaults.standard.object(forKey: Const.UserDefaultsKey.isOnboarding) != nil {
-                    homeNavigationController = UINavigationController(rootViewController: LoginViewController())
-                } else {
-                    homeNavigationController = UINavigationController(rootViewController: OnboardingViewController())
-                }
-            }
-            self.window?.rootViewController = homeNavigationController
-            self.window?.makeKeyAndVisible()
-        }
-    }
+      DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+          var homeNavigationController: UINavigationController
+
+          if self.appDelegate?.isLogin == true {
+              homeNavigationController = UINavigationController(rootViewController: HomeViewController())
+          } else {
+              if UserDefaults.standard.object(forKey: Const.UserDefaultsKey.isOnboarding) != nil {
+                  homeNavigationController = UINavigationController(rootViewController: LoginViewController())
+              } else {
+                  homeNavigationController = UINavigationController(rootViewController: OnboardingViewController())
+              }
+          }
+          self.window?.rootViewController = homeNavigationController
+          self.window?.makeKeyAndVisible()
+      }
+  }
 
     func sceneDidDisconnect(_ scene: UIScene) {
         // Called as the scene is being released by the system.