From fed7ae21e658903d9f5215f35a19d48a65fa24ba Mon Sep 17 00:00:00 2001 From: Paul Kolesar Date: Thu, 3 Jul 2014 14:34:35 -0500 Subject: [PATCH 1/2] test commit --- ChangingBackground/FirstViewController.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangingBackground/FirstViewController.m b/ChangingBackground/FirstViewController.m index 8aedb68..6cf9356 100644 --- a/ChangingBackground/FirstViewController.m +++ b/ChangingBackground/FirstViewController.m @@ -20,4 +20,7 @@ - (IBAction)goForwardButtonPressed { [self.navigationController pushViewController:secondViewController animated:YES]; } +//this all works! + + @end From 56b8ba8314c316214b6a254bd08b349ae12e6a25 Mon Sep 17 00:00:00 2001 From: Paul Kolesar Date: Thu, 3 Jul 2014 14:40:18 -0500 Subject: [PATCH 2/2] My implementation of the Changing Background solution --- ChangingBackground.xcodeproj/project.pbxproj | 5 + ChangingBackground/FirstViewController.h | 3 + ChangingBackground/FirstViewController.m | 17 +- ChangingBackground/FirstViewController.xib | 265 +++-------------- ChangingBackground/SecondViewController.h | 4 +- ChangingBackground/SecondViewController.m | 22 +- ChangingBackground/SecondViewController.xib | 291 +++---------------- 7 files changed, 141 insertions(+), 466 deletions(-) diff --git a/ChangingBackground.xcodeproj/project.pbxproj b/ChangingBackground.xcodeproj/project.pbxproj index 2e16be1..82abac0 100644 --- a/ChangingBackground.xcodeproj/project.pbxproj +++ b/ChangingBackground.xcodeproj/project.pbxproj @@ -24,6 +24,7 @@ 001809EC171C6764002D3E93 /* blue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 001809E8171C6764002D3E93 /* blue@2x.png */; }; 001809ED171C6764002D3E93 /* green.png in Resources */ = {isa = PBXBuildFile; fileRef = 001809E9171C6764002D3E93 /* green.png */; }; 001809EE171C6764002D3E93 /* green@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 001809EA171C6764002D3E93 /* green@2x.png */; }; + D2DB51AF1965E8E100874338 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2DB51AE1965E8E100874338 /* QuartzCore.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -50,6 +51,7 @@ 001809E8171C6764002D3E93 /* blue@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "blue@2x.png"; sourceTree = ""; }; 001809E9171C6764002D3E93 /* green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = green.png; sourceTree = ""; }; 001809EA171C6764002D3E93 /* green@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "green@2x.png"; sourceTree = ""; }; + D2DB51AE1965E8E100874338 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -57,6 +59,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D2DB51AF1965E8E100874338 /* QuartzCore.framework in Frameworks */, 001809B9171C637E002D3E93 /* UIKit.framework in Frameworks */, 001809BB171C637E002D3E93 /* Foundation.framework in Frameworks */, 001809BD171C637E002D3E93 /* CoreGraphics.framework in Frameworks */, @@ -86,6 +89,7 @@ 001809B7171C637E002D3E93 /* Frameworks */ = { isa = PBXGroup; children = ( + D2DB51AE1965E8E100874338 /* QuartzCore.framework */, 001809B8171C637E002D3E93 /* UIKit.framework */, 001809BA171C637E002D3E93 /* Foundation.framework */, 001809BC171C637E002D3E93 /* CoreGraphics.framework */, @@ -356,6 +360,7 @@ 001809D4171C637E002D3E93 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/ChangingBackground/FirstViewController.h b/ChangingBackground/FirstViewController.h index a2fae46..6a951b9 100644 --- a/ChangingBackground/FirstViewController.h +++ b/ChangingBackground/FirstViewController.h @@ -5,8 +5,11 @@ // Created by Jeffrey Camealy on 4/15/13. // Copyright (c) 2013 Ora Interactive. All rights reserved. // +// Paul Kolesar Solution 7/3/14 +// #import +#import @interface FirstViewController : UIViewController diff --git a/ChangingBackground/FirstViewController.m b/ChangingBackground/FirstViewController.m index 6cf9356..326a785 100644 --- a/ChangingBackground/FirstViewController.m +++ b/ChangingBackground/FirstViewController.m @@ -5,6 +5,8 @@ // Created by Jeffrey Camealy on 4/15/13. // Copyright (c) 2013 Ora Interactive. All rights reserved. // +// Paul Kolesar Solution 7/3/14 +// #import "FirstViewController.h" #import "SecondViewController.h" @@ -16,11 +18,20 @@ @interface FirstViewController () @implementation FirstViewController - (IBAction)goForwardButtonPressed { - SecondViewController *secondViewController = SecondViewController.new; - [self.navigationController pushViewController:secondViewController animated:YES]; + SecondViewController *secondViewController = [[SecondViewController alloc] init]; + CATransition* transition = [CATransition animation]; + transition.duration = 2; + transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; + transition.type = kCATransitionFade; + [self.navigationController.view.layer addAnimation:transition forKey:nil]; + [[self navigationController] pushViewController:secondViewController animated:NO]; } -//this all works! +-(void) viewDidLoad +{ + + +} @end diff --git a/ChangingBackground/FirstViewController.xib b/ChangingBackground/FirstViewController.xib index 0dd58c2..f3f80ac 100644 --- a/ChangingBackground/FirstViewController.xib +++ b/ChangingBackground/FirstViewController.xib @@ -1,217 +1,48 @@ - - - - 1552 - 12C3006 - 3084 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 2083 - - - IBProxyObject - IBUIButton - IBUILabel - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - - - - 292 - {{77, 115}, {166, 21}} - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Home View Controller - - 1 - MCAwIDAAA - darkTextColor - - - 0 - - 1 - 17 - - - Helvetica - 17 - 16 - - NO - - - - 292 - {{102, 180}, {109, 44}} - - _NS:9 - NO - IBCocoaTouchFramework - 0 - 0 - 1 - Go Forward - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - {{0, 20}, {320, 548}} - - - 3 - MQA - - 2 - - - - - IBUIScreenMetrics - - YES - - - - - - {320, 568} - {568, 320} - - - IBCocoaTouchFramework - Retina 4 Full Screen - 2 - - IBCocoaTouchFramework - - - - - - - view - - - - 3 - - - - goForwardButtonPressed - - - 7 - - 8 - - - - - - 0 - - - - - - 1 - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - 7 - - - - - - - FirstViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 8 - - - 0 - IBCocoaTouchFramework - YES - 3 - 2083 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ChangingBackground/SecondViewController.h b/ChangingBackground/SecondViewController.h index 9ded32e..c03db97 100644 --- a/ChangingBackground/SecondViewController.h +++ b/ChangingBackground/SecondViewController.h @@ -5,11 +5,13 @@ // Created by Jeffrey Camealy on 4/15/13. // Copyright (c) 2013 Ora Interactive. All rights reserved. // +// Paul Kolesar Solution 7/3/14 +// #import +#import @interface SecondViewController : UIViewController - (IBAction)goBackButtonPressed; - @end diff --git a/ChangingBackground/SecondViewController.m b/ChangingBackground/SecondViewController.m index 028f811..c7489c6 100644 --- a/ChangingBackground/SecondViewController.m +++ b/ChangingBackground/SecondViewController.m @@ -5,14 +5,32 @@ // Created by Jeffrey Camealy on 4/15/13. // Copyright (c) 2013 Ora Interactive. All rights reserved. // +// Paul Kolesar Solution 7/3/14 +// #import "SecondViewController.h" @implementation SecondViewController -- (IBAction)goBackButtonPressed { - [self.navigationController popViewControllerAnimated:YES]; +- (IBAction)goBackButtonPressed +{ + + CATransition* transition = [CATransition animation]; + transition.duration = 2; + transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; + transition.type = kCATransitionFade; + [self.navigationController.view.layer addAnimation:transition forKey:nil]; + [[self navigationController] popViewControllerAnimated:NO]; + + +} + +-(void) viewDidLoad +{ + + } + @end diff --git a/ChangingBackground/SecondViewController.xib b/ChangingBackground/SecondViewController.xib index d603949..d2c9ef3 100644 --- a/ChangingBackground/SecondViewController.xib +++ b/ChangingBackground/SecondViewController.xib @@ -1,243 +1,48 @@ - - - - 1552 - 12C3006 - 3084 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 2083 - - - IBProxyObject - IBUIButton - IBUILabel - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - - - - 292 - {{71, 118}, {209, 21}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Second View Controller - - 1 - MCAwIDAAA - darkTextColor - - - 0 - - 1 - 17 - - - Helvetica - 17 - 16 - - NO - - - - 292 - {{118, 178}, {85, 44}} - - - _NS:9 - NO - IBCocoaTouchFramework - 0 - 0 - 1 - Go Back - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - {{0, 20}, {320, 548}} - - - - - 3 - MQA - - 2 - - - - - IBUIScreenMetrics - - YES - - - - - - {320, 568} - {568, 320} - - - IBCocoaTouchFramework - Retina 4 Full Screen - 2 - - IBCocoaTouchFramework - - - - - - - view - - - - 3 - - - - goBackButtonPressed - - - 7 - - 10 - - - - - - 0 - - - - - - 1 - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - 7 - - - - - - - SecondViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 10 - - - - - SecondViewController - UIViewController - - goBackButtonPressed - id - - - goBackButtonPressed - - goBackButtonPressed - id - - - - IBProjectSource - ./Classes/SecondViewController.h - - - - - 0 - IBCocoaTouchFramework - YES - 3 - 2083 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +