diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj index 44906e8..18f9a1f 100644 --- a/Delta.xcodeproj/project.pbxproj +++ b/Delta.xcodeproj/project.pbxproj @@ -46,6 +46,7 @@ BF7AE8061C2E858400B1B5BC /* PausePresentationControllerContentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF7AE8021C2E858400B1B5BC /* PausePresentationControllerContentView.xib */; }; BF7AE8071C2E858400B1B5BC /* PauseStoryboardSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7AE8031C2E858400B1B5BC /* PauseStoryboardSegue.swift */; }; BF7AE8081C2E858400B1B5BC /* PauseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7AE8041C2E858400B1B5BC /* PauseViewController.swift */; }; + BF7AE80A1C2E8C7600B1B5BC /* UIColor+Delta.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7AE8091C2E8C7600B1B5BC /* UIColor+Delta.swift */; }; BF8624881BB743FE00C12EEE /* Roxas.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFEC732C1AAECC4A00650035 /* Roxas.framework */; }; BF8624891BB743FE00C12EEE /* Roxas.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BFEC732C1AAECC4A00650035 /* Roxas.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; BF8624A91BB7464B00C12EEE /* DeltaCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF9F4FCE1AAD7B87004C9500 /* DeltaCore.framework */; }; @@ -147,6 +148,7 @@ BF7AE8021C2E858400B1B5BC /* PausePresentationControllerContentView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = PausePresentationControllerContentView.xib; path = "Pause Menu/PausePresentationControllerContentView.xib"; sourceTree = ""; }; BF7AE8031C2E858400B1B5BC /* PauseStoryboardSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PauseStoryboardSegue.swift; path = "Pause Menu/PauseStoryboardSegue.swift"; sourceTree = ""; }; BF7AE8041C2E858400B1B5BC /* PauseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PauseViewController.swift; path = "Pause Menu/PauseViewController.swift"; sourceTree = ""; }; + BF7AE8091C2E8C7600B1B5BC /* UIColor+Delta.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+Delta.swift"; sourceTree = ""; }; BF9F4FCE1AAD7B87004C9500 /* DeltaCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DeltaCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BFA534291BDC6B520088F1BE /* GameCollectionViewLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GameCollectionViewLayout.swift; path = "Collection View/GameCollectionViewLayout.swift"; sourceTree = ""; }; BFAA1FEC1B8AA4FA00495943 /* Settings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = ""; }; @@ -214,6 +216,7 @@ BF090CF21B490D8300DCAB45 /* UIDevice+Vibration.h */, BF090CF31B490D8300DCAB45 /* UIDevice+Vibration.m */, BF797A2C1C2D339F00F1A000 /* UILabel+FontSize.swift */, + BF7AE8091C2E8C7600B1B5BC /* UIColor+Delta.swift */, ); path = Extensions; sourceTree = ""; @@ -683,6 +686,7 @@ BFC2731A1BE6152200D22B05 /* GameCollection.swift in Sources */, BFF1E5641BE04CAF000E9EF6 /* BoxArtImageView.swift in Sources */, BF762EAB1BC1B076002C8866 /* NSManagedObject+Conveniences.swift in Sources */, + BF7AE80A1C2E8C7600B1B5BC /* UIColor+Delta.swift in Sources */, BFA5342A1BDC6B520088F1BE /* GameCollectionViewLayout.swift in Sources */, BF762E9E1BC19D31002C8866 /* DatabaseManager.swift in Sources */, BF090CF41B490D8300DCAB45 /* UIDevice+Vibration.m in Sources */, diff --git a/Delta/AppDelegate.swift b/Delta/AppDelegate.swift index 4f9b217..ef0cc53 100644 --- a/Delta/AppDelegate.swift +++ b/Delta/AppDelegate.swift @@ -17,6 +17,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool { + self.window?.tintColor = UIColor.deltaPurpleColor() + // Database DatabaseManager.sharedManager.startWithCompletion { performingMigration in } diff --git a/Delta/Extensions/UIColor+Delta.swift b/Delta/Extensions/UIColor+Delta.swift new file mode 100644 index 0000000..0404fd4 --- /dev/null +++ b/Delta/Extensions/UIColor+Delta.swift @@ -0,0 +1,22 @@ +// +// UIColor+Delta.swift +// Delta +// +// Created by Riley Testut on 12/26/15. +// Copyright © 2015 Riley Testut. All rights reserved. +// + +import UIKit + +extension UIColor +{ + class func deltaPurpleColor() -> UIColor + { + return UIColor(red: 120.0/255.0, green: 32.0/255.0, blue: 157.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) + } +} \ No newline at end of file diff --git a/Delta/Pause Menu/PauseViewController.swift b/Delta/Pause Menu/PauseViewController.swift index 4bc9114..e143890 100644 --- a/Delta/Pause Menu/PauseViewController.swift +++ b/Delta/Pause Menu/PauseViewController.swift @@ -61,6 +61,8 @@ class PauseViewController: UIViewController, PauseInfoProvidable self.collectionViewLayout.itemWidth = 90 self.collectionViewLayout.usesEqualHorizontalSpacingDistributionForSingleRow = true + self.navigationItem.rightBarButtonItem?.tintColor = UIColor.deltaLightPurpleColor() + // Manually update prototype cell properties self.prototypeCell.contentView.widthAnchor.constraintEqualToConstant(self.collectionViewLayout.itemWidth).active = true