Merge pull request #117 from EAT-SSU/develop

[QA] v2.1.2(2.1.1.3) 배포
EAT-SSU · Sep 25, 2024 · 129589d · 129589d
2 parents dd888b4 + ca881ca
commit 129589d
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 42 deletions.
diff --git a/EATSSU_MVC/EATSSU_MVC/Sources/Presentation/Review/View/RerportView/ReportView.swift b/EATSSU_MVC/EATSSU_MVC/Sources/Presentation/Review/View/RerportView/ReportView.swift
@@ -82,33 +82,25 @@ final class ReportView: BaseUIView {
   /// "EAT SSU 팀에게 보내기" 버튼
   internal let sendToEATSSUButton = ESButton(size: .big, title: "EAT SSU 팀에게 보내기")
 
-  // MARK: - Initializer
-
-  init() {
-    super.init(frame: .zero)
+  // MARK: - Functions
 
-    self.setLayout()
-  }
-
-  required init?(coder: NSCoder) {
-    fatalError("init(coder:) has not been implemented")
-  }
+    override func configureUI() {
+        self.addSubviews(
+          reviewReportReasonLabel,
+          singleReportPerDayLabel,
+          unrelatedToMenuButton,
+          inappropriateContentButton,
+          inappropriatePromotionButton,
+          offTopicContentButton,
+          copyrightInfringementButton,
+          otherReasonButton,
+          reviewReportReasonTextView,
+          characterCountLabel,
+          sendToEATSSUButton
+        )
+    }
 
   internal override func setLayout() {
-    self.addSubviews(
-      reviewReportReasonLabel,
-      singleReportPerDayLabel,
-      unrelatedToMenuButton,
-      inappropriateContentButton,
-      inappropriatePromotionButton,
-      offTopicContentButton,
-      copyrightInfringementButton,
-      otherReasonButton,
-      reviewReportReasonTextView,
-      characterCountLabel,
-      sendToEATSSUButton
-    )
-
     reviewReportReasonLabel.snp.makeConstraints { make in
       make.leading.equalTo(self).inset(24)
       make.trailing.equalTo(self).inset(166)

diff --git a/EATSSU_MVC/EATSSU_MVC/Sources/Presentation/Review/ViewController/ReportViewController.swift b/EATSSU_MVC/EATSSU_MVC/Sources/Presentation/Review/ViewController/ReportViewController.swift
@@ -39,7 +39,8 @@ final class ReportViewController: BaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-      self.connectView()
+      self.configureUI()
+      self.setLayout()
       self.setScrollViewSetting()
       self.setDelegate()
       self.addArray()
@@ -54,7 +55,7 @@ final class ReportViewController: BaseViewController {
 
   // MARK: - Methods
 
-  private func connectView() {
+  override func configureUI() {
     view.addSubview(scrollView)
     scrollView.snp.makeConstraints { make in
       make.edges.equalTo(view.safeAreaLayoutGuide)
@@ -68,6 +69,10 @@ final class ReportViewController: BaseViewController {
       make.height.equalTo(800)
     }
   }
+
+    override func setLayout() {
+        super.setLayout()
+    }
 
   private func setScrollViewSetting() {
     self.scrollView.frame = self.view.bounds

diff --git a/EATSSU_MVC/EATSSU_MVC/Sources/Utility/Application/SceneDelegate.swift b/EATSSU_MVC/EATSSU_MVC/Sources/Utility/Application/SceneDelegate.swift
@@ -21,11 +21,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 		}
 	}
 
-	func sceneWillEnterForeground(_ scene: UIScene) {
-		// Called as the scene transitions from the background to the foreground.
-		// Use this method to undo the changes made on entering the background.
-		// self.checkAndUpdateIfNeeded()
-	}
+    func sceneWillEnterForeground(_ scene: UIScene) {
+        // Called as the scene transitions from the background to the foreground.
+        // Use this method to undo the changes made on entering the background.
+        self.checkAndUpdateIfNeeded()
+    }
 
 	func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
 		guard let windowScene = (scene as? UIWindowScene) else { return }
@@ -35,17 +35,17 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
 		var navigationController = UINavigationController(rootViewController: LoginViewController())
 
-		FirebaseRemoteConfig.shared.noticeCheck { [weak self] result in
-			if result != nil {
-				navigationController =
-					UINavigationController(rootViewController: NoticeViewController(noticeMessage: result ?? ""))
-			} else {
-				self?.window?.rootViewController = navigationController
-				self?.window?.makeKeyAndVisible()
-				// self?.checkAndUpdateIfNeeded()
-			}
-		}
-	}
+        FirebaseRemoteConfig.shared.noticeCheck { [weak self] result in
+            if result != nil {
+                navigationController = 
+              UINavigationController(rootViewController: NoticeViewController(noticeMessage: result ?? ""))
+            } else {
+            self?.window?.rootViewController = navigationController
+            self?.window?.makeKeyAndVisible()
+            self?.checkAndUpdateIfNeeded()
+            }
+        }
+    }
 
 	// 업데이트가 필요한지 확인 후 업데이트 알럿을 띄우는 메소드
 	func checkAndUpdateIfNeeded() {