Merge pull request #16 from AVIRO-official/develop

[V 1.1.1] 업데이트

AVIRO.xcodeproj/xcshareddata/xcschemes/AVIRO.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -28,6 +28,19 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C5476B492B2F1F1F00F5FC6E"
+               BuildableName = "AVIROTests.xctest"
+               BlueprintName = "AVIROTests"
+               ReferencedContainer = "container:AVIRO.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"

AVIRO/App/AppController.swift

@@ -35,11 +35,11 @@ final class AppController {
         window.makeKeyAndVisible()
 
         checkState()
+//        setTabBarView()
     }
 
     // MARK: 불러올 view 확인 메서드
     private func checkState() {
-//        self.setHomeView()
         // 최초 튜토리얼 화면 안 봤을 때
         guard UserDefaults.standard.bool(forKey: UDKey.tutorial.rawValue) else {
             setTutorialView()
@@ -54,7 +54,7 @@ final class AppController {
 
         let userCheck = AVIROAutoLoginWhenAppleUserDTO(refreshToken: userKey)
 
-        AVIROAPIManager().appleUserCheck(with: userCheck) { [weak self] result in
+        AVIROAPI.manager.appleUserCheck(with: userCheck) { [weak self] result in
             switch result {
             case .success(let model):
                 if model.statusCode == 200 {
@@ -66,13 +66,13 @@ final class AppController {
                             userNickname: data.nickname,
                             marketingAgree: data.marketingAgree
                         )
-                        self?.setHomeView()
+                        self?.setTabBarView()
                     }
                 } else {
                     self?.keychain.delete(KeychainKey.appleRefreshToken.rawValue)
                     self?.setLoginView()
                 }
-            case .failure(_):
+            case .failure:
                 self?.keychain.delete(KeychainKey.appleRefreshToken.rawValue)
                 self?.setLoginView()
             }
@@ -97,13 +97,26 @@ final class AppController {
         }
     }
 
-    // MARK: home View
-    private func setHomeView() {
+    // MARK: TabBar View
+    private func setTabBarView() {
         DispatchQueue.main.async { [weak self] in
-            let homeVC = TabBarViewController()
-
-            self?.rootViewController = homeVC
+            let tabBarVC = AVIROTabBarController()
+            tabBarVC.setViewControllers(with: [
+                TabBarType.home,
+                TabBarType.plus,
+                TabBarType.challenge
+            ])
+
+            tabBarVC.selectedIndex = 0
+
+            self?.rootViewController = tabBarVC
+
         }
+//        DispatchQueue.main.async { [weak self] in
+//            let homeVC = TabBarViewController()
+//
+//            self?.rootViewController = homeVC
+//        }
     }
 
 }

AVIRO/App/AppDelegate.swift

@@ -33,21 +33,41 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         configurationForConnecting connectingSceneSession: UISceneSession,
         options: UIScene.ConnectionOptions
     ) -> UISceneConfiguration {
-        return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
+        return UISceneConfiguration(
+            name: "Default Configuration",
+            sessionRole: connectingSceneSession.role
+        )
+    }
+
+    func application(
+        _ application: UIApplication,
+        supportedInterfaceOrientationsFor window: UIWindow?
+    ) -> UIInterfaceOrientationMask {
+        return UIInterfaceOrientationMask.portrait
     }
 
     private func setNaverMapAPI() {
-        guard let keyUrl = Bundle.main.url(forResource: "API", withExtension: "plist"),
-              let dictionary = NSDictionary(contentsOf: keyUrl) as? [String: Any] else { return }
+        guard let keyUrl = Bundle.main.url(
+            forResource: "API",
+            withExtension: "plist"
+        ),
+              let dictionary = NSDictionary(
+                contentsOf: keyUrl
+              ) as? [String: Any] else { return }
 
         let key = (dictionary["NMFAuthManager_Authorization_Key"] as? String)!
 
         NMFAuthManager.shared().clientId = key
     }
 
     private func setAmplitude() {
-        guard let keyUrl = Bundle.main.url(forResource: "API", withExtension: "plist"),
-              let dictionary = NSDictionary(contentsOf: keyUrl) as? [String: Any] else { return }
+        guard let keyUrl = Bundle.main.url(
+            forResource: "API",
+            withExtension: "plist"
+        ),
+              let dictionary = NSDictionary(
+                contentsOf: keyUrl
+              ) as? [String: Any] else { return }
 
         let key = (dictionary["Amplitude_Key"] as? String)!
 

AVIRO/App/Assets.xcassets/ColorSet/2.0Main Colors/KEYWORD_BLUE.colorset/Contents.json

@@ -6,8 +6,8 @@
         "components" : {
           "alpha" : "1.000",
           "blue" : "1.000",
-          "green" : "0.600",
-          "red" : "0.250"
+          "green" : "0.478",
+          "red" : "0.000"
         }
       },
       "idiom" : "universal"

AVIRO/App/Assets.xcassets/ColorSet/ChallengeImageBorder.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.941",
+          "green" : "0.941",
+          "red" : "0.941"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AVIRO/App/Assets.xcassets/ImageSet/TabBarIcon/home2.imageset/Contents.json → AVIRO/App/Assets.xcassets/ImageSet/Assets/InfoCircle.imageset/Contents.json

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

AVIRO/App/Assets.xcassets/ImageSet/TabBarIcon/square2.imageset/Contents.json → AVIRO/App/Assets.xcassets/ImageSet/Assets/Point_explain.imageset/Contents.json

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

AVIRO/App/Assets.xcassets/ImageSet/Challenge/ChallengeInfoGreen.imageset/Contents.json

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

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

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

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AVIRO/App/Assets.xcassets/ImageSet/Challenge/GoldRectangle.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "GlodRectangle.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/TabBarIcon/square1.imageset/Contents.json → AVIRO/App/Assets.xcassets/ImageSet/Challenge/GoldTrophy.imageset/Contents.json

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

AVIRO/App/Assets.xcassets/ImageSet/TabBarIcon/HomeTab.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "bxs-home-alt-2.svg.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/TabBarIcon/PlusTab.imageset/Contents.json

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