#163

iOSClient/CCStandardImages.h

@@ -32,12 +32,14 @@
 #define image_actionSheetFavorite               @"actionSheetFavorite"
 #define image_actionSheetLocal                  @"localStorage"
 #define image_actionSheetRemoveLocal            @"actionSheetRemoveLocal"
-#define image_activeCameraUpload                @"activeCameraUpload"
 #define image_avatar                            @"avatar"
 
 #define image_bkfull                            @"bkfull"
 #define image_bkempty                           @"bkempty"
 
+#define image_buttonBlu                         @"buttonBlu"
+#define image_buttonWhite                       @"buttonWhite"
+
 #define image_checked                           @"checked"
 
 #define image_decryptedSelectedFiles            @"decryptedSelectedFiles"

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

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

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

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

iOSClient/Main/CCDetail.m

@@ -530,8 +530,7 @@
                         
                     } else {
                         
-                        NSURL *url = [[NSBundle mainBundle] URLForResource:@"loading" withExtension:@"gif"];
-                        [self.photos replaceObjectAtIndex:index withObject:[MWPhoto photoWithImage:[UIImage animatedImageWithAnimatedGIFURL:url]]];
+                        [self.photos replaceObjectAtIndex:index withObject:[MWPhoto photoWithImage:[CCUtility drawText:[NSLocalizedString(@"_loading_", nil) stringByAppendingString:@"..."] inImage:[UIImage imageNamed:image_buttonWhite] colorText:[UIColor lightGrayColor]]]];
                     }
                 }
             }
@@ -560,8 +559,7 @@
                         
                     } else {
                         
-                        NSURL *url = [[NSBundle mainBundle] URLForResource:@"loading" withExtension:@"gif"];
-                        [self.photos replaceObjectAtIndex:index withObject:[MWPhoto photoWithImage:[UIImage animatedImageWithAnimatedGIFURL:url]]];
+                        [self.photos replaceObjectAtIndex:index withObject:[MWPhoto photoWithImage:[CCUtility drawText:[NSLocalizedString(@"_loading_", nil) stringByAppendingString:@"..."] inImage:[UIImage imageNamed:image_buttonWhite] colorText:[UIColor lightGrayColor]]]];
                     }
                 }
             }
@@ -730,7 +728,7 @@
 - (void)downloadPhotoBrowserFailure:(NSInteger)errorCode
 {
     [app messageNotification:@"_download_selected_files_" description:@"_error_download_photobrowser_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
-    
+
     [self.photoBrowser reloadData];
 }
 

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -304,10 +304,7 @@
 {
     if ([CCCoreData getCameraUploadActiveAccount:app.activeAccount] == NO) {
     
-        UIImage *imageButton = [UIImage imageNamed:image_activeCameraUpload];
-        UIImage *image = [CCUtility drawText:NSLocalizedString(@"_activate_camera_upload_", nil) inImage:imageButton];
-        
-        return image;
+        return [CCUtility drawText:NSLocalizedString(@"_activate_camera_upload_", nil) inImage:[UIImage imageNamed:image_buttonBlu] colorText:[UIColor whiteColor]];        
         
     } else return nil;
 }

iOSClient/Utility/CCUtility.h

@@ -188,7 +188,7 @@
 + (NSDate *)datetimeWithOutTime:(NSDate *)datDate;
 + (NSDate *)datetimeWithOutDate:(NSDate *)datDate;
 + (BOOL)isValidEmail:(NSString *)checkString;
-+ (UIImage*)drawText:(NSString*)text inImage:(UIImage*)image;
++ (UIImage*)drawText:(NSString*)text inImage:(UIImage*)image colorText:(UIColor *)colorText;
 + (NSString *)URLEncodeStringFromString:(NSString *)string;
 
 @end

iOSClient/Utility/CCUtility.m

@@ -1251,9 +1251,9 @@
     return [emailTest evaluateWithObject:checkString];
 }
 
-+ (UIImage*)drawText:(NSString*)text inImage:(UIImage*)image
++ (UIImage*)drawText:(NSString*)text inImage:(UIImage*)image colorText:(UIColor *)colorText
 {
-    NSDictionary* attributes = @{NSFontAttributeName: [UIFont systemFontOfSize:26], NSForegroundColorAttributeName:[UIColor whiteColor]};
+    NSDictionary* attributes = @{NSFontAttributeName: [UIFont systemFontOfSize:26], NSForegroundColorAttributeName:colorText};
     NSAttributedString* attributedString = [[NSAttributedString alloc] initWithString:text attributes:attributes];
     
     int x = image.size.width/2 - attributedString.size.width/2;