Fixed transition process for new years

Author: jburns20

iHW-iOS/iHW/iHW.xcodeproj/project.xcworkspace/xcuserdata/jonathanburns.xcuserdatad/UserInterfaceState.xcuserstate

@@ -23,6 +23,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 {
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 
+    if (![IHWCurriculum yearSetManually]) [IHWCurriculum updateCurrentYear];
+    
     // Override point for customization after application launch.
     UIViewController *rootVC = nil;
     if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {

iHW-iOS/iHW/iHW/IHWAppDelegate.m

@@ -10,6 +10,7 @@
 #import "IHWCurriculum.h"
 #import "IHWAppDelegate.h"
 #import "IHWScheduleViewController.h"
+#import "IHWFirstRunViewController.h"
 
 @implementation IHWChangeYearViewController
 
@@ -145,7 +146,13 @@ - (void)viewWillDisappear:(BOOL)animated {
         [IHWCurriculum setCurrentCampus:self.selectedCampus];
         //Create a new schedule view controller
         //(this is not shown immediately -- instead, it appears behind the preferences view controller when the preferences view controller is dismissed)
-        [((IHWAppDelegate *)[[UIApplication sharedApplication] delegate]).navController setViewControllers:@[[[IHWScheduleViewController alloc] initWithNibName:@"IHWScheduleViewController" bundle:nil]] animated:NO];
+        if ([IHWCurriculum isFirstRun]) {
+            IHWFirstRunViewController *frvc = [[IHWFirstRunViewController alloc] initWithNibName:@"IHWFirstRunViewController" bundle:nil];
+            frvc.goingToStep2 = YES;
+            [((IHWAppDelegate *)[[UIApplication sharedApplication] delegate]).navController setViewControllers:@[frvc] animated:NO];
+        } else {
+            [((IHWAppDelegate *)[[UIApplication sharedApplication] delegate]).navController setViewControllers:@[[[IHWScheduleViewController alloc] initWithNibName:@"IHWScheduleViewController" bundle:nil]] animated:NO];
+        }
     }
     [super viewWillDisappear:animated];
 }

iHW-iOS/iHW/iHW/IHWChangeYearViewController.m

@@ -24,6 +24,8 @@
 + (int)currentYear;
 + (int)currentCampus;
 + (void)setCurrentYear:(int)year;
++ (void)updateCurrentYear;
++ (BOOL)yearSetManually;
 + (void)setCurrentCampus:(int)campus;
 + (BOOL)isFirstRun;
 

iHW-iOS/iHW/iHW/IHWCurriculum.h

@@ -61,6 +61,16 @@ + (int)currentCampus {
 
 + (void)setCurrentYear:(int)year {
     [[NSUserDefaults standardUserDefaults] setInteger:year forKey:@"currentYear"];
+    [[NSUserDefaults standardUserDefaults] setInteger:[[IHWDate today] dateByAddingDays:-365/2].year forKey:@"manualYear"];
+}
+
++ (void)updateCurrentYear {
+    [[NSUserDefaults standardUserDefaults] setInteger:[[IHWDate today] dateByAddingDays:-365/2].year forKey:@"currentYear"];
+    [[NSUserDefaults standardUserDefaults] setInteger:0 forKey:@"manualYear"];
+}
+
++ (BOOL)yearSetManually {
+    return ([[NSUserDefaults standardUserDefaults] integerForKey:@"manualYear"] == [[IHWDate today] dateByAddingDays:-365/2].year);
 }
 
 + (void)setCurrentCampus:(int)campus {

iHW-iOS/iHW/iHW/IHWCurriculum.m

@@ -18,5 +18,8 @@
 @property (weak, nonatomic) IBOutlet UIButton *manualButton;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *topSpaceConstraint;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *topSpaceConstraint2;
+@property BOOL goingToStep2;
+
+- (void)gotoStep2;
 
 @end

iHW-iOS/iHW/iHW/IHWFirstRunViewController.h

@@ -12,6 +12,8 @@
 #import "IHWDownloadScheduleViewController.h"
 #import "IHWGuidedCoursesViewController.h"
 #import "IHWDate.h"
+#import "IHWPreferencesViewController.h"
+#import "IHWChangeYearViewController.h"
 
 @interface IHWFirstRunViewController ()
 
@@ -24,7 +26,7 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
     if (self) {
-        [IHWCurriculum setCurrentYear:[[IHWDate today] dateByAddingDays:-365/2].year];
+        //[IHWCurriculum setCurrentYear:[[IHWDate today] dateByAddingDays:-365/2].year];
     }
     return self;
 }
@@ -39,6 +41,7 @@ - (void)viewDidLoad {
         self.topSpaceConstraint.constant = 20;
         self.topSpaceConstraint2.constant = 5;
     }
+    if (self.goingToStep2) [self gotoStep2];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -48,17 +51,17 @@ - (void)viewWillAppear:(BOOL)animated {
 
 - (IBAction)middleSchoolClicked:(id)sender {
     [IHWCurriculum setCurrentCampus:CAMPUS_MIDDLE];
-    [[IHWCurriculum currentCurriculum].curriculumLoadingListeners addObject:self];
     [self gotoStep2];
 }
 
 - (IBAction)upperSchoolClicked:(id)sender {
     [IHWCurriculum setCurrentCampus:CAMPUS_UPPER];
-    [[IHWCurriculum currentCurriculum].curriculumLoadingListeners addObject:self];
     [self gotoStep2];
 }
 
 - (void)gotoStep2 {
+    NSLog(@"Going to Step 2");
+    [[IHWCurriculum currentCurriculum].curriculumLoadingListeners addObject:self];
     self.downloadButton.hidden = NO;
     self.manualButton.hidden = NO;
     self.backButton.hidden = NO;
@@ -103,11 +106,26 @@ - (IBAction)backButtonClicked:(id)sender {
 }
 
 - (void)curriculumFailedToLoad:(IHWCurriculum *)curriculum {
-    [[[UIAlertView alloc] initWithTitle:@"Schedule Unavailable" message:@"The schedule for the campus and year you selected is not available." delegate:self cancelButtonTitle:@"Back" otherButtonTitles:nil] show];
+    [[IHWCurriculum currentCurriculum].curriculumLoadingListeners removeObject:self];
+    [[[UIAlertView alloc] initWithTitle:@"Schedule Unavailable" message:@"The schedule for the campus and year you selected is not available." delegate:self cancelButtonTitle:nil otherButtonTitles:@"Retry", @"Choose Year", nil] show];
 }
 
 - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
-    [self.navigationController setViewControllers:@[[[IHWFirstRunViewController alloc] initWithNibName:@"IHWFirstRunViewController" bundle:nil]]];
+    if (buttonIndex == 0) {
+        [[IHWCurriculum reloadCurrentCurriculum].curriculumLoadingListeners addObject:self];
+    } else {
+        UINavigationController *navc = [[UINavigationController alloc] init];
+        if (floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_6_1) {
+            navc.navigationBar.tintColor = [UIColor colorWithRed:0.6 green:0 blue:0 alpha:1];
+        } else {
+            navc.navigationBar.barTintColor = [UIColor colorWithRed:0.6 green:0 blue:0 alpha:1];
+            navc.navigationBar.tintColor = [UIColor whiteColor];
+            navc.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName:[UIColor whiteColor]};
+            navc.navigationBar.barStyle = UIBarStyleBlack;
+        }
+        navc.viewControllers = @[[[IHWPreferencesViewController alloc] initWithStyle:UITableViewStyleGrouped], [[IHWChangeYearViewController alloc] initWithStyle:UITableViewStyleGrouped]];
+        [self presentViewController:navc animated:YES completion:nil];
+    }
 }
 
 - (void)didReceiveMemoryWarning