Browse Source

new function

Marino Faggiana 8 years ago
parent
commit
1851e1fbd5

+ 1 - 1
iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -316,7 +316,7 @@
         else return [UIImage imageNamed:image_activeCameraUpload_en];
         */
         UIImage *imageButton = [UIImage imageNamed:image_activeCameraUpload];
-        UIImage *image = [CCUtility drawText:NSLocalizedString(@"_activate_camera_upload_", nil) inImage:imageButton atPoint:CGPointMake(0, imageButton.size.height/2-8)];
+        UIImage *image = [CCUtility drawText:NSLocalizedString(@"_activate_camera_upload_", nil) inImage:imageButton];
         
         return image;
         

+ 1 - 1
iOSClient/Utility/CCUtility.h

@@ -180,6 +180,6 @@
 + (NSDate *)datetimeWithOutTime:(NSDate *)datDate;
 + (NSDate *)datetimeWithOutDate:(NSDate *)datDate;
 + (BOOL)isValidEmail:(NSString *)checkString;
-+ (UIImage*)drawText:(NSString*)text inImage:(UIImage*)image atPoint:(CGPoint)point;
++ (UIImage*)drawText:(NSString*)text inImage:(UIImage*)image;
 
 @end

+ 10 - 4
iOSClient/Utility/CCUtility.m

@@ -1243,13 +1243,19 @@
     return [emailTest evaluateWithObject:checkString];
 }
 
-+ (UIImage*)drawText:(NSString*)text inImage:(UIImage*)image atPoint:(CGPoint)point
-{    
++ (UIImage*)drawText:(NSString*)text inImage:(UIImage*)image
+{
+    NSDictionary* attributes = @{NSFontAttributeName: [UIFont boldSystemFontOfSize:12], 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;
+    
     UIGraphicsBeginImageContext(image.size);
     [image drawInRect:CGRectMake(0,0,image.size.width,image.size.height)];
-    CGRect rect = CGRectMake(point.x, point.y, 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:@{NSFontAttributeName: [UIFont boldSystemFontOfSize:12], NSForegroundColorAttributeName:[UIColor whiteColor]}];
+    [text drawInRect:CGRectIntegral(rect) withAttributes:attributes];
     UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
     UIGraphicsEndImageContext();