diff --git a/Week3/datePlanner/datePlanner.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate b/Week3/datePlanner/datePlanner.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate index 7d5a275..a3ff0df 100644 Binary files a/Week3/datePlanner/datePlanner.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate and b/Week3/datePlanner/datePlanner.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Week4/datePlanner/datePlanner.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate b/Week4/datePlanner/datePlanner.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate index 0411b51..58e0533 100644 Binary files a/Week4/datePlanner/datePlanner.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate and b/Week4/datePlanner/datePlanner.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Week4/datePlanner/datePlanner/ViewController.h b/Week4/datePlanner/datePlanner/ViewController.h index 6f68de8..c81d8ab 100644 --- a/Week4/datePlanner/datePlanner/ViewController.h +++ b/Week4/datePlanner/datePlanner/ViewController.h @@ -12,11 +12,13 @@ @interface ViewController : UIViewController { IBOutlet UITextView *mainTextView; + IBOutlet UILabel *swipeLabel; + IBOutlet UIButton *saveButton; - + UISwipeGestureRecognizer *rightSwiper; } --(IBAction)showSecondView:(id)sender; +-(IBAction)onSave:(id)sender; @end diff --git a/Week4/datePlanner/datePlanner/ViewController.m b/Week4/datePlanner/datePlanner/ViewController.m index 2c08d59..74ee7a9 100644 --- a/Week4/datePlanner/datePlanner/ViewController.m +++ b/Week4/datePlanner/datePlanner/ViewController.m @@ -15,10 +15,31 @@ @implementation ViewController + +// create an instance of the gesture recognizer and set the function to be called to onSwipe. +-(void)viewWillAppear:(BOOL)animated +{ + rightSwiper = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(onSwipe:)]; + rightSwiper.direction = UISwipeGestureRecognizerDirectionRight; + [swipeLabel addGestureRecognizer:rightSwiper]; + + [super viewWillAppear:animated]; +} + +// Once the view is loaded, retrieve any existing text form NSUserDefaults and populate the text view. - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view, typically from a nib. + + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + if (defaults != nil) + { + NSString *textViewString = [defaults objectForKey:@"eventText"]; + + mainTextView.text = textViewString; + + } } - (void)didReceiveMemoryWarning @@ -27,12 +48,12 @@ // Dispose of any resources that can be recreated. } - +// This function is called when the user swipes to the right. It is triggered from within viewWillAppear. // Decalare an instance of ViewController2. // Inform ViewController that it will be responsisble for processing any data transfered back // from secondView via delegate. // Show secondView. --(IBAction)showSecondView:(id)sender +-(void)onSwipe:(UISwipeGestureRecognizer*)recognizer { ViewController2 *secondView = [[ViewController2 alloc] initWithNibName:@"ViewController2" bundle:nil]; @@ -83,4 +104,21 @@ } + +// This function is called when the user presses the save button. +// It is responsible for collecting the text contained within the text view and saving it out to NSUserDefaults. +-(IBAction)onSave:(id)sender +{ + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + if (defaults != nil) + { + NSString *textViewString = mainTextView.text; + + [defaults setObject:textViewString forKey:@"eventText"]; + + // saves the main text view text to user defaults + [defaults synchronize]; + } +} + @end diff --git a/Week4/datePlanner/datePlanner/ViewController2.h b/Week4/datePlanner/datePlanner/ViewController2.h index e1c1c12..e03443f 100644 --- a/Week4/datePlanner/datePlanner/ViewController2.h +++ b/Week4/datePlanner/datePlanner/ViewController2.h @@ -23,13 +23,14 @@ IBOutlet UILabel *lblDatePicker; IBOutlet UITextField *eventTextField; IBOutlet UIDatePicker *eventDatePicker; + IBOutlet UILabel *swipeLabel; id delegate; + UISwipeGestureRecognizer *leftSwiper; + } --(IBAction)hideSecondView:(id)sender; - -(IBAction)onTextEnter:(id)sender; -(IBAction)hideKeyboard:(id)sender; diff --git a/Week4/datePlanner/datePlanner/ViewController2.m b/Week4/datePlanner/datePlanner/ViewController2.m index 1fd4e07..10e736a 100644 --- a/Week4/datePlanner/datePlanner/ViewController2.m +++ b/Week4/datePlanner/datePlanner/ViewController2.m @@ -17,6 +17,16 @@ // Synthesize delegate in order to allow for it to be accessed outside of this view. @synthesize delegate; +-(void)viewWillAppear:(BOOL)animated +{ + leftSwiper = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(onSwipe:)]; + leftSwiper.direction = UISwipeGestureRecognizerDirectionLeft; + [swipeLabel addGestureRecognizer:leftSwiper]; + + [super viewWillAppear:animated]; +} + + - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; @@ -49,7 +59,7 @@ // Call the onClose delegate and send back the text field text and the date picker date. // Dismiss secondView. --(IBAction)hideSecondView:(id)sender +-(void)onSwipe:(UISwipeGestureRecognizer*)recognizer { if (delegate != nil) { diff --git a/Week4/datePlanner/datePlanner/ViewController2.xib b/Week4/datePlanner/datePlanner/ViewController2.xib index e5f8dc2..00b7865 100644 --- a/Week4/datePlanner/datePlanner/ViewController2.xib +++ b/Week4/datePlanner/datePlanner/ViewController2.xib @@ -75,49 +75,13 @@ NO - - - 292 - {{130, 52}, {60, 44}} - - - - _NS:9 - NO - IBCocoaTouchFramework - 0 - 0 - 1 - Save - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - 292 {320, 40} - + _NS:9 1 @@ -129,7 +93,10 @@ NO IBCocoaTouchFramework Date Planner - + + 3 + MQA + 0 NO @@ -253,7 +220,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA0 0 1 - + 3 MC42NjY2NjY2NjY3AA @@ -297,6 +264,28 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA NO + + + 292 + {{0, 40}, {320, 47}} + + + + _NS:9 + + NO + YES + 7 + IBCocoaTouchFramework + Swipe Left to Close + + + 0 + 1 + + + NO + {{0, 20}, {320, 460}} @@ -379,13 +368,12 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA176 - - hideSecondView: - - - 7 + + swipeLabel + + - 174 + 190 @@ -466,15 +454,15 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA29 3 - - - 4 + + + 3 0 - - 4 + + 3 1 - 215 + 217 1000 @@ -530,22 +518,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA24 2 - - - 4 - 0 - - 4 - 1 - - 216 - - 1000 - - 3 - 9 - 3 - 11 @@ -594,6 +566,22 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA29 3 + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + 6 @@ -626,22 +614,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA29 3 - - - 9 - 0 - - 9 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - 3 @@ -690,15 +662,15 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA9 3 - - + + 3 0 3 1 - 52 + 40 1000 @@ -706,11 +678,11 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA9 3 - - + + 9 0 - + 9 1 @@ -722,6 +694,38 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA24 2 + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + 6 @@ -770,7 +774,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA29 3 - @@ -778,6 +781,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA + @@ -792,11 +796,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - - 4 - - - 9 @@ -830,11 +829,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - - 15 - - - 16 @@ -845,11 +839,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - - 25 - - - 26 @@ -860,11 +849,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - - 30 - - - 31 @@ -1044,11 +1028,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - - 144 - - - 146 @@ -1059,11 +1038,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - - 169 - - - 170 @@ -1079,6 +1053,64 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA + + 179 + + + + + 8 + 0 + + 0 + 1 + + 47 + + 1000 + + 3 + 9 + 1 + + + + + + 183 + + + + + 184 + + + + + 185 + + + + + 186 + + + + + 187 + + + + + 188 + + + + + 189 + + + @@ -1091,22 +1123,23 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - - + + + + - + - - + @@ -1120,21 +1153,28 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABAcom.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1150,8 +1190,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABAcom.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1176,7 +1214,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - 177 + 190 @@ -1216,6 +1254,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABAUITextField UILabel UILabel + UILabel @@ -1238,6 +1277,10 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABAlblHideKeyboard UILabel + + swipeLabel + UILabel + IBProjectSource diff --git a/Week4/datePlanner/datePlanner/en.lproj/ViewController_iPhone.xib b/Week4/datePlanner/datePlanner/en.lproj/ViewController_iPhone.xib index ba2111d..16718ac 100644 --- a/Week4/datePlanner/datePlanner/en.lproj/ViewController_iPhone.xib +++ b/Week4/datePlanner/datePlanner/en.lproj/ViewController_iPhone.xib @@ -70,7 +70,7 @@ 0 17 - + Helvetica 17 16 @@ -83,7 +83,7 @@ {{0, 40}, {320, 370}} - + _NS:9 1 @@ -94,17 +94,7 @@ IBCocoaTouchFramework YES - New Event: Complete project 3
Mar 22, 2013 8:24:56 PM

