design updates #1

Muhit/AppDelegate.m

@@ -11,14 +11,14 @@
 #import "NavBar.h"
 #import <Fabric/Fabric.h>
 #import <Crashlytics/Crashlytics.h>
+#import "FacebookManager.h"
 
 #define ALERT_PUSH_NOTIFICATION 10
 
 @interface AppDelegate (){
     NSDictionary *pushNotification;
     BOOL isRegisteredPush;
 }
-
 @end
 
 @implementation AppDelegate
@@ -36,7 +36,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [[UITextView appearance] setTintColor:CLR_DARK_BLUE];
 
     //    [MT setServiceURL:@"http://muhit.co"];//Production
-    [MT setServiceURL:@"http://muhit.co"];//Sandbox
+    [MT setServiceURL:@"http://stage.muhit.co"];//Sandbox
 
     if ([UD objectForKey:UD_ACCESS_TOKEN]) {
         [UF isAccessTokenValid];
@@ -52,6 +52,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
         [self showPushNotificationPopup];
     }
 
+    [[FBSDKApplicationDelegate sharedInstance] application:application
+                             didFinishLaunchingWithOptions:launchOptions];
+
     return YES;
 }
 
@@ -64,7 +67,17 @@ - (void)applicationDidEnterBackground:(UIApplication *)application {
 - (void)applicationWillEnterForeground:(UIApplication *)application {
 }
 
+- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation {
+
+    //Facebook
+    if([url.absoluteString rangeOfString:@"fb"].location != NSNotFound) {
+        return [[FBSDKApplicationDelegate sharedInstance] application:application openURL:url sourceApplication:sourceApplication annotation:annotation];
+    }
+    return NO;
+}
+
 - (void)applicationDidBecomeActive:(UIApplication *)application {
+    [FBSDKAppEvents activateApp];
 }
 
 - (void)applicationWillTerminate:(UIApplication *)application {

Muhit/Classes/Constants.h

@@ -40,8 +40,8 @@ static const CGFloat cornerRadius = 6;
 #define isNotNull(variable) variable == [NSNull null] ? NO : (variable ? YES : NO)
 #define nilOrJson(VAL) [VAL isKindOfClass:[NSNull class]] ? nil : VAL
 
-#define CLR_LIGHT_BLUE [HXColor hx_colorWithHexRGBAString:@"44a2e0"]
-#define CLR_DARK_BLUE [HXColor hx_colorWithHexRGBAString:@"245573"]
+#define CLR_LIGHT_BLUE [HXColor hx_colorWithHexRGBAString:@"44A1E0"]
+#define CLR_DARK_BLUE [HXColor hx_colorWithHexRGBAString:@"245672"]
 #define CLR_DARK_PUPRPLE [HXColor hx_colorWithHexRGBAString:@"666677"]
 #define CLR_WHITE [HXColor hx_colorWithHexRGBAString:@"FFFFFF"]
 

Muhit/Classes/NavBar.m

@@ -23,9 +23,13 @@ - (id)initWithFrame:(CGRect)frame
                                                                 }];
         [self setTintColor:[UIColor whiteColor]];
         [self setTintAdjustmentMode:UIViewTintAdjustmentModeAutomatic];
-        [self setBackIndicatorImage:[UIImage imageNamed:@"back"]];
-        [self setBackIndicatorTransitionMaskImage:[UIImage imageNamed:@"back"]];
-
+        [self setBackIndicatorImage:[UIImage imageNamed:@"navigation-back"]];
+        [self setBackIndicatorTransitionMaskImage:[UIImage imageNamed:@"navigation-back"]];
+        [[UINavigationBar appearance] setShadowImage:[UIImage new]];
+        [[UINavigationBar appearance] setBackgroundImage:[UIImage new]
+                                          forBarPosition:UIBarPositionAny
+                                              barMetrics:UIBarMetricsDefault];
+
     }
     return self;
 }

Muhit/Classes/UtilityFunctions.h

