update button activate camera upload for retina (2x)

iOSClient/Images.xcassets/activeCameraUpload.imageset/Contents.json

@@ -2,11 +2,11 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "activeCameraUpload.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "activeCameraUpload@2x.png",
       "scale" : "2x"
     },
     {

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -309,15 +309,8 @@
 {
     if ([CCCoreData getCameraUploadActiveAccount:app.activeAccount] == NO) {
     
-        /*
-        NSString *language = [[[NSBundle mainBundle] preferredLocalizations] objectAtIndex:0];
-    
-        if ([language isEqualToString:@"it"]) return [UIImage imageNamed:image_activeCameraUpload_it];
-        else return [UIImage imageNamed:image_activeCameraUpload_en];
-        */
         UIImage *imageButton = [UIImage imageNamed:image_activeCameraUpload];
         UIImage *image = [CCUtility drawText:NSLocalizedString(@"_activate_camera_upload_", nil) inImage:imageButton];
-        image = [UIImage imageWithCGImage:image.CGImage scale:2 orientation:UIImageOrientationUp];
         
         return image;
         

iOSClient/Utility/CCUtility.m

@@ -1263,18 +1263,21 @@
 
 + (UIImage*)drawText:(NSString*)text inImage:(UIImage*)image
 {
-    NSDictionary* attributes = @{NSFontAttributeName: [UIFont systemFontOfSize:14], NSForegroundColorAttributeName:[UIColor whiteColor]};
+    NSDictionary* attributes = @{NSFontAttributeName: [UIFont systemFontOfSize:26], NSForegroundColorAttributeName:[UIColor whiteColor]};
     NSAttributedString* attributedString = [[NSAttributedString alloc] initWithString:text attributes:attributes];
     
     int x = image.size.width/2 - attributedString.size.width/2;
-    int y = image.size.height/2-8;
+    int y = image.size.height/2 - attributedString.size.height/2;
     
     UIGraphicsBeginImageContext(image.size);
+    
     [image drawInRect:CGRectMake(0,0,image.size.width,image.size.height)];
     CGRect rect = CGRectMake(x, y, image.size.width, image.size.height);
     [[UIColor whiteColor] set];
     [text drawInRect:CGRectIntegral(rect) withAttributes:attributes];
     UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
+    newImage = [UIImage imageWithCGImage:newImage.CGImage scale:2 orientation:UIImageOrientationUp];
+
     UIGraphicsEndImageContext();
     
     return newImage;