Browse Source

update button activate camera upload for retina (2x)

Marino Faggiana 8 years ago
parent
commit
03d5cbfe7e

+ 0 - 2
iOSClient/Images.xcassets/activeCameraUpload.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/activeCameraUpload.imageset/activeCameraUpload.png


BIN
iOSClient/Images.xcassets/activeCameraUpload.imageset/activeCameraUpload@2x.png


BIN
iOSClient/Images.xcassets/activeCameraUpload.imageset/activeCameraUpload@3x.png


+ 1 - 0
iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -317,6 +317,7 @@
         */
         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;
         

+ 1 - 1
iOSClient/Utility/CCUtility.m

@@ -1263,7 +1263,7 @@
 
 + (UIImage*)drawText:(NSString*)text inImage:(UIImage*)image
 {
-    NSDictionary* attributes = @{NSFontAttributeName: [UIFont boldSystemFontOfSize:12], NSForegroundColorAttributeName:[UIColor whiteColor]};
+    NSDictionary* attributes = @{NSFontAttributeName: [UIFont systemFontOfSize:14], NSForegroundColorAttributeName:[UIColor whiteColor]};
     NSAttributedString* attributedString = [[NSAttributedString alloc] initWithString:text attributes:attributes];
     
     int x = image.size.width/2 - attributedString.size.width/2;