aboutsummaryrefslogtreecommitdiffstats
path: root/iBean/iBean
diff options
context:
space:
mode:
authorEddie Ehlin <eddiex@eddiex.se>2012-12-31 00:04:42 +0100
committerEddie Ehlin <eddiex@eddiex.se>2012-12-31 00:04:42 +0100
commitf732bdde2a17539ae8a955eb948365c9d392c43a (patch)
tree77f3ce354537c1661b67bbfe1b6a5fc2e812daf1 /iBean/iBean
parent5a21cbfb85b34f498a758c66f663b45b822dc262 (diff)
downloadiBean-f732bdde2a17539ae8a955eb948365c9d392c43a.tar.gz
iBean-f732bdde2a17539ae8a955eb948365c9d392c43a.zip
Insta bean functionality is done except for data storage. Will fixe this in new xcode project.
Diffstat (limited to 'iBean/iBean')
-rw-r--r--iBean/iBean/InstaBeanViewController.h1
-rw-r--r--iBean/iBean/InstaBeanViewController.m16
-rw-r--r--iBean/iBean/iBean-Prefix.pch1
3 files changed, 13 insertions, 5 deletions
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