design changes and bug fixes, ARC, etc

cmelbye · Mar 18, 2012 · 117c112 · 117c112
1 parent c845bc7
commit 117c112
Show file tree

Hide file tree

Showing 46 changed files with 786 additions and 12,567 deletions.
diff --git a/117-todo.png b/117-todo.png
diff --git a/117-todo@2x.png b/117-todo@2x.png
diff --git a/19-gear.png b/19-gear.png
diff --git a/19-gear@2x.png b/19-gear@2x.png
diff --git a/83-calendar.png b/83-calendar.png
diff --git a/83-calendar@2x.png b/83-calendar@2x.png
diff --git a/AboutView.xib b/AboutView.xib
diff --git a/AdMobDelegateProtocol.h b/AdMobDelegateProtocol.h
diff --git a/AdMobView.h b/AdMobView.h
diff --git a/Classes/AboutViewController.h b/Classes/AboutViewController.h
@@ -7,13 +7,12 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "AdMobDelegateProtocol.h"
+#import "WebResourceViewController.h"
 
-@interface AboutViewController : UIViewController <AdMobDelegate, MFMailComposeViewControllerDelegate> {
+@interface AboutViewController : UITableViewController <MFMailComposeViewControllerDelegate> {
 
 }
 
-- (IBAction)openWebsite:(id)sender;
 - (IBAction)openSupport:(id)sender;
 
 @end
diff --git a/Classes/AboutViewController.m b/Classes/AboutViewController.m
@@ -8,67 +8,33 @@
 
 #import <MessageUI/MessageUI.h>
 #import "AboutViewController.h"
-#import "AdMobView.h"
 
 @implementation AboutViewController
 
-/*
- // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
-    if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
-        // Custom initialization
-    }
-    return self;
-}
-*/
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-
-
-}
-
-- (NSString *)publisherId {
-	return kPublisherId; // this should be prefilled; if not, get it from www.admob.com
-}
-
-- (IBAction)openWebsite:(id)sender {
-	[[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"http://charliemelbye.com/iphone-apps/gpaide/"]];
-}
-
 - (IBAction)openSupport:(id)sender {
 	if ([MFMailComposeViewController canSendMail]) {
 		MFMailComposeViewController *mail = [[MFMailComposeViewController alloc] init];
-		[mail setToRecipients:[NSArray arrayWithObject:@"me@charliemelbye.com"]];
+		[mail setToRecipients:[NSArray arrayWithObject:@"charles.melbye@gmail.com"]];
 		[mail setSubject:@"GPAide Support"];
 		[mail setMailComposeDelegate:self];
 		[self presentModalViewController:mail animated:YES];
 	} else {
-		[[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"http://charliemelbye.com/support/"]];
+		[[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"http://cmelbye.github.com/gpaide/support.html"]];
 	}
 }
 
 - (void)mailComposeController:(MFMailComposeViewController *)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error {
 	[self dismissModalViewControllerAnimated:YES];
 }
 
-- (void)didReceiveMemoryWarning {
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-
-    // Release any cached data, images, etc that aren't in use.
-}
-
-- (void)viewDidUnload {
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-
-- (void)dealloc {
-    [super dealloc];
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    if ([segue.identifier isEqualToString:@"TipsAndTricksSegue"]) {
+        WebResourceViewController *vc = segue.destinationViewController;
+        vc.webAddress = @"http://cmelbye.github.com/gpaide/tips.html";
+    } else if ([segue.identifier isEqualToString:@"AboutSegue"]) {
+        WebResourceViewController *vc = segue.destinationViewController;
+        vc.webAddress = @"http://cmelbye.github.com/gpaide/about.html";
+    }
 }
 
-
 @end
diff --git a/Classes/CoursesViewController.h b/Classes/CoursesViewController.h
@@ -7,25 +7,25 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "AdMobDelegateProtocol.h"
 
-@interface CoursesViewController : UITableViewController <UIPickerViewDataSource, UIPickerViewDelegate, UIActionSheetDelegate, UITextFieldDelegate, AdMobDelegate> {
+@interface CoursesViewController : UITableViewController <UIPickerViewDataSource, UIPickerViewDelegate, UIActionSheetDelegate, UITextFieldDelegate> {
 	NSMutableDictionary *courses;	
 	UIBarButtonItem *addButton;
 	NSArray *letterGradeArray;
 	UIAlertView *addCourseAlert;
 	UITextField *addCourseField;
 	NSInteger letterGradeSelection;
 	NSIndexPath *editingIndex;
-	AdMobView *advert;
+    UIActionSheet *editCourseSheet;
 }
 
-@property (nonatomic, retain) NSMutableDictionary *courses;
-@property (nonatomic, retain) UIBarButtonItem *addButton;
+@property (nonatomic, strong) NSMutableDictionary *courses;
+@property (nonatomic, strong) UIBarButtonItem *addButton;
 
 - (NSString *)coursesDatabasePath;
 - (void)saveCourseList;
 - (void)showCourseAlert;
 - (void)addCourse:(NSString *)courseName;
+- (void)dismissActionSheet:(id)sender;
 
 @end