diff --git a/Classes/View Controllers/AppSplitViewController.swift b/Classes/View Controllers/AppSplitViewController.swift deleted file mode 100644 index 188f4d7a9..000000000 --- a/Classes/View Controllers/AppSplitViewController.swift +++ /dev/null @@ -1,18 +0,0 @@ -// -// AppSplitViewController.swift -// Freetime -// -// Created by Ryan Nystrom on 4/14/18. -// Copyright © 2018 Ryan Nystrom. All rights reserved. -// - -import UIKit - -final class AppSplitViewController: UISplitViewController { - - override func viewDidLoad() { - super.viewDidLoad() - view.backgroundColor = .white - } - -} diff --git a/Classes/View Controllers/SplitViewControllerDelegate.swift b/Classes/View Controllers/SplitViewControllerDelegate.swift index 1cd6f05cc..d94ecabe6 100644 --- a/Classes/View Controllers/SplitViewControllerDelegate.swift +++ b/Classes/View Controllers/SplitViewControllerDelegate.swift @@ -12,6 +12,12 @@ import UIKit // detail VCs from primary on split VC expansion protocol PrimaryViewController {} +private func fixBackground(for splitViewController: UISplitViewController, collapsing: Bool) { + splitViewController.view.backgroundColor = collapsing + ? .white + : Styles.Colors.splitViewBackground +} + final class SplitViewControllerDelegate: UISplitViewControllerDelegate { func splitViewController( @@ -19,6 +25,8 @@ final class SplitViewControllerDelegate: UISplitViewControllerDelegate { collapseSecondary secondaryViewController: UIViewController, onto primaryViewController: UIViewController ) -> Bool { + fixBackground(for: splitViewController, collapsing: true) + if let tab = primaryViewController as? UITabBarController, let primaryNav = tab.selectedViewController as? UINavigationController, let secondaryNav = secondaryViewController as? UINavigationController { @@ -37,6 +45,8 @@ final class SplitViewControllerDelegate: UISplitViewControllerDelegate { _ splitViewController: UISplitViewController, separateSecondaryFrom primaryViewController: UIViewController ) -> UIViewController? { + fixBackground(for: splitViewController, collapsing: false) + guard let tab = primaryViewController as? UITabBarController, let primaryNav = tab.selectedViewController as? UINavigationController else { return nil } diff --git a/Classes/Views/Styles.swift b/Classes/Views/Styles.swift index b774aa82b..05aa6878a 100644 --- a/Classes/Views/Styles.swift +++ b/Classes/Views/Styles.swift @@ -89,6 +89,7 @@ enum Styles { static let purple = "6f42c1" static let blueGray = "8697af" static let menuBackgroundColor = "292D35" + static let splitViewBackground = UIColor(red: 0.556863, green: 0.556863, blue: 0.576471, alpha: 1) enum Red { static let medium = "cb2431" diff --git a/Freetime.xcodeproj/project.pbxproj b/Freetime.xcodeproj/project.pbxproj index 8a48f4918..a20eb686d 100644 --- a/Freetime.xcodeproj/project.pbxproj +++ b/Freetime.xcodeproj/project.pbxproj @@ -181,7 +181,6 @@ 294EE4CB209006C2002C9CB1 /* InboxController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294EE4CA209006C2002C9CB1 /* InboxController.swift */; }; 294EE4D1209006C3002C9CB1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 294EE4D0209006C3002C9CB1 /* Assets.xcassets */; }; 294EE4D5209006C3002C9CB1 /* FreetimeWatch.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 294EE4B9209006BF002C9CB1 /* FreetimeWatch.app */; }; - 2950AB1B2082E47200C6F19A /* AppSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2950AB1A2082E47200C6F19A /* AppSplitViewController.swift */; }; 2950AB1D2083B1E400C6F19A /* EmptyLoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2950AB1C2083B1E400C6F19A /* EmptyLoadingView.swift */; }; 2957777B200129EB00DDD785 /* Int+Abbreviated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2957777A200129EB00DDD785 /* Int+Abbreviated.swift */; }; 295840651EE89F28007723C6 /* IssueStatusEventModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 295840641EE89F28007723C6 /* IssueStatusEventModel.swift */; }; @@ -689,7 +688,6 @@ 294EE4CA209006C2002C9CB1 /* InboxController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InboxController.swift; sourceTree = ""; }; 294EE4D0209006C3002C9CB1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 294EE4D2209006C3002C9CB1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 2950AB1A2082E47200C6F19A /* AppSplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSplitViewController.swift; sourceTree = ""; }; 2950AB1C2083B1E400C6F19A /* EmptyLoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyLoadingView.swift; sourceTree = ""; }; 2957777A200129EB00DDD785 /* Int+Abbreviated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Int+Abbreviated.swift"; sourceTree = ""; }; 295840641EE89F28007723C6 /* IssueStatusEventModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IssueStatusEventModel.swift; sourceTree = ""; }; @@ -1661,7 +1659,6 @@ 297AE8681EC0D5C200B44A1F /* View Controllers */ = { isa = PBXGroup; children = ( - 2950AB1A2082E47200C6F19A /* AppSplitViewController.swift */, 29CEA5CC1F84DB1B009827DB /* BaseListViewController.swift */, 29C8F9AA208BF64D0075931C /* BaseListViewController2.swift */, 2973E80C20FBD7BF0050233F /* ContrastContextMenu.swift */, @@ -3011,7 +3008,6 @@ 29242814210A51B5001F5980 /* SpacerSectionController.swift in Sources */, 2971722B1F069E6B005E43AC /* SpinnerSectionController.swift in Sources */, 2999972E203120E300995FFD /* IssueMergeButtonCell.swift in Sources */, - 2950AB1B2082E47200C6F19A /* AppSplitViewController.swift in Sources */, 2993046B1FBA8C04007B9737 /* IssueManagingExpansionCell.swift in Sources */, 29C33FDB1F127DBB00EC8D40 /* SplitPlaceholderViewController.swift in Sources */, 2924C18320D5B2BF00FCFCFF /* MilestoneCell.swift in Sources */, diff --git a/Resources/Base.lproj/Main.storyboard b/Resources/Base.lproj/Main.storyboard index cbb4e5204..94f031458 100644 --- a/Resources/Base.lproj/Main.storyboard +++ b/Resources/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ - + @@ -92,10 +92,10 @@ - + - +