[Feat] sopt-makers#161 - 네비게이션 바 색 처리 완료

elesahich · Apr 17, 2023 · 1a73047 · 1a73047
1 parent de982ef
commit 1a73047
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 9 deletions.
diff --git a/...S/Projects/Features/AppMyPageFeature/Sources/AppMypageScene/AppMyPageViewController.swift b/...S/Projects/Features/AppMyPageFeature/Sources/AppMypageScene/AppMyPageViewController.swift
@@ -39,7 +39,11 @@ public final class AppMyPageVC: UIViewController, AppMyPageViewControllable {
     private let cancelBag = CancelBag()
 
     // MARK: - Views
-    private lazy var navigationBar = OPNavigationBar(self, type: .oneLeftButton)
+    private lazy var navigationBar = OPNavigationBar(
+            self,
+            type: .oneLeftButton,
+            backgroundColor: DSKitAsset.Colors.black100.color
+        )
         .addMiddleLabel(title: I18N.MyPage.navigationTitle)
 
     private let scrollView = UIScrollView()

diff --git a/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/NicknameEditVC.swift b/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/NicknameEditVC.swift
@@ -28,7 +28,11 @@ public class NicknameEditVC: UIViewController, NicknameEditViewControllable {
 
     // MARK: - UI Components
 
-    private lazy var navigationBar = OPNavigationBar(self, type: .oneLeftButton)
+    private lazy var navigationBar = OPNavigationBar(
+            self,
+            type: .oneLeftButton,
+            backgroundColor: DSKitAsset.Colors.black100.color
+        )
         .addMiddleLabel(title: I18N.Setting.NicknameEdit.nicknameEdit)
 
     private let nicknameTextFieldView = AppTextFieldView(type: .plain)

diff --git a/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/PrivacyPolicyVC.swift b/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/PrivacyPolicyVC.swift
@@ -20,7 +20,11 @@ public class PrivacyPolicyVC: UIViewController, PrivacyPolicyViewControllable {
 
     // MARK: - UI Components
 
-    private lazy var naviBar = OPNavigationBar(self, type: .oneLeftButton)
+    private lazy var naviBar = OPNavigationBar(
+            self,
+            type: .oneLeftButton,
+            backgroundColor: DSKitAsset.Colors.black100.color
+        )
         .addMiddleLabel(title: I18N.Setting.personalInfoPolicy)
 
     private let textView = UITextView().then {

diff --git a/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/SentenceEditVC.swift b/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/SentenceEditVC.swift
@@ -29,7 +29,11 @@ public class SentenceEditVC: UIViewController, SentenceEditViewControllable {
 
     // MARK: - UI Components
 
-    private lazy var naviBar = OPNavigationBar(self, type: .oneLeftButton)
+    private lazy var naviBar = OPNavigationBar(
+            self,
+            type: .oneLeftButton,
+            backgroundColor: DSKitAsset.Colors.black100.color
+        )
         .addMiddleLabel(title: I18N.Setting.SentenceEdit.sentenceEdit)
 
     private lazy var textView: UITextView = {

diff --git a/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/TermsOfServiceVC.swift b/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/TermsOfServiceVC.swift
@@ -20,7 +20,11 @@ public class TermsOfServiceVC: UIViewController, TermsOfServiceViewControllable
 
     // MARK: - UI Components
 
-    private lazy var naviBar = OPNavigationBar(self, type: .oneLeftButton)
+    private lazy var naviBar = OPNavigationBar(
+            self,
+            type: .oneLeftButton,
+            backgroundColor: DSKitAsset.Colors.black100.color
+        )
         .addMiddleLabel(title: I18N.Setting.serviceTerm)
 
     private let textView = UITextView().then {

diff --git a/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/WithdrawalVC.swift b/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/WithdrawalVC.swift
@@ -25,7 +25,11 @@ public class WithdrawalVC: UIViewController, WithdrawalViewControllable {
 
     // MARK: - UI Components
 
-    private lazy var naviBar = OPNavigationBar(self, type: .oneLeftButton)
+    private lazy var naviBar = OPNavigationBar(
+            self,
+            type: .oneLeftButton,
+            backgroundColor: DSKitAsset.Colors.black100.color
+        )
         .addMiddleLabel(title: I18N.Setting.Withdrawal.withdrawal)
 
     private let cautionLabel = UILabel().then {

diff --git a/SOPT-iOS/Projects/Modules/DSKit/Sources/Components/OperationComponents/OPNavigationBar.swift b/SOPT-iOS/Projects/Modules/DSKit/Sources/Components/OperationComponents/OPNavigationBar.swift
@@ -23,7 +23,7 @@ public final class OPNavigationBar: UIView {
 
     // MARK: - Properties
 
-    private var vc: UIViewController?
+    private weak var vc: UIViewController?
     private var rightButtonClosure: (() -> Void)?
     public var rightButtonTapped: Driver<Void> {
         rightButton.publisher(for: .touchUpInside)

diff --git a/SOPT-iOS/Projects/SOPT-iOS/Sources/Application/SceneDelegate.swift b/SOPT-iOS/Projects/SOPT-iOS/Sources/Application/SceneDelegate.swift
@@ -23,8 +23,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
         window = UIWindow(frame: scene.coordinateSpace.bounds)
         window?.windowScene = scene
-        let rootVC = container.makeShowAttendanceVC().viewController
-        //        let rootVC = container.makeMainVC(userType: .active).viewController
+//        let rootVC = container.makeShowAttendanceVC().viewController
+//                let rootVC = container.makeMainVC(userType: .active).viewController
+        let rootVC = container.makeAppMyPageVC(userType: .visitor).viewController
         window?.rootViewController = UINavigationController(rootViewController: rootVC)
         window?.makeKeyAndVisible()
     }