new button Photos

iOSClient/CCStandardImages.h

@@ -31,8 +31,7 @@
 #define image_actionSheetOffline                @"actionSheetOffline"
 #define image_actionSheetFavorite               @"actionSheetFavorite"
 #define image_actionSheetLocal                  @"localStorage"
-#define image_activeCameraUpload_en             @"activeCameraUpload_en"
-#define image_activeCameraUpload_it             @"activeCameraUpload_it"
+#define image_activeCameraUpload                @"activeCameraUpload"
 #define image_attention                         @"attention"
 #define image_audio                             @"audio"
 #define image_audiocrypto                       @"audiocrypto"

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

@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "activeCameraUploadNextcloud_en.png"
+      "filename" : "activeCameraUpload.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "activeCameraUploadNextcloud_en@2x.png",
+      "filename" : "activeCameraUpload@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "activeCameraUploadNextcloud_en@3x.png"
+      "filename" : "activeCameraUpload@3x.png",
+      "scale" : "3x"
     }
   ],
   "info" : {

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

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "activeCameraUploadNextcloud_it.png"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "activeCameraUploadNextcloud_it@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "activeCameraUploadNextcloud_it@3x.png"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -309,11 +309,17 @@
 {
     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 atPoint:CGPointMake(0, imageButton.size.height/2-8)];
+        
+        return image;
+        
     } else return nil;
 }
 

iOSClient/Utility/CCUtility.h

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

iOSClient/Utility/CCUtility.m

@@ -1243,4 +1243,17 @@
     return [emailTest evaluateWithObject:checkString];
 }
 
++ (UIImage*)drawText:(NSString*)text inImage:(UIImage*)image atPoint:(CGPoint)point
+{    
+    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);
+    [[UIColor whiteColor] set];
+    [text drawInRect:CGRectIntegral(rect) withAttributes:@{NSFontAttributeName: [UIFont boldSystemFontOfSize:12], NSForegroundColorAttributeName:[UIColor whiteColor]}];
+    UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    
+    return newImage;
+}
+
 @end

iOSClient/en.lproj/Localizable.strings

@@ -238,6 +238,7 @@
 "_tutorial_photo_view_"                     = "No photos or videos loaded";
 "_create_full_upload_"                      = "Creating archive .. may take a long time, please wait";
 "_error_createsubfolders_upload_"           = "Error creating subfolders";
+"_activate_camera_upload_"                  = "Activate camera upload";
 
 // Template