|
@@ -18,29 +18,37 @@ class Services: NSObject {
|
|
|
|
|
|
@objc class AppCoordinator: NSObject {
|
|
|
private var childCoordinators: [NSObject] = []
|
|
|
- private var tabBarController: UITabBarController
|
|
|
+ private var viewController: UIViewController
|
|
|
private var playerController: VLCPlayerDisplayController
|
|
|
+ private var tabBarController: UITabBarController
|
|
|
private var services = Services()
|
|
|
|
|
|
- @objc init(tabBarController: UITabBarController) {
|
|
|
- self.tabBarController = tabBarController
|
|
|
+ @objc init(viewController: UIViewController) {
|
|
|
+ self.viewController = viewController
|
|
|
self.playerController = VLCPlayerDisplayController(services: services)
|
|
|
+ self.tabBarController = UITabBarController()
|
|
|
super.init()
|
|
|
- setupPlayerController()
|
|
|
+ setupChildViewControllers()
|
|
|
|
|
|
// Init the HTTP Server and clean its cache
|
|
|
// FIXME: VLCHTTPUploaderController should perhaps be a service?
|
|
|
VLCHTTPUploaderController.sharedInstance().cleanCache()
|
|
|
}
|
|
|
|
|
|
- private func setupPlayerController() {
|
|
|
- tabBarController.addChildViewController(playerController)
|
|
|
- tabBarController.view.addSubview(playerController.view)
|
|
|
+ private func setupChildViewControllers() {
|
|
|
+ viewController.addChildViewController(tabBarController)
|
|
|
+ viewController.view.addSubview(tabBarController.view)
|
|
|
+ tabBarController.view.frame = viewController.view.frame
|
|
|
+ tabBarController.didMove(toParentViewController: viewController)
|
|
|
+
|
|
|
+ viewController.addChildViewController(playerController)
|
|
|
+ viewController.view.addSubview(playerController.view)
|
|
|
playerController.view.layoutMargins = UIEdgeInsets(top: 0, left: 0, bottom: tabBarController.tabBar.frame.size.height, right: 0)
|
|
|
- playerController.didMove(toParentViewController: tabBarController)
|
|
|
+ playerController.didMove(toParentViewController: viewController)
|
|
|
}
|
|
|
|
|
|
@objc func start() {
|
|
|
+
|
|
|
let tabbarCoordinator = VLCTabBarCoordinator(tabBarController: tabBarController, services: services)
|
|
|
childCoordinators.append(tabbarCoordinator)
|
|
|
}
|