diff options
| -rw-r--r-- | iBean/iBean.xcodeproj/project.pbxproj | 21 | ||||
| -rw-r--r-- | iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate | bin | 20760 -> 24786 bytes | |||
| -rw-r--r-- | iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist | 15 | ||||
| -rw-r--r-- | iBean/iBean/InstaBeanViewController.h | 1 | ||||
| -rw-r--r-- | iBean/iBean/InstaBeanViewController.m | 16 | ||||
| -rw-r--r-- | iBean/iBean/iBean-Prefix.pch | 1 |
6 files changed, 30 insertions, 24 deletions
diff --git a/iBean/iBean.xcodeproj/project.pbxproj b/iBean/iBean.xcodeproj/project.pbxproj index e97ecaf..f6c5b47 100644 --- a/iBean/iBean.xcodeproj/project.pbxproj +++ b/iBean/iBean.xcodeproj/project.pbxproj @@ -24,6 +24,7 @@ 020C5558168E1F5300D8224C /* second.png in Resources */ = {isa = PBXBuildFile; fileRef = 020C5557168E1F5300D8224C /* second.png */; }; 020C555A168E1F5300D8224C /* second@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 020C5559168E1F5300D8224C /* second@2x.png */; }; 020C556A168E205900D8224C /* InstaBeanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C5569168E205900D8224C /* InstaBeanViewController.m */; }; + 020C557B168F702100D8224C /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 020C557A168F702100D8224C /* CoreData.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -50,6 +51,7 @@ 020C5559168E1F5300D8224C /* second@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "second@2x.png"; sourceTree = "<group>"; }; 020C5568168E205900D8224C /* InstaBeanViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InstaBeanViewController.h; sourceTree = "<group>"; }; 020C5569168E205900D8224C /* InstaBeanViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InstaBeanViewController.m; sourceTree = "<group>"; }; + 020C557A168F702100D8224C /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -57,6 +59,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 020C557B168F702100D8224C /* CoreData.framework in Frameworks */, 020C5530168E1F5200D8224C /* UIKit.framework in Frameworks */, 020C5532168E1F5200D8224C /* Foundation.framework in Frameworks */, 020C5534168E1F5200D8224C /* CoreGraphics.framework in Frameworks */, @@ -86,6 +89,7 @@ 020C552E168E1F5200D8224C /* Frameworks */ = { isa = PBXGroup; children = ( + 020C557A168F702100D8224C /* CoreData.framework */, 020C552F168E1F5200D8224C /* UIKit.framework */, 020C5531168E1F5200D8224C /* Foundation.framework */, 020C5533168E1F5200D8224C /* CoreGraphics.framework */, @@ -96,6 +100,7 @@ 020C5535168E1F5200D8224C /* iBean */ = { isa = PBXGroup; children = ( + 020C5578168F6AB400D8224C /* Graphics */, 020C556B168E214C00D8224C /* InstaBean */, 020C553E168E1F5200D8224C /* AppDelegate.h */, 020C553F168E1F5200D8224C /* AppDelegate.m */, @@ -103,10 +108,6 @@ 020C554A168E1F5200D8224C /* MainStoryboard_iPad.storyboard */, 020C554D168E1F5200D8224C /* FirstViewController.h */, 020C554E168E1F5200D8224C /* FirstViewController.m */, - 020C5550168E1F5200D8224C /* first.png */, - 020C5552168E1F5200D8224C /* first@2x.png */, - 020C5557168E1F5300D8224C /* second.png */, - 020C5559168E1F5300D8224C /* second@2x.png */, 020C5536168E1F5200D8224C /* Supporting Files */, ); path = iBean; @@ -135,6 +136,17 @@ name = InstaBean; sourceTree = "<group>"; }; + 020C5578168F6AB400D8224C /* Graphics */ = { + isa = PBXGroup; + children = ( + 020C5550168E1F5200D8224C /* first.png */, + 020C5552168E1F5200D8224C /* first@2x.png */, + 020C5557168E1F5300D8224C /* second.png */, + 020C5559168E1F5300D8224C /* second@2x.png */, + ); + name = Graphics; + sourceTree = "<group>"; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -336,6 +348,7 @@ 020C555F168E1F5300D8224C /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate Binary files differindex c1a02c2..17f5024 100644 --- a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate +++ b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist index 34b12d6..05301bc 100644 --- a/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist +++ b/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist @@ -2,19 +2,4 @@ <Bucket type = "1" version = "1.0"> - <FileBreakpoints> - <FileBreakpoint - shouldBeEnabled = "No" - ignoreCount = "0" - continueAfterRunningActions = "No" - filePath = "iBean/InstaBeanViewController.m" - timestampString = "378477821.220756" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "30" - endingLineNumber = "30" - landmarkName = "-viewDidLoad" - landmarkType = "5"> - </FileBreakpoint> - </FileBreakpoints> </Bucket> diff --git a/iBean/iBean/InstaBeanViewController.h b/iBean/iBean/InstaBeanViewController.h index 65ae31b..3ddfe2b 100644 --- a/iBean/iBean/InstaBeanViewController.h +++ b/iBean/iBean/InstaBeanViewController.h @@ -9,6 +9,7 @@ #import <UIKit/UIKit.h> @interface InstaBeanViewController : UIViewController + @property (weak, nonatomic) IBOutlet UILabel *extractionProgressLabel; @property (weak, nonatomic) IBOutlet UIStepper *extractionSettingStepper; @property (weak, nonatomic) IBOutlet UILabel *extractionSettingLabel; diff --git a/iBean/iBean/InstaBeanViewController.m b/iBean/iBean/InstaBeanViewController.m index dd67379..ab77ed7 100644 --- a/iBean/iBean/InstaBeanViewController.m +++ b/iBean/iBean/InstaBeanViewController.m @@ -16,16 +16,22 @@ - (void)viewDidLoad { - [super viewDidLoad]; - NSLog(@"InstaBean viewDidLoad"); - [self initInstaBean]; + [super viewDidLoad]; + //Add any view related setup? +} + +- (void)viewWillAppear:(BOOL)animated +{ + NSLog(@"InstaBean viewWillAppear"); + //[super viewWillAppear:<#animated#>]; + [self initInstaBean]; } - (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. } diff --git a/iBean/iBean/iBean-Prefix.pch b/iBean/iBean/iBean-Prefix.pch index 6837666..1eb06ae 100644 --- a/iBean/iBean/iBean-Prefix.pch +++ b/iBean/iBean/iBean-Prefix.pch @@ -11,4 +11,5 @@ #ifdef __OBJC__ #import <UIKit/UIKit.h> #import <Foundation/Foundation.h> + #import <CoreData/CoreData.h> #endif |