diff --git a/Trovebox/Constants.h b/Trovebox/Constants.h index efb3735..cb73dba 100644 --- 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 index 8cca5ed..260606b 100644 --- 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 new file mode 100644 index 0000000..9ab0558 --- /dev/null +++ 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" : "menu-friends-selected@2x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..dc4fda1 Binary files /dev/null and b/Trovebox/Images.xcassets/menu-friends-selected.imageset/menu-friends-selected.png differ diff --git a/Trovebox/Images.xcassets/menu-friends-selected.imageset/menu-friends-selected@2x.png b/Trovebox/Images.xcassets/menu-friends-selected.imageset/menu-friends-selected@2x.png new file mode 100644 index 0000000..94e6231 Binary files /dev/null and b/Trovebox/Images.xcassets/menu-friends-selected.imageset/menu-friends-selected@2x.png differ diff --git a/Trovebox/Images.xcassets/menu-friends.imageset/112-group.png b/Trovebox/Images.xcassets/menu-friends.imageset/112-group.png new file mode 100644 index 0000000..4d96a32 Binary files /dev/null and b/Trovebox/Images.xcassets/menu-friends.imageset/112-group.png differ diff --git a/Trovebox/Images.xcassets/menu-friends.imageset/112-group@2x.png b/Trovebox/Images.xcassets/menu-friends.imageset/112-group@2x.png new file mode 100644 index 0000000..1be8258 Binary files /dev/null and b/Trovebox/Images.xcassets/menu-friends.imageset/112-group@2x.png differ diff --git a/Trovebox/Images.xcassets/menu-friends.imageset/Contents.json b/Trovebox/Images.xcassets/menu-friends.imageset/Contents.json new file mode 100644 index 0000000..44be168 --- /dev/null +++ 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" : "112-group@2x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Trovebox/JobUploaderController.m b/Trovebox/JobUploaderController.m index 78a74b7..85bdfbd 100644 --- 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 index e00a654..8ba6eb6 100644 --- 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) ){