diff --git a/Delta/Base.lproj/LaunchScreen.storyboard b/Delta/Base.lproj/LaunchScreen.storyboard index 61c9dc3..03c5dd3 100644 --- a/Delta/Base.lproj/LaunchScreen.storyboard +++ b/Delta/Base.lproj/LaunchScreen.storyboard @@ -1,16 +1,20 @@ - - + + + + + - + + - + - + @@ -19,49 +23,30 @@ - - - + + + + + + - + - - - - - - + + + + + + - - - - - - - - - - - + + + diff --git a/Delta/Base.lproj/Main.storyboard b/Delta/Base.lproj/Main.storyboard index de831e4..6ed1f2e 100644 --- a/Delta/Base.lproj/Main.storyboard +++ b/Delta/Base.lproj/Main.storyboard @@ -1,8 +1,11 @@ - + + + + - + @@ -19,6 +22,7 @@ + @@ -88,6 +92,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Delta/Game Selection/Segues/InitialGamesStoryboardSegue.swift b/Delta/Game Selection/Segues/InitialGamesStoryboardSegue.swift index b6d3a2f..5183340 100644 --- a/Delta/Game Selection/Segues/InitialGamesStoryboardSegue.swift +++ b/Delta/Game Selection/Segues/InitialGamesStoryboardSegue.swift @@ -70,12 +70,16 @@ extension InitialGamesStoryboardSegue: UIViewControllerAnimatedTransitioning { transitionContext.sourceViewController.beginAppearanceTransition(false, animated: false) - // No animation + transitionContext.destinationView.alpha = 0.0 transitionContext.destinationView.frame = transitionContext.destinationViewFinalFrame! transitionContext.containerView.addSubview(transitionContext.destinationView) - transitionContext.completeTransition(true) - transitionContext.sourceViewController.endAppearanceTransition() + UIView.animate(withDuration: 0.3, animations: { + transitionContext.destinationView.alpha = 1.0 + }, completion: { finished in + transitionContext.completeTransition(true) + transitionContext.sourceViewController.endAppearanceTransition() + }) } func animateDismissalTransition(using transitionContext: UIViewControllerContextTransitioning) diff --git a/Delta/Launch/LaunchViewController.swift b/Delta/Launch/LaunchViewController.swift index e6230f5..9f5d7ba 100644 --- a/Delta/Launch/LaunchViewController.swift +++ b/Delta/Launch/LaunchViewController.swift @@ -10,13 +10,13 @@ import UIKit class LaunchViewController: UIViewController { - @IBOutlet fileprivate var containerView: UIView! + @IBOutlet fileprivate var gameViewContainerView: UIView! fileprivate var gameViewController: GameViewController! fileprivate var presentedGameViewController: Bool = false override var preferredStatusBarStyle: UIStatusBarStyle { - return self.gameViewController?.preferredStatusBarStyle ?? .default + return self.gameViewController?.preferredStatusBarStyle ?? .lightContent } override var prefersStatusBarHidden: Bool { @@ -33,7 +33,7 @@ class LaunchViewController: UIViewController self.gameViewController.performSegue(withIdentifier: "showInitialGamesViewController", sender: nil) self.transitionCoordinator?.animate(alongsideTransition: nil, completion: { (context) in - self.containerView.isHidden = false + self.view.bringSubview(toFront: self.gameViewContainerView) }) } } diff --git a/Delta/Supporting Files/Info.plist b/Delta/Supporting Files/Info.plist index 340c58c..360d3fd 100644 --- a/Delta/Supporting Files/Info.plist +++ b/Delta/Supporting Files/Info.plist @@ -85,11 +85,13 @@ UILaunchStoryboardName LaunchScreen UIMainStoryboardFile - LaunchScreen + Main UIRequiredDeviceCapabilities armv7 + UIStatusBarStyle + UIStatusBarStyleLightContent UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/Resources/Assets.xcassets/Delta.imageset/Contents.json b/Resources/Assets.xcassets/Delta.imageset/Contents.json new file mode 100644 index 0000000..d1fa584 --- /dev/null +++ b/Resources/Assets.xcassets/Delta.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "logo_thick.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Resources/Assets.xcassets/Delta.imageset/logo_thick.png b/Resources/Assets.xcassets/Delta.imageset/logo_thick.png new file mode 100644 index 0000000..d7be6e4 Binary files /dev/null and b/Resources/Assets.xcassets/Delta.imageset/logo_thick.png differ