added images for menu friends

photo · May 3, 2014 · 08b0b25 · 08b0b25
1 parent ee5cbd9
commit 08b0b25
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 10 deletions.
diff --git a/Trovebox/Constants.h b/Trovebox/Constants.h
@@ -76,13 +76,13 @@ extern NSString * const kAccountDetailsPermission;
 #define GOOGLE_ANALYTICS_ENABLED
 
 // a lot of logs, don't use in production env.
-//#define DEVELOPMENT_ENABLED
+#define DEVELOPMENT_ENABLED
 
 // log the return information from the server
-//#define DEVELOPMENT_ENABLED_JSON_RETURN
+#define DEVELOPMENT_ENABLED_JSON_RETURN
 
 // if set developer can have credentials printed in the console
-//#define DEVELOPMENT_CREDENTIALS_LOG_ENABLED
+#define DEVELOPMENT_CREDENTIALS_LOG_ENABLED
 
 // to transform color from hex to RBG
 //RGB color macro

diff --git a/Trovebox/FriendDetailsViewController.m b/Trovebox/FriendDetailsViewController.m
@@ -194,10 +194,14 @@ - (void)viewDidUnload {
 }
 
 - (IBAction)showPhotos:(id)sender {
-
+#ifdef DEVELOPMENT_ENABLED
+    NSLog(@"Show photos");
+#endif
 }
 
 - (IBAction)showAlbums:(id)sender {
-
+#ifdef DEVELOPMENT_ENABLED
+    NSLog(@"Show albums");
+#endif
 }
 @end
diff --git a/Trovebox/Images.xcassets/menu-friends-selected.imageset/Contents.json b/Trovebox/Images.xcassets/menu-friends-selected.imageset/Contents.json
@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "menu-friends-selected.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "[email protected]"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Trovebox/Images.xcassets/menu-friends-selected.imageset/menu-friends-selected.png b/Trovebox/Images.xcassets/menu-friends-selected.imageset/menu-friends-selected.png
diff --git a/...box/Images.xcassets/menu-friends-selected.imageset/[email protected] b/...box/Images.xcassets/menu-friends-selected.imageset/[email protected]
diff --git a/Trovebox/Images.xcassets/menu-friends.imageset/112-group.png b/Trovebox/Images.xcassets/menu-friends.imageset/112-group.png
diff --git a/Trovebox/Images.xcassets/menu-friends.imageset/[email protected] b/Trovebox/Images.xcassets/menu-friends.imageset/[email protected]
diff --git a/Trovebox/Images.xcassets/menu-friends.imageset/Contents.json b/Trovebox/Images.xcassets/menu-friends.imageset/Contents.json
@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "112-group.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "[email protected]"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Trovebox/JobUploaderController.m b/Trovebox/JobUploaderController.m
@@ -155,10 +155,6 @@ -(void)loadPhotosToDatabase:(ALAssetsGroup *) group {
     __block int assetsNotUploaded = 0;
 
     @autoreleasepool {
-#ifdef DEVELOPMENT_ENABLED
-        NSLog(@"numberOfAssets %i", assetsNumber);
-#endif
-
         [group enumerateAssetsUsingBlock:^(ALAsset *result, NSUInteger index, BOOL *stop)
          {
              if(result == nil)

diff --git a/Trovebox/MenuViewController.m b/Trovebox/MenuViewController.m
@@ -175,7 +175,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         return cell;
     }else if ( (row ==  6 && !groupUser) || (row == 5 && groupUser) ){
         // Friends
-        MenuTableViewCell *cell = [self getDefaultUITableViewCell:tableView image:@"menu-upload.png" imageSelected:@"menu-upload-selected.png"];
+        MenuTableViewCell *cell = [self getDefaultUITableViewCell:tableView image:@"menu-friends.png" imageSelected:@"menu-friends-selected.png"];
         cell.label.text = NSLocalizedString(@"Friends", @"Menu - title for Friends");
         return cell;
     }else if ( (row ==  7 && !groupUser) || (row == 6 && groupUser) ){