From 33a6c854610737dfe30364244628cf8dd10f54f8 Mon Sep 17 00:00:00 2001 From: Esteban Brenes Date: Tue, 25 Mar 2014 18:30:56 -0600 Subject: [PATCH] Code Challenge Changes --- ChangingBackground.xcodeproj/project.pbxproj | 7 + ChangingBackground/Constants.h | 16 + ChangingBackground/FirstViewController.h | 5 +- ChangingBackground/FirstViewController.m | 46 +++ ChangingBackground/FirstViewController.xib | 265 +++-------------- ChangingBackground/SecondViewController.h | 1 + ChangingBackground/SecondViewController.m | 16 +- ChangingBackground/SecondViewController.xib | 289 +++---------------- 8 files changed, 183 insertions(+), 462 deletions(-) create mode 100644 ChangingBackground/Constants.h diff --git a/ChangingBackground.xcodeproj/project.pbxproj b/ChangingBackground.xcodeproj/project.pbxproj index 2e16be1..00968df 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 */; }; + 2E6A393D18E22BC400005199 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E6A393A18E21BFB00005199 /* QuartzCore.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -50,6 +51,8 @@ 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 = ""; }; + 2E6A393A18E21BFB00005199 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; + 2E6A393C18E22A6E00005199 /* Constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -57,6 +60,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 2E6A393D18E22BC400005199 /* QuartzCore.framework in Frameworks */, 001809B9171C637E002D3E93 /* UIKit.framework in Frameworks */, 001809BB171C637E002D3E93 /* Foundation.framework in Frameworks */, 001809BD171C637E002D3E93 /* CoreGraphics.framework in Frameworks */, @@ -86,6 +90,7 @@ 001809B7171C637E002D3E93 /* Frameworks */ = { isa = PBXGroup; children = ( + 2E6A393A18E21BFB00005199 /* QuartzCore.framework */, 001809B8171C637E002D3E93 /* UIKit.framework */, 001809BA171C637E002D3E93 /* Foundation.framework */, 001809BC171C637E002D3E93 /* CoreGraphics.framework */, @@ -114,6 +119,7 @@ 001809CA171C637E002D3E93 /* Default.png */, 001809CC171C637E002D3E93 /* Default@2x.png */, 001809CE171C637E002D3E93 /* Default-568h@2x.png */, + 2E6A393C18E22A6E00005199 /* Constants.h */, ); name = "Supporting Files"; sourceTree = ""; @@ -356,6 +362,7 @@ 001809D4171C637E002D3E93 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/ChangingBackground/Constants.h b/ChangingBackground/Constants.h new file mode 100644 index 0000000..0873dc2 --- /dev/null +++ b/ChangingBackground/Constants.h @@ -0,0 +1,16 @@ +// +// Constants.h +// ChangingBackground +// +// Created by Esteban Brenes on 3/25/14. +// Copyright (c) 2014 Ora Interactive. All rights reserved. +// + +#import + +#define BLUE_BACKGROUND @"blue.png" +#define GREEN_BACKGROUND @"green.png" + +@interface Constantes : NSObject + +@end \ No newline at end of file diff --git a/ChangingBackground/FirstViewController.h b/ChangingBackground/FirstViewController.h index a2fae46..71b45ba 100644 --- a/ChangingBackground/FirstViewController.h +++ b/ChangingBackground/FirstViewController.h @@ -9,7 +9,10 @@ #import @interface FirstViewController : UIViewController - +{ + bool firstTime; +} +@property (weak, nonatomic) IBOutlet UIImageView *imgViewBackground; - (IBAction)goForwardButtonPressed; @end diff --git a/ChangingBackground/FirstViewController.m b/ChangingBackground/FirstViewController.m index 8aedb68..b685025 100644 --- a/ChangingBackground/FirstViewController.m +++ b/ChangingBackground/FirstViewController.m @@ -8,6 +8,7 @@ #import "FirstViewController.h" #import "SecondViewController.h" +#import "Constants.h" @interface FirstViewController () @@ -15,6 +16,51 @@ @interface FirstViewController () @implementation FirstViewController +-(void)viewDidLoad +{ + [super viewDidLoad]; + firstTime = YES; + // self.view.backgroundColor = [[UIColor alloc] initWithPatternImage:[UIImage imageNamed:BLUE_BACKGROUND]]; +} + + +//*************************************************************** +// used a fixed image here because its only 2 views but if there are more +//views with different backgorunds then i would have needed to pass some kind of +//parameter to identify the initial background to do the fade from +//*************************************************************** +-(void)viewWillAppear:(BOOL)animated +{ + if (!firstTime) { + // self.view.backgroundColor = [[UIColor alloc] initWithPatternImage:[UIImage imageNamed:GREEN_BACKGROUND]]; + [[self imgViewBackground] setImage:[UIImage imageNamed:GREEN_BACKGROUND]]; + } + +} +- (void)viewDidAppear:(BOOL)animated +{ + if (firstTime) { + firstTime = !firstTime; + } + else + { + //*************************************************************** + //Had to switch from background color to uiimageview because the + //provided images wouldnt fit the screen on IOS7 or landscape + //*************************************************************** + + /* self.view.backgroundColor = [[UIColor alloc] initWithPatternImage:[UIImage imageNamed:BLUE_BACKGROUND]]; + CATransition *transiton = [[CATransition alloc] init]; + transiton.duration = 2.0; + [self.view.layer addAnimation:transiton forKey:@"Animation"];*/ + + [[self imgViewBackground] setImage:[UIImage imageNamed:BLUE_BACKGROUND]]; + CATransition *transiton = [[CATransition alloc] init]; + transiton.duration = 2.0; + [self.imgViewBackground.layer addAnimation:transiton forKey:@"Animation"]; + } +} + - (IBAction)goForwardButtonPressed { SecondViewController *secondViewController = SecondViewController.new; [self.navigationController pushViewController:secondViewController animated:YES]; diff --git a/ChangingBackground/FirstViewController.xib b/ChangingBackground/FirstViewController.xib index 0dd58c2..5f8d993 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..c6bb742 100644 --- a/ChangingBackground/SecondViewController.h +++ b/ChangingBackground/SecondViewController.h @@ -11,5 +11,6 @@ @interface SecondViewController : UIViewController - (IBAction)goBackButtonPressed; +@property (weak, nonatomic) IBOutlet UIImageView *imgViewBackground; @end diff --git a/ChangingBackground/SecondViewController.m b/ChangingBackground/SecondViewController.m index 028f811..72a54c2 100644 --- a/ChangingBackground/SecondViewController.m +++ b/ChangingBackground/SecondViewController.m @@ -7,7 +7,7 @@ // #import "SecondViewController.h" - +#import "Constants.h" @implementation SecondViewController @@ -15,4 +15,18 @@ - (IBAction)goBackButtonPressed { [self.navigationController popViewControllerAnimated:YES]; } + +-(void)viewWillAppear:(BOOL)animated +{ + [[self imgViewBackground] setImage:[UIImage imageNamed:BLUE_BACKGROUND]]; +} +- (void)viewDidAppear:(BOOL)animated +{ + [[self imgViewBackground] setImage:[UIImage imageNamed:GREEN_BACKGROUND]]; + CATransition *transiton = [[CATransition alloc] init]; + transiton.duration = 2.0; + [self.view.layer addAnimation:transiton forKey:@"Animation"]; +} + + @end diff --git a/ChangingBackground/SecondViewController.xib b/ChangingBackground/SecondViewController.xib index d603949..8ca4186 100644 --- a/ChangingBackground/SecondViewController.xib +++ b/ChangingBackground/SecondViewController.xib @@ -1,243 +1,46 @@ - - - - 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 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +