From 0be355e01c92a213107c960b2b765e3f12d8c826 Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Tue, 22 Nov 2016 20:01:17 -0800 Subject: [PATCH] Updates Delta purple color --- Delta/AppDelegate.swift | 2 +- Delta/Extensions/UIColor+Delta.swift | 9 ++------- Delta/Game Selection/GamesViewController.swift | 2 +- Delta/Pause Menu/PauseViewController.swift | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Delta/AppDelegate.swift b/Delta/AppDelegate.swift index a51a7cf..0d91868 100644 --- a/Delta/AppDelegate.swift +++ b/Delta/AppDelegate.swift @@ -22,7 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate Delta.register(SNES.core) Delta.register(GBA.core) - self.window?.tintColor = UIColor.deltaPurpleColor() + self.window?.tintColor = UIColor.deltaPurple // Database diff --git a/Delta/Extensions/UIColor+Delta.swift b/Delta/Extensions/UIColor+Delta.swift index ca1994e..e0de410 100644 --- a/Delta/Extensions/UIColor+Delta.swift +++ b/Delta/Extensions/UIColor+Delta.swift @@ -10,16 +10,11 @@ import UIKit extension UIColor { - class func deltaPurpleColor() -> UIColor + class var deltaPurple: UIColor { - return UIColor(red: 120.0/255.0, green: 32.0/255.0, blue: 157.0/255.0, alpha: 1.0) + return UIColor(red: 111.0/255.0, green: 14.0/255.0, blue: 199.0/255.0, alpha: 1.0) } - class func deltaLightPurpleColor() -> UIColor - { - return UIColor(red: 184.0/255.0, green: 97.0/255.0, blue: 253.0/255.0, alpha: 1.0) - } -} class var deltaDarkGray: UIColor { return UIColor(white: 0.15, alpha: 1.0) diff --git a/Delta/Game Selection/GamesViewController.swift b/Delta/Game Selection/GamesViewController.swift index 646730d..df0cc99 100644 --- a/Delta/Game Selection/GamesViewController.swift +++ b/Delta/Game Selection/GamesViewController.swift @@ -77,7 +77,7 @@ extension GamesViewController self.pageControl.translatesAutoresizingMaskIntoConstraints = false self.pageControl.hidesForSinglePage = false self.pageControl.numberOfPages = 3 - self.pageControl.currentPageIndicatorTintColor = UIColor.deltaPurpleColor() + self.pageControl.currentPageIndicatorTintColor = UIColor.deltaPurple self.pageControl.pageIndicatorTintColor = UIColor.lightGray self.navigationController?.toolbar.addSubview(self.pageControl) diff --git a/Delta/Pause Menu/PauseViewController.swift b/Delta/Pause Menu/PauseViewController.swift index da99975..c3898b1 100644 --- a/Delta/Pause Menu/PauseViewController.swift +++ b/Delta/Pause Menu/PauseViewController.swift @@ -82,7 +82,7 @@ extension PauseViewController case "embedNavigationController": self.pauseNavigationController = segue.destination as! UINavigationController self.pauseNavigationController.delegate = self - self.pauseNavigationController.navigationBar.tintColor = UIColor.deltaLightPurpleColor() + self.pauseNavigationController.navigationBar.tintColor = UIColor.deltaPurple self.pauseNavigationController.view.backgroundColor = UIColor.clear let pauseMenuViewController = self.pauseNavigationController.topViewController as! PauseMenuViewController