#182

iOSClient/Activity/CCActivity.h

@@ -22,8 +22,9 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "UIScrollView+EmptyDataSet.h"
 
-@interface CCActivity : UICollectionViewController <UICollectionViewDataSource, UICollectionViewDelegate>
+@interface CCActivity : UICollectionViewController <UICollectionViewDataSource, UICollectionViewDelegate, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
 
 @property NSUInteger pageIndex;
 

iOSClient/Activity/CCActivity.m

@@ -60,6 +60,10 @@
     
     [super viewDidLoad];
     
+    self.collectionView.emptyDataSetSource = self;
+    self.collectionView.emptyDataSetDelegate = self;
+    self.collectionView.delegate = self;
+    
     _verbose = [CCUtility getActivityVerboseHigh];
     
     _sectionDataSource = [NSArray new];
@@ -94,6 +98,37 @@
     [super didReceiveMemoryWarning];
 }
 
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark ==== DZNEmptyDataSetSource ====
+#pragma --------------------------------------------------------------------------------------------
+
+- (BOOL)emptyDataSetShouldDisplay:(UIScrollView *)scrollView
+{
+    if([_sectionDataSource count] > 0)
+        return NO;
+    else
+        return YES;
+}
+
+- (UIColor *)backgroundColorForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return [UIColor whiteColor];
+}
+
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return [UIImage imageNamed:image_activityNoRecord];
+}
+
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
+{
+    NSString *text = [NSString stringWithFormat:@"%@", NSLocalizedString(@"_no_activity_", nil)];
+
+    NSDictionary *attributes = @{NSFontAttributeName:[UIFont boldSystemFontOfSize:20.0f], NSForegroundColorAttributeName:[UIColor lightGrayColor]};
+    
+    return [[NSAttributedString alloc] initWithString:text attributes:attributes];
+}
+
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark - ==== Datasource ====
 #pragma --------------------------------------------------------------------------------------------
@@ -122,21 +157,15 @@
 {
     NSDate *dateActivity;
     
-    if ([_sectionDataSource count] == 0) {
-            
-        
-            
-    } else {
-            
+    if ([_sectionDataSource count] > 0)
         dateActivity = ((TableActivity *)[_sectionDataSource objectAtIndex:0]).date;
-    }
 
     if ([dateActivity compare:_storeDateFirstActivity] == NSOrderedDescending || _storeDateFirstActivity == nil || dateActivity == nil) {
         _storeDateFirstActivity = dateActivity;
         [self.collectionView reloadData];
-    }
+    }    
 }
-    
+
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark - ==== Table ====
 #pragma --------------------------------------------------------------------------------------------

iOSClient/CCStandardImages.h

@@ -32,6 +32,9 @@
 #define image_actionSheetFavorite               @"actionSheetFavorite"
 #define image_actionSheetLocal                  @"localStorage"
 #define image_actionSheetRemoveLocal            @"actionSheetRemoveLocal"
+
+#define image_activityNoRecord                  @"activityNoRecord"
+
 #define image_avatar                            @"avatar"
 
 #define image_bkfull                            @"bkfull"

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

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

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -115,10 +115,6 @@
     // Dispose of any resources that can be recreated.
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ====== Photos ======
-#pragma --------------------------------------------------------------------------------------------
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Gestione Grafica Window =====
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -492,10 +492,10 @@
 
 "_destiny_folder_"                  = "Folder : %@";
 
-// Control Center
 
-"_no_transfer_"                     = "No transfer";
-"_no_activity_"                     = "No activity";
+"_no_transfer_"                     = "No transfers yet";
+"_no_transfer_sub_"                 = "Uploads will be listed here";
+"_no_activity_"                     = "No activity yet";
 "_transfers_"                       = "Transfers";
 "_activity_"                        = "Activity";
 "_activity_file_not_present_"       = "File no longer present";