New Event: Do class discussion
Mar 23, 2013 6:10:23 AM

New Event: Do class video review
Mar 24, 2013 8:25:39 PM - - - Helvetica - 14 - 16 - - - - - + NO @@ -112,19 +102,47 @@ IBCocoaTouchFramework - + 292 - {{111, 413}, {99, 44}} + {{0, 413}, {320, 47}} _NS:9 NO + YES + 7 + IBCocoaTouchFramework + Swipe Right to Add Event + + 1 + MCAwIDAAA + darkTextColor + + + 0 + 1 + + 1 + 17 + + + NO + + + + 292 + {{260, 3}, {60, 34}} + + + + _NS:9 + NO IBCocoaTouchFramework 0 0 1 - Add Event + Save 1 @@ -196,6 +214,22 @@ 79 + + + swipeLabel + + + + 95 + + + + saveButton + + + + 100 + delegate @@ -206,12 +240,12 @@ - showSecondView: - + onSave: + 7 - 34 + 101 @@ -237,15 +271,63 @@ 6 - - + + 4 0 - + 4 1 - 4 + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 3 1000 @@ -253,12 +335,28 @@ 9 3 - - - 9 + + + 6 0 - - 9 + + 6 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 1 0.0 @@ -269,6 +367,22 @@ 24 2 + + + 3 + 0 + + 3 + 1 + + 40 + + 1000 + + 3 + 9 + 3 + 6 @@ -301,22 +415,6 @@ 29 3 - - - 3 - 0 - - 3 - 1 - - 40 - - 1000 - - 3 - 9 - 3 - 6 @@ -367,7 +465,8 @@ - + + @@ -437,11 +536,6 @@ - - 24 - - - 25 @@ -452,24 +546,100 @@ - - 28 - - - - - 29 - - - 56 - 78 - + 81 + + + + + 8 + 0 + + 0 + 1 + + 47 + + 1000 + + 3 + 9 + 1 + + + + + + 83 + + + + + 86 + + + + + 87 + + + + + 8 + 0 + + 0 + 1 + + 33 + + 1000 + + 3 + 9 + 1 + + + + + + 89 + + + + + 92 + + + + + 93 + + + + + 94 + + + + + 97 + + + + + 98 + + + + + 99 + @@ -488,36 +658,54 @@ - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - + + + + + + + - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 80 + 101 @@ -533,27 +721,35 @@ ViewController UIViewController - showSecondView: + onSave: id - showSecondView: + onSave: - showSecondView: + onSave: id - - mainTextView - UITextView - - - mainTextView - + + UITextView + UIButton + UILabel + + + mainTextView UITextView - + + saveButton + UIButton + + + swipeLabel + UILabel + + IBProjectSource ./Classes/ViewController.h