chore: address feedback

openedx-unsupported · Jul 4, 2023 · 49c2acd · 49c2acd
1 parent 5f0c8cf
commit 49c2acd
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/Source/NewCourseContentController.swift b/Source/NewCourseContentController.swift
@@ -73,7 +73,6 @@ class NewCourseContentController: UIViewController, InterfaceOrientationOverridi
         self.courseOutlineMode = courseOutlineMode ?? .full
         courseQuerier = environment.dataManager.courseDataManager.querierForCourseWithID(courseID: courseID, environment: environment)
         super.init(nibName: nil, bundle: nil)
-        setStatusBar(color: environment.styles.primaryLightColor())
 
         if let resumeCourseBlockID = resumeCourseBlockID {
             currentBlock = courseQuerier.blockWithID(id: resumeCourseBlockID).firstSuccess().value
@@ -101,14 +100,14 @@ class NewCourseContentController: UIViewController, InterfaceOrientationOverridi
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        setStatusBar(color: environment.styles.primaryLightColor())
         addSubViews()
         setupComponentView()
         setupCompletedBlocksView()
     }
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        setStatusBar(color: environment.styles.primaryLightColor())
         navigationController?.setNavigationBarHidden(true, animated: false)
     }
 
@@ -220,7 +219,18 @@ class NewCourseContentController: UIViewController, InterfaceOrientationOverridi
     }
 
     override func willTransition(to newCollection: UITraitCollection, with coordinator: UIViewControllerTransitionCoordinator) {
-        setStatusBar(color: environment.styles.primaryLightColor())
+
+        if currentOrientation() == .portrait {
+            setStatusBar(color: environment.styles.primaryLightColor())
+        } else {
+            removeStatusBar()
+        }
+
+        if headerViewState == .collapsed {
+            collapseHeaderView()
+        } else if headerViewState == .expanded {
+            expandHeaderView()
+        }
     }
 }
 

diff --git a/Source/NewCourseDashboardViewController.swift b/Source/NewCourseDashboardViewController.swift
@@ -258,7 +258,18 @@ class NewCourseDashboardViewController: UIViewController, InterfaceOrientationOv
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         setupContentView()
-        setStatusBar(color: environment.styles.primaryLightColor())
+
+        if currentOrientation() == .portrait {
+            setStatusBar(color: environment.styles.primaryLightColor())
+        } else {
+            removeStatusBar()
+        }
+
+        if headerViewState == .collapsed {
+            collapseHeaderView()
+        } else if headerViewState == .expanded {
+            expandHeaderView()
+        }
     }
 
     private func prepareTabViewData() {
@@ -607,4 +618,13 @@ public extension UIViewController {
             overView.backgroundColor = color
         }
     }
+
+    func removeStatusBar() {
+        DispatchQueue.main.async { [weak self] in
+            let tag = 123454321
+            if let taggedView = self?.view.viewWithTag(tag) {
+                taggedView.removeFromSuperview()
+            }
+        }
+    }
 }