🎨 :: [#282] Edit MainVC Authority Chaking Add "학생회"

Projects/App/Sources/Application/SceneDelegate.swift

@@ -15,13 +15,13 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         let adminIsSwitchOn = defaults.bool(forKey: "isSwitchMakeOn")
 
         checkForUpdates { needsUpdate in
-                if needsUpdate {
-                    print("업데이트 필요")
-                    self.showUpdatePopup()
-                } else {
-                    print("최신 버전입니다")
-                }
+            if needsUpdate {
+                print("업데이트 필요")
+                self.showUpdatePopup()
+            } else {
+                print("최신 버전입니다")
             }
+        }
 
         applySavedTheme()
 
@@ -47,9 +47,23 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         DispatchQueue.main.async {
             if authority == "ROLE_STUDENT_COUNCIL" {
                 if adminIsSwitchOn {
-                    print("Admin Screen: AdminQRViewController")
-                    self.window?.rootViewController = UINavigationController(rootViewController: AdminQRViewController())
-                } else {
+                    print("Admin Screen: AdminMainViewController")
+
+                    let adminMainVC = AdminMainViewController()
+                    let navigationController = UINavigationController(rootViewController: adminMainVC)
+                    self.window?.rootViewController = navigationController
+
+                    DispatchQueue.main.async {
+                        let adminQRVC = AdminQRViewController()
+
+                        UIView.performWithoutAnimation {
+                            navigationController.pushViewController(adminQRVC, animated: false)
+                        }
+                    }
+                }
+
+
+                else {
                     print("Admin Screen: AdminMainViewController")
                     self.window?.rootViewController = UINavigationController(rootViewController: AdminMainViewController())
                 }
@@ -88,7 +102,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             completion(false)
             return
         }
-        
+
         let url = URL(string: "https://itunes.apple.com/lookup?bundleId=\(bundleID)")!
         let task = URLSession.shared.dataTask(with: url) { data, response, error in
             guard let data = data, error == nil else {
@@ -99,7 +113,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
                 if let json = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                    let results = json["results"] as? [[String: Any]],
                    let appStoreVersion = results.first?["version"] as? String {
-                    
+
                     let currentVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
                     if let currentVersion = currentVersion, currentVersion.compare(appStoreVersion, options: .numeric) == .orderedAscending {
                         completion(true)
@@ -115,36 +129,36 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         }
         task.resume()
     }
-    
+
     private func showUpdatePopup() {
         let alertController = UIAlertController(
             title: "업데이트 알림",
             message: "더 나은 서비스를 위해 곰스가 수정되었어요!\n업데이트해 주시겠어요?",
             preferredStyle: .alert
         )
-        
+
         let updateAction = UIAlertAction(title: "확인", style: .default) { _ in
             if let url = URL(string: "https://apps.apple.com/kr/app/goms/id6502936560") {
                 UIApplication.shared.open(url)
             }
         }
-        
+
         alertController.addAction(updateAction)
-        
+
         DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
             self.window?.rootViewController?.present(alertController, animated: true) {
                 print("업데이트 팝업 표시됨")
             }
         }
     }
-    
+
     func sceneDidDisconnect(_ scene: UIScene) {}
-    
+
     func sceneDidBecomeActive(_ scene: UIScene) {}
-    
+
     func sceneWillResignActive(_ scene: UIScene) {}
-    
+
     func sceneWillEnterForeground(_ scene: UIScene) {}
-    
+
     func sceneDidEnterBackground(_ scene: UIScene) {}
 }

Projects/Feature/Sources/Scene/Main/Admin/View/AdminMainViewController.swift

@@ -7,6 +7,7 @@ public class AdminMainViewController: BaseViewController, UICollectionViewDataSo
     private let basicsProfileView = ProfileCardView()
     private let authViewModel = AuthViewModel()
     private let profileViewModel = ProfileViewModel()
+    private let profileView = MainProfileView()
     let refreshControl = UIRefreshControl()
 
     let scrollView = UIScrollView().then {
@@ -33,8 +34,6 @@ public class AdminMainViewController: BaseViewController, UICollectionViewDataSo
         $0.expandedTouchArea = 30
     }
 
-    private let profileView = MainProfileView()
-
     private let latecomerLabel = UILabel().then {
         $0.text = "지각자 TOP 3"
         $0.setDynamicTextColor(darkModeColor: .white, lightModeColor: .black)
@@ -321,6 +320,7 @@ public class AdminMainViewController: BaseViewController, UICollectionViewDataSo
 
         profileView.nameLabel.text = viewModel.profileData?.name
         basicsProfileView.nameLabel.text = viewModel.profileData?.name
+
         if viewModel.profileData?.major == Major.sw.rawValue {
             profileView.studentInformationLabel.text = "\(grade)기 | SW개발"
             basicsProfileView.studentInformationLabel.text = "\(grade)기 | SW개발"
@@ -331,6 +331,13 @@ public class AdminMainViewController: BaseViewController, UICollectionViewDataSo
             profileView.studentInformationLabel.text = "\(grade)기 | AI"
             basicsProfileView.studentInformationLabel.text = "\(grade)기 | AI"
         }
+
+        if let authority = viewModel.profileData?.authority {
+            if authority == "ROLE_STUDENT_COUNCIL" {
+                profileView.profileStatus.text = "학생회"
+                basicsProfileView.myOutingStatusLabel.text = "학생회"
+            }
+        }
     }
 
     // MARK: - Selector
@@ -339,7 +346,7 @@ public class AdminMainViewController: BaseViewController, UICollectionViewDataSo
         navigationController?.pushViewController(outingVC, animated: true)
     }
 
-    @objc func qrButtonTapped() {
+    @objc public func qrButtonTapped() {
         qrButton.isUserInteractionEnabled = false
         let adminQRVC = AdminQRViewController()
         navigationController?.pushViewController(adminQRVC, animated: true)