@@ -88,7 +88,6 @@ typedef enum{
                             surname:(NSString*)surname
                               email:(NSString*)email
                            password:(NSString*)password
-                         rePassword:(NSString*)rePassword
                     isFacebookLogin:(BOOL)isFacebookLogin;
 
 + (BOOL)validateLoginWithEmail:(NSString*)email password:(NSString*)password;
@@ -98,4 +97,7 @@ typedef enum{
 
 +(void)setUserDefaultsWithDetails:(NSDictionary*)details;
 
++(NSString*)urlEscapeString:(NSString *)unencodedString;
++(NSString*)addQueryStringToUrlString:(NSString *)urlString withDictionary:(NSDictionary *)dictionary;
+
 @end

Muhit/Classes/UtilityFunctions.m

@@ -234,9 +234,9 @@ +(void)setViewToSupersBottom:(UIView*)view{
     UIView *superview = [view superview];
 
     [view setFrame:CGRectMake(0,
-                             superview.frame.origin.y + superview.frame.size.height - view.frame.size.height,
-                             view.frame.size.width,
-                             view.frame.size.height)
+                              superview.frame.origin.y + superview.frame.size.height - view.frame.size.height,
+                              view.frame.size.width,
+                              view.frame.size.height)
      ];
 }
 
@@ -449,16 +449,16 @@ +(NSString*)getTimeFromDateTime:(NSString*)d{
 }
 
 +(NSString*)getMeanTime:(NSString*)d {
-
+    
     NSDateFormatter *f = [[NSDateFormatter alloc] init];
     [f setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
-
+    
     NSDate *date = [f dateFromString:d];
-
+    
     [f setLocale:[NSLocale localeWithLocaleIdentifier:@"tr"]];
     [f setDateStyle:NSDateFormatterMediumStyle];
     [f setTimeStyle:NSDateFormatterShortStyle];
-
+    
     return  [f stringFromDate:date];
 }
 
@@ -598,7 +598,7 @@ + (void)removeHud{
 }
 
 + (void)removeHudAfterDelay{
-	[[MT HUD] removeFromSuperview];
+    [[MT HUD] removeFromSuperview];
 }
 
 + (void)addHudTop{
@@ -609,18 +609,18 @@ + (void)showAlertWithMessageOnly:(NSString*)message {
     [[[UIAlertView alloc] initWithTitle: @""
                                 message: message
                                delegate: nil
-                      cancelButtonTitle: LocalizedString(@"Tamam")
+                      cancelButtonTitle: LocalizedString(@"ok")
                       otherButtonTitles: nil] show];
 }
 
 + (void)showAlertWithMessage: (NSString*)message
                          tag: (int)tag
                     delegate: (id)delegate {
-
+    
     UIAlertView *alert =  [[UIAlertView alloc] initWithTitle: @""
                                                      message: message
                                                     delegate: delegate
-                                           cancelButtonTitle: LocalizedString(@"Tamam")
+                                           cancelButtonTitle: LocalizedString(@"ok")
                                            otherButtonTitles: nil];
     [alert setTag: tag];
     [alert show];
@@ -701,7 +701,7 @@ + (NSDictionary*)parseURLParams:(NSString *)query {
 }
 
 + (UIImage *)croppIngimageByImageName:(UIImage *)imageToCrop toRect:(CGRect)rect{
-
+    
     CGImageRef imageRef = CGImageCreateWithImageInRect([imageToCrop CGImage], rect);
     UIImage *cropped = [UIImage imageWithCGImage:imageRef];
     CGImageRelease(imageRef);
@@ -769,7 +769,6 @@ + (BOOL)validateSignUpInputWithName:(NSString*)name
                             surname:(NSString*)surname
                               email:(NSString*)email
                            password:(NSString*)password
-                         rePassword:(NSString*)rePassword
                     isFacebookLogin:(BOOL)isFacebookLogin{
 
     NSMutableArray *messages = [NSMutableArray array];
@@ -792,7 +791,7 @@ + (BOOL)validateSignUpInputWithName:(NSString*)name
         UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@""
                                                         message:[messages componentsJoinedByString:@"\n"]
                                                        delegate:nil
-                                              cancelButtonTitle:LocalizedString(@"Tamam")
+                                              cancelButtonTitle:LocalizedString(@"ok")
                                               otherButtonTitles:nil];
         [alert show];
         return NO;
@@ -804,7 +803,7 @@ + (BOOL)validateSignUpInputWithName:(NSString*)name
 + (BOOL)validateLoginWithEmail:(NSString*)email password:(NSString*)password{
 
     NSMutableArray *messages = [NSMutableArray array];
-
+    
     if (password && [password length] < 4) {
         [messages addObject:LocalizedString(@"Şifreniz en az 4 haneli olmalıdır")];
     }
@@ -819,7 +818,7 @@ + (BOOL)validateLoginWithEmail:(NSString*)email password:(NSString*)password{
         UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@""
                                                         message:[messages componentsJoinedByString:@"\n"]
                                                        delegate:nil
-                                              cancelButtonTitle:LocalizedString(@"Tamam")
+                                              cancelButtonTitle:LocalizedString(@"ok")
                                               otherButtonTitles:nil];
         [alert show];
         return NO;
@@ -844,7 +843,7 @@ + (NSDictionary *)parsePlaces:(GMSAutocompletePrediction *)address{
 
     NSArray * arrTexts = [address.attributedFullText.string componentsSeparatedByString:@", "];
     NSUInteger index = [address.types indexOfObject:@"administrative_area_level_4"];
-
+    
     NSString *detail=@"";
     for (NSString *str in arrTexts) {
         if (![str isEqualToString:arrTexts[index]]) {
@@ -875,10 +874,34 @@ +(void)setUserDefaultsWithDetails:(NSDictionary*)details{
         [UD setObject:nil forKey:UD_HOOD_ID];
     }
     else{
-    	[UD setObject:details[USER][@"active_hood"] forKey:UD_HOOD_ID];
+        [UD setObject:details[USER][@"active_hood"] forKey:UD_HOOD_ID];
     }
 }
 
++(NSString*)urlEscapeString:(NSString *)unencodedString
+{
+    CFStringRef originalStringRef = (__bridge_retained CFStringRef)unencodedString;
+    NSString *s = (__bridge_transfer NSString *)CFURLCreateStringByAddingPercentEscapes(NULL,originalStringRef, NULL, NULL,kCFStringEncodingUTF8);
+    CFRelease(originalStringRef);
+    return s;
+}
+
 
++(NSString*)addQueryStringToUrlString:(NSString *)urlString withDictionary:(NSDictionary *)dictionary
+{
+    NSMutableString *urlWithQuerystring = [[NSMutableString alloc] initWithString:urlString];
+
+    for (id key in dictionary) {
+        NSString *keyString = [key description];
+        NSString *valueString = [[dictionary objectForKey:key] description];
+
+        if ([urlWithQuerystring rangeOfString:@"?"].location == NSNotFound) {
+            [urlWithQuerystring appendFormat:@"?%@=%@", [self urlEscapeString:keyString], [self urlEscapeString:valueString]];
+        } else {
+            [urlWithQuerystring appendFormat:@"&%@=%@", [self urlEscapeString:keyString], [self urlEscapeString:valueString]];
+        }
+    }
+    return urlWithQuerystring;
+}
 
 @end

Muhit/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -71,6 +71,11 @@
       "idiom" : "ipad",
       "filename" : "app-icon-152x152.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
     }
   ],
   "info" : {

Muhit/Images.xcassets/checkbox-off.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "checkbox-off.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Muhit/Images.xcassets/checkbox-on.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "checkbox-on.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Muhit/Images.xcassets/logo-medium.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "logo-medium.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Muhit/Images.xcassets/navigation-back.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "navigation-back.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}