new background for empty data set

Nextcloud.xcodeproj/project.pbxproj

@@ -2897,7 +2897,7 @@
 			path = Utility;
 			sourceTree = "<group>";
 		};
-		F7C00D411E2D0D0F0032160B /* Offline */ = {
+		F7C00D411E2D0D0F0032160B /* Offline - Synchronize */ = {
 			isa = PBXGroup;
 			children = (
 				F7C00D421E2D0D0F0032160B /* CCCellOffline.h */,
@@ -2910,6 +2910,7 @@
 				F7EC14791E5D9C0B0046F351 /* CCSynchronize.h */,
 				F7EC147A1E5D9C0B0046F351 /* CCSynchronize.m */,
 			);
+			name = "Offline - Synchronize";
 			path = Offline;
 			sourceTree = "<group>";
 		};
@@ -3196,7 +3197,7 @@
 				F7F9E3451BC26B19004B9223 /* Move */,
 				F74D3DB81BAC1941000BAE4B /* Networking */,
 				F7C5259A1E3B441D00FFE02C /* Notification */,
-				F7C00D411E2D0D0F0032160B /* Offline */,
+				F7C00D411E2D0D0F0032160B /* Offline - Synchronize */,
 				F7FCFFD51D70798C000E6E29 /* PeekPop */,
 				F719FDAE1CF06645004895D0 /* PhotosCameraUpload */,
 				F7BE6E2A1D2D5C3B00106933 /* QuickActions */,

iOSClient/CCImages.h

@@ -40,7 +40,7 @@
 #define image_brandNavigationController2        @"nextcloud_navigationcontroller2"
 #define image_brandNavigationController3        @"nextcloud_navigationcontroller3"
 #define image_brandNavigationControllerOffline  @"nextcloud_navigationcontroller_offline"
-#define image_brandSfondoiPad                   @"nextcloud_sfondo_iPad"
+#define image_brandBackgroundLite               @"nextcloud_lite"
 #define image_checked                           @"checkedNextcloud"
 #define image_decryptedSelectedFiles            @"decryptedSelectedFilesNextcloud"
 #define image_deleteSelectedFiles               @"deleteSelectedFilesNextcloud"

iOSClient/Main/CCDetail.m

@@ -78,7 +78,7 @@
 {
     [super viewDidLoad];
     
-    self.imageBackground.image = [UIImage imageNamed:image_brandSfondoiPad];
+    self.imageBackground.image = [UIImage imageNamed:image_brandBackgroundLite];
     
     if ([self.metadataDetail.fileName length] > 0 || [self.metadataDetail.directoryID length] > 0 || [self.metadataDetail.fileID length] > 0) {
     

iOSClient/Nextcloud.xcassets/nextcloud_sfondo_iPad.imageset/Contents.json → iOSClient/Nextcloud.xcassets/nextcloud_lite.imageset/Contents.json

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

iOSClient/Offline/CCOfflinePageContent.m

@@ -130,13 +130,13 @@
 
 - (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
 {
-    if ([self.pageType isEqualToString:k_pageOfflineOffline])
-        return [UIImage imageNamed:image_brandOffline];
+    //if ([self.pageType isEqualToString:k_pageOfflineOffline])
+    //    return [UIImage imageNamed:image_brandOffline];
     
-    if ([self.pageType isEqualToString:k_pageOfflineLocal])
-        return [UIImage imageNamed:image_brandLocal];
+    //if ([self.pageType isEqualToString:k_pageOfflineLocal])
+    return [UIImage imageNamed:image_brandBackgroundLite];
     
-    return nil;
+    //return nil;
 }
 
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
@@ -144,10 +144,10 @@
     NSString *text;
     
     if ([self.pageType isEqualToString:k_pageOfflineOffline])
-        text = NSLocalizedString(@"_no_files_uploaded_", nil);
+        text = [NSString stringWithFormat:@"\n%@", @""]; //[NSString stringWithFormat:@"\n\n%@", NSLocalizedString(@"_no_files_uploaded_", nil)];
     
     if ([self.pageType isEqualToString:k_pageOfflineLocal])
-        text = NSLocalizedString(@"_no_files_uploaded_", nil);
+        text = [NSString stringWithFormat:@"\n%@", @""];
     
     NSDictionary *attributes = @{NSFontAttributeName:[UIFont boldSystemFontOfSize:20.0f], NSForegroundColorAttributeName:COLOR_BRAND};
     
@@ -159,10 +159,10 @@
     NSString *text;
     
     if ([self.pageType isEqualToString:k_pageOfflineOffline])
-        text = NSLocalizedString(@"_tutorial_offline_view_", nil);
+        text = [NSString stringWithFormat:@"%@", NSLocalizedString(@"_tutorial_offline_view_", nil)];
         
     if ([self.pageType isEqualToString:k_pageOfflineLocal])
-        text = NSLocalizedString(@"_tutorial_local_view_", nil);
+        text = [NSString stringWithFormat:@"%@", NSLocalizedString(@"_tutorial_local_view_", nil)];
     
     NSMutableParagraphStyle *paragraph = [NSMutableParagraphStyle new];
     paragraph.lineBreakMode = NSLineBreakByWordWrapping;

iOSClient/Utility/CCUtility.m

@@ -696,7 +696,7 @@
         
         NSString *htmlMsg =[NSString stringWithFormat:@"<html><body><p>%@ : %@ , %@</p></body></html>", NSLocalizedString(@"_text1_mail_encryptpass_", nil), key, NSLocalizedString(@"_text2_mail_encryptpass_", nil)];
         
-        NSData *jpegData = UIImageJPEGRepresentation([UIImage imageNamed:image_brandSfondoiPad], 1.0);
+        NSData *jpegData = UIImageJPEGRepresentation([UIImage imageNamed:image_brandBackgroundLite], 1.0);
         [mc addAttachmentData:jpegData mimeType:@"image/jpeg" fileName:@"cryptocloud.png"];
         [mc setMessageBody:htmlMsg isHTML:YES];
         

iOSClient/en.lproj/Localizable.strings

@@ -208,9 +208,9 @@
 "_offline_"                     = "Offline";
 "_local_storage_"               = "Local storage";
 "_no_files_uploaded_"           = "No files uploaded";
-"_tutorial_favorite_view_"      = "Copy here the files that should be available offline. They will be synchronized with your cloud.";
-"_tutorial_offline_view_"       = "Copy here the files that should be available offline. They will be synchronized with your cloud.";
-"_tutorial_local_view_"         = "Copy here the files you want to have available offline, but that will no longer be synchronized with your cloud. \n\n You'll find the unpacked files from your cloud. \n\n Connect to iTunes to share these files.";
+"_tutorial_favorite_view_"      = "Copy here the files that should be available offline.\n\nThey will be synchronized with your cloud.";
+"_tutorial_offline_view_"       = "Copy here the files that should be available offline.\n\nThey will be synchronized with your cloud.";
+"_tutorial_local_view_"         = "You'll find the unpacked files from your cloud.\n\nConnect to iTunes to share these files.";
 "_more_"                        = "More";
 
 // Camera Upload