merging master with cleanup2

vidriloco · May 4, 2012 · ea29f57 · ea29f57
2 parents 0eb71be + d491de2
commit ea29f57
Show file tree

Hide file tree

Showing 484 changed files with 8,210 additions and 17,342 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Default-Landscape~ipad.png b/Default-Landscape~ipad.png
diff --git a/Humalog.xcodeproj/project.pbxproj b/Humalog.xcodeproj/project.pbxproj
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...proj/project.xcworkspace/xcuserdata/stoicdavid.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/stoicdavid.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Humalog.xcodeproj/xcuserdata/admin.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/Humalog.xcodeproj/xcuserdata/admin.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
@@ -2,19 +2,4 @@
 <Bucket
    type = "1"
    version = "1.0">
-   <FileBreakpoints>
-      <FileBreakpoint
-         shouldBeEnabled = "Yes"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         filePath = "Humalog/Views/AnnotationView.m"
-         timestampString = "357112043.794263"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "213"
-         endingLineNumber = "213"
-         landmarkName = "-touchesBegan:withEvent:"
-         landmarkType = "5">
-      </FileBreakpoint>
-   </FileBreakpoints>
 </Bucket>
diff --git a/Humalog/Resources/slides/slide1/.DS_Store → Humalog/.DS_Store b/Humalog/Resources/slides/slide1/.DS_Store → Humalog/.DS_Store
diff --git a/Humalog/AppDelegate.h b/Humalog/AppDelegate.h
@@ -7,9 +7,11 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "DownloadControlDelegate.h"
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
+@interface AppDelegate : UIResponder <UIApplicationDelegate,DownloadControlDelegate>
 
 @property (strong, nonatomic) UIWindow *window;
 
+
 @end
diff --git a/Humalog/AppDelegate.m b/Humalog/AppDelegate.m
@@ -8,25 +8,131 @@
 
 #import "AppDelegate.h"
 #import "MasterController.h"
+#import "Downloader.h"
+#import "Brand.h"
+#import "SplashscreenViewController.h"
+#import "GANTracker.h"
+
+static const NSInteger kGANDispatchPeriodSec = 10;
+
+@interface AppDelegate() {
+    SplashscreenViewController *splashController;
+    Downloader                 *download;
+    BOOL                        flag;
+    BOOL                        flag2;
+}
+@end
 
 @implementation AppDelegate
 
 @synthesize window = _window;
 
+- (void)loadMasterController
+{
+    [self.window setRootViewController:[[MasterController alloc] init]];  
+}
+
+- (void)settingsChanged:(NSNotification *)paramNotification
+{
+    NSLog(@"Settings changed");
+    NSLog(@"Notification Object = %@", [paramNotification object]);
+}
+
+- (void)setDefaults
+{
+
+    [[NSNotificationCenter defaultCenter] addObserver:self 
+                                             selector:@selector(settingsChanged:) 
+                                                 name:NSUserDefaultsDidChangeNotification 
+                                               object:nil];
+
+    if (![[NSUserDefaults standardUserDefaults] stringForKey:@"brand_preference"]) {
+
+        NSString  *mainBundlePath = [[NSBundle mainBundle] bundlePath];
+        NSString  *settingsPropertyListPath = [mainBundlePath
+                                               stringByAppendingPathComponent:@"Settings.bundle/Root.plist"];
+
+        NSDictionary *settingsPropertyList = [NSDictionary 
+                                              dictionaryWithContentsOfFile:settingsPropertyListPath];
+
+        NSMutableArray      *preferenceArray = [settingsPropertyList objectForKey:@"PreferenceSpecifiers"];
+        NSMutableDictionary *registerableDictionary = [NSMutableDictionary dictionary];
+
+        for (int i = 0; i < [preferenceArray count]; ++i)  { 
+            NSString  *key = [[preferenceArray objectAtIndex:i] objectForKey:@"Key"];
+
+            if (key)  {
+                id  value = [[preferenceArray objectAtIndex:i] objectForKey:@"DefaultValue"];
+                [registerableDictionary setObject:value forKey:key];
+            }
+        }
+
+        [[NSUserDefaults standardUserDefaults] registerDefaults:registerableDictionary]; 
+        [[NSUserDefaults standardUserDefaults] synchronize]; 
+    }
+}
+
+- (void)downloadContent
+{
+    flag  = [[NSUserDefaults standardUserDefaults] boolForKey:@"update_interface_preference"];
+    flag2 = [[NSUserDefaults standardUserDefaults] boolForKey:@"update_slides_preference"];
+
+    if (flag || flag2) {
+        NSString *brandId = [[NSUserDefaults standardUserDefaults] stringForKey:@"brand_preference"];  
+        download = [[Downloader alloc] init];
+        download.delegate = self;
+        [download parseJSON:brandId];
+
+        NSUserDefaults *defaults = [[NSUserDefaults alloc] init];
+        [defaults setBool:NO forKey:@"update_interface_preference"];
+        [defaults setBool:NO forKey:@"update_slides_preference"];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+    }
+
+    // Updates the singleton
+    [Brand updateElementsFromDefaults];
+}
+
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+    [[GANTracker sharedTracker] startTrackerWithAccountID:@"UA-31202291-1"
+                                           dispatchPeriod:kGANDispatchPeriodSec
+                                                 delegate:nil];
+
+    NSError *error;
+    if (![[GANTracker sharedTracker] setCustomVariableAtIndex:1
+                                                         name:@"iPad3"
+                                                        value:@"ip1"
+                                                    withError:&error]) {
+        // Handle error here
+    }
+
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     // Override point for customization after application launch.
-    self.window.backgroundColor = [UIColor blackColor];
+    splashController = [[SplashscreenViewController alloc] init];
+    [self.window setRootViewController:splashController];
+    [self.window makeKeyAndVisible];
 
-    // Instance the master controller
-    UIViewController *masterController = [[MasterController alloc] init];
-    [self.window setRootViewController:masterController];
+    [self setDefaults];
+    [self downloadContent];
 
-    [self.window makeKeyAndVisible];
+    // Instance the master controller
+    if (!(flag && flag2))
+        [self loadMasterController];
+
     return YES;
 }
 
+- (void)downloaderDidFinish
+{
+    [self loadMasterController];
+}
+
+- (void)downloaderIsDownloading
+{
+    splashController.progress.progress = download.advance;
+}
+
 - (void)applicationWillResignActive:(UIApplication *)application
 {
     /*
@@ -64,6 +170,8 @@ - (void)applicationWillTerminate:(UIApplication *)application
      Save data if appropriate.
      See also applicationDidEnterBackground:.
      */
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    [[GANTracker sharedTracker] stopTracker];
 }
 
 @end
diff --git a/Humalog/Controllers/SlideController.h → Humalog/Controllers/ContentController.h b/Humalog/Controllers/SlideController.h → Humalog/Controllers/ContentController.h
@@ -12,6 +12,6 @@
 #import "InterfaceControlDelegate.h"
 #import "SlideProvider.h"
 
-@interface SlideController : UIViewController<iCarouselDataSource, iCarouselDelegate, UIGestureRecognizerDelegate, ContentDisplayDelegate, InterfaceControlDelegate>
+@interface ContentController : UIViewController<iCarouselDataSource, iCarouselDelegate, UIGestureRecognizerDelegate, ContentDisplayDelegate, InterfaceControlDelegate>
 
 @end