Browse Source

new background for empty data set

Marino Faggiana 8 năm trước cách đây
mục cha
commit
e6db72d99f

+ 1 - 1
Picker/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.17</string>
 	<key>CFBundleVersion</key>
-	<string>00015</string>
+	<string>00016</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

+ 1 - 1
PickerFileProvider/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.17</string>
 	<key>CFBundleVersion</key>
-	<string>00015</string>
+	<string>00016</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionFileProviderDocumentGroup</key>

+ 1 - 1
Share Ext/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>00015</string>
+	<string>00016</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

+ 1 - 1
iOSClient/Info.plist

@@ -69,7 +69,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>00015</string>
+	<string>00016</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
 	<key>ITSEncryptionExportComplianceCode</key>

+ 4 - 4
iOSClient/Offline/CCOfflinePageContent.m

@@ -144,10 +144,10 @@
     NSString *text;
     
     if ([self.pageType isEqualToString:k_pageOfflineOffline])
-        text = [NSString stringWithFormat:@"\n%@", @""]; //[NSString stringWithFormat:@"\n\n%@", NSLocalizedString(@"_no_files_uploaded_", nil)];
+        text = [NSString stringWithFormat:@"%@", @""];
     
     if ([self.pageType isEqualToString:k_pageOfflineLocal])
-        text = [NSString stringWithFormat:@"\n%@", @""];
+        text = [NSString stringWithFormat:@"%@", @""];
     
     NSDictionary *attributes = @{NSFontAttributeName:[UIFont boldSystemFontOfSize:20.0f], NSForegroundColorAttributeName:COLOR_BRAND};
     
@@ -159,10 +159,10 @@
     NSString *text;
     
     if ([self.pageType isEqualToString:k_pageOfflineOffline])
-        text = [NSString stringWithFormat:@"%@", NSLocalizedString(@"_tutorial_offline_view_", nil)];
+        text = [NSString stringWithFormat:@"\n%@", NSLocalizedString(@"_tutorial_offline_view_", nil)];
         
     if ([self.pageType isEqualToString:k_pageOfflineLocal])
-        text = [NSString stringWithFormat:@"%@", NSLocalizedString(@"_tutorial_local_view_", nil)];
+        text = [NSString stringWithFormat:@"\n%@", NSLocalizedString(@"_tutorial_local_view_", nil)];
     
     NSMutableParagraphStyle *paragraph = [NSMutableParagraphStyle new];
     paragraph.lineBreakMode = NSLineBreakByWordWrapping;

+ 9 - 6
iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -272,12 +272,12 @@
 
 - (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
 {
-    return [UIImage imageNamed:image_brandCameraUpload];
+    return [UIImage imageNamed:image_brandBackgroundLite];
 }
 
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
 {
-    NSString *text = NSLocalizedString(@"_no_photo_load_", nil);
+    NSString *text = [NSString stringWithFormat:@"%@", @""];
     
     NSDictionary *attributes = @{NSFontAttributeName:[UIFont boldSystemFontOfSize:20.0f], NSForegroundColorAttributeName:COLOR_BRAND};
     
@@ -289,13 +289,16 @@
     NSMutableParagraphStyle *paragraph = [NSMutableParagraphStyle new];
     paragraph.lineBreakMode = NSLineBreakByWordWrapping;
     paragraph.alignment = NSTextAlignmentCenter;
-    
-    NSDictionary *attributes = @{NSFontAttributeName: [UIFont systemFontOfSize:14.0], NSForegroundColorAttributeName: [UIColor lightGrayColor], NSParagraphStyleAttributeName: paragraph};
+    NSString *text;
     
     if ([CCCoreData getCameraUploadActiveAccount:app.activeAccount])
-        return [[NSAttributedString alloc] initWithString:NSLocalizedString(@"_tutorial_photo_view_", nil) attributes:attributes];
+        text = [NSString stringWithFormat:@"\n%@", NSLocalizedString(@"_tutorial_photo_view_", nil)];
     else
-        return [[NSAttributedString alloc] initWithString:NSLocalizedString(@"_tutorial_camera_upload_view_", nil) attributes:attributes];
+        text = [NSString stringWithFormat:@"\n%@\n", NSLocalizedString(@"_tutorial_camera_upload_view_", nil)];
+    
+    NSDictionary *attributes = @{NSFontAttributeName: [UIFont systemFontOfSize:14.0], NSForegroundColorAttributeName: [UIColor lightGrayColor], NSParagraphStyleAttributeName: paragraph};
+
+    return [[NSAttributedString alloc] initWithString:text attributes:attributes];
 }
 
 - (UIImage *)buttonImageForEmptyDataSet:(UIScrollView *)scrollView forState:(UIControlState)state