chore: address feedback

openedx-unsupported · Jul 7, 2023 · 85466f5 · 85466f5
1 parent eb7d946
commit 85466f5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 66 deletions.
diff --git a/Source/NewCourseContentController.swift b/Source/NewCourseContentController.swift
@@ -222,20 +222,10 @@ class NewCourseContentController: UIViewController, InterfaceOrientationOverridi
     override func willTransition(to newCollection: UITraitCollection, with coordinator: UIViewControllerTransitionCoordinator) {
         coordinator.animate { [weak self] _ in
             guard let weakSelf = self else { return }
-            if weakSelf.currentOrientation() == .portrait {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-                    weakSelf.setStatusBar(color: weakSelf.environment.styles.primaryLightColor())
-                }
-            } else {
-                weakSelf.removeStatusBar()
+            DispatchQueue.main.async {
+                weakSelf.setStatusBar(color: weakSelf.environment.styles.primaryLightColor())
             }
         }
-
-        if headerViewState == .collapsed {
-            collapseHeaderView()
-        } else if headerViewState == .expanded {
-            expandHeaderView()
-        }
     }
 }
 
@@ -256,8 +246,6 @@ extension NewCourseContentController: CourseContentPageViewControllerDelegate {
 
     private func updateHeaderState(with controller: CourseContentPageViewController) {
         if let controller = controller.viewControllers?.first as? VideoBlockViewController {
-            controller.orientationDelegate = self
-
             if currentOrientation() != .portrait {
                 collapseHeaderView()
             } else if headerViewState == .collapsed {
@@ -330,20 +318,6 @@ extension NewCourseContentController {
     }
 }
 
-extension NewCourseContentController: VideoBlockViewControllerOrientationDelegate {
-    func changeOrientation(orientation: UIInterfaceOrientation) {
-        if orientation == .portrait {
-            if headerViewState == .collapsed {
-                headerViewState = .animating
-                expandHeaderView()
-            }
-        } else if headerViewState == .expanded {
-            headerViewState = .animating
-            collapseHeaderView()
-        }
-    }
-}
-
 fileprivate extension UIStackView {
     func addArrangedSubviews(_ views: [UIView]) {
         views.forEach { addArrangedSubview($0) }

diff --git a/Source/NewCourseDashboardViewController.swift b/Source/NewCourseDashboardViewController.swift
@@ -271,13 +271,8 @@ class NewCourseDashboardViewController: UIViewController, InterfaceOrientationOv
 
         coordinator.animate { [weak self] _ in
             guard let weakSelf = self else { return }
-
-            if weakSelf.currentOrientation() == .portrait {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-                    weakSelf.setStatusBar(color: weakSelf.environment.styles.primaryLightColor())
-                }
-            } else {
-                weakSelf.removeStatusBar()
+            DispatchQueue.main.async {
+                weakSelf.setStatusBar(color: weakSelf.environment.styles.primaryLightColor())
             }
         }
 
@@ -616,31 +611,27 @@ extension NewCourseDashboardViewController: NewCourseDashboardViewControllerDele
 
 public extension UIViewController {
     func setStatusBar(color: UIColor) {
-        DispatchQueue.main.async { [weak self] in
-            let tag = 123454321
-            let overView: UIView
-            if let taggedView = self?.view.viewWithTag(tag) {
-                overView = taggedView
-            }
-            else {
-                overView = UIView()
-                overView.tag = tag
-                self?.view.addSubview(overView)
-            }
-
-            let height = UIApplication.shared.window?.windowScene?.windows.first?.safeAreaInsets.top ?? 0
-            let frame = UIApplication.shared.window?.windowScene?.statusBarManager?.statusBarFrame ?? .zero
-            overView.frame = CGRect(x: frame.origin.x, y: frame.origin.y, width: frame.size.width, height: height)
-            overView.backgroundColor = color
+        let tag = 123454321
+        let overView: UIView
+        if let taggedView = view.viewWithTag(tag) {
+            overView = taggedView
         }
+        else {
+            overView = UIView()
+            overView.tag = tag
+            view.addSubview(overView)
+        }
+
+        let height = UIApplication.shared.window?.windowScene?.windows.first?.safeAreaInsets.top ?? 0
+        let frame = UIApplication.shared.window?.windowScene?.statusBarManager?.statusBarFrame ?? .zero
+        overView.frame = CGRect(x: frame.origin.x, y: frame.origin.y, width: frame.size.width, height: height)
+        overView.backgroundColor = color
     }
 
     func removeStatusBar() {
-        DispatchQueue.main.async { [weak self] in
-            let tag = 123454321
-            if let taggedView = self?.view.viewWithTag(tag) {
-                taggedView.removeFromSuperview()
-            }
+        let tag = 123454321
+        if let taggedView = view.viewWithTag(tag) {
+            taggedView.removeFromSuperview()
         }
     }
 }
diff --git a/Source/VideoBlockViewController.swift b/Source/VideoBlockViewController.swift
@@ -10,10 +10,6 @@ import Foundation
 import MediaPlayer
 import UIKit
 
-protocol VideoBlockViewControllerOrientationDelegate {
-    func changeOrientation(orientation: UIInterfaceOrientation)
-}
-
 class VideoBlockViewController : OfflineSupportViewController, CourseBlockViewController, StatusBarOverriding, InterfaceOrientationOverriding, VideoTranscriptDelegate, RatingViewControllerDelegate, VideoPlayerDelegate {
 
     typealias Environment = DataManagerProvider & OEXInterfaceProvider & ReachabilityProvider & OEXConfigProvider & OEXRouterProvider & OEXAnalyticsProvider & OEXStylesProvider & OEXSessionProvider & NetworkManagerProvider
@@ -35,9 +31,7 @@ class VideoBlockViewController : OfflineSupportViewController, CourseBlockViewCo
     private var playOverlayButton: UIButton?
     private var overlayLabel: UILabel?
     var shouldCelebrationAppear: Bool
-
-    var orientationDelegate: VideoBlockViewControllerOrientationDelegate?
-
+
     init(environment : Environment, blockID : CourseBlockID?, courseID: String, shouldCelebrationAppear: Bool = false) {
         self.blockID = blockID
         self.environment = environment
@@ -448,9 +442,7 @@ class VideoBlockViewController : OfflineSupportViewController, CourseBlockViewCo
         }
     }
 
-    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
-        orientationDelegate?.changeOrientation(orientation: currentOrientation())
-
+    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {        
         if UIDevice.current.userInterfaceIdiom == .pad {
             if videoPlayer.isFullScreen {
                 videoPlayer.setFullscreen(fullscreen: !UIDevice.current.orientation.isPortrait, animated: true, with: currentOrientation(), forceRotate: false)