Activity protocol

iOSClient/FileSystem/CCCoreData.m

@@ -1860,7 +1860,7 @@
         TableActivity *record = [TableActivity MR_createEntityInContext:localContext];
 
         record.account = account;
-        record.action = @"Server";
+        record.action = @"Server Activity";
         record.date = activity.date;
         record.file = activity.file;
         record.idActivity = [NSNumber numberWithInteger:activity.idActivity];

iOSClient/MenuAccount+ControlCenter/CCControlCenterActivity.m

@@ -12,7 +12,8 @@
 #import "CCSection.h"
 
 #define fontSizeData    [UIFont systemFontOfSize:16]
-#define fontSizeSubject [UIFont systemFontOfSize:14]
+#define fontSizeAction  [UIFont systemFontOfSize:15]
+#define fontSizeNote    [UIFont systemFontOfSize:14]
 
 @interface CCControlCenterActivity ()
 {
@@ -128,15 +129,15 @@
     
     UILabel *noteLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, collectionView.frame.size.width , CGFLOAT_MAX)];
     noteLabel.numberOfLines = 0;
-    [noteLabel setFont:fontSizeSubject];
+    [noteLabel setFont:fontSizeNote];
     noteLabel.text = activity.note;
     noteLabel.lineBreakMode = NSLineBreakByWordWrapping;
     int heighNoteLabel = [self getLabelHeight:noteLabel];
 
-    int heightView = 60 + heighNoteLabel + (heighNoteLabel/5);
+    int heightView = 80 + heighNoteLabel + (heighNoteLabel/5);
     
-    if (heightView < 60)
-        heightView = 60;
+    if (heightView < 80)
+        heightView = 80;
     
     return CGSizeMake(collectionView.frame.size.width, heightView);
 }
@@ -159,8 +160,8 @@
     dateLabel.textColor = [UIColor colorWithRed:130.0/255.0 green:130.0/255.0 blue:130.0/255.0 alpha:1.0];
     dateLabel.text = [CCUtility getTitleSectionDate:date];
     
-    [actionLabel setFont:fontSizeData];
-    actionLabel.text = activity.action;
+    [actionLabel setFont:fontSizeAction];
+    actionLabel.text = [NSString stringWithFormat:@"%@ %@", activity.action, activity.file];
 
     if ([activity.type length] == 0 || [activity.type isEqualToString:k_activityTypeInfo]) {
         actionLabel.textColor = COLOR_BRAND;
@@ -177,7 +178,7 @@
         typeImage.image = [UIImage imageNamed:@"activityTypeFailure"];
     }
     
-    [noteLabel setFont:fontSizeSubject];
+    [noteLabel setFont:fontSizeNote];
     noteLabel.textColor = COLOR_TEXT_ANTHRACITE;
     noteLabel.numberOfLines = 0;
     noteLabel.lineBreakMode = NSLineBreakByWordWrapping;

iOSClient/MenuAccount+ControlCenter/ControlCenter.storyboard

@@ -28,13 +28,13 @@
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="cmY-iB-PWk">
                             <size key="itemSize" width="50" height="50"/>
-                            <size key="headerReferenceSize" width="50" height="90"/>
+                            <size key="headerReferenceSize" width="50" height="120"/>
                             <size key="footerReferenceSize" width="0.0" height="0.0"/>
                             <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                         </collectionViewFlowLayout>
                         <cells>
                             <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="cell" id="btw-Qo-oNg">
-                                <rect key="frame" x="0.0" y="90" width="50" height="50"/>
+                                <rect key="frame" x="0.0" y="120" width="50" height="50"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                     <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
@@ -49,7 +49,7 @@
                             </collectionViewCell>
                         </cells>
                         <collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="header" id="6Zg-lt-YR9">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="90"/>
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="120"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" tag="100" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CHD-zb-9Fb">
@@ -61,8 +61,8 @@
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qKB-Ig-OvH">
-                                    <rect key="frame" x="42" y="33" width="325" height="20"/>
+                                <label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qKB-Ig-OvH">
+                                    <rect key="frame" x="42" y="33" width="325" height="40"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                     <nil key="textColor"/>
@@ -76,7 +76,7 @@
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" tag="102" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="suK-ZC-07d">
-                                    <rect key="frame" x="42" y="55" width="325" height="30"/>
+                                    <rect key="frame" x="42" y="76" width="325" height="30"/>
                                     <constraints>
                                         <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="30" id="v2e-1C-t22"/>
                                     </constraints>
@@ -92,7 +92,7 @@
                                 <constraint firstAttribute="leadingMargin" secondItem="CHD-zb-9Fb" secondAttribute="leading" id="TE8-eb-tc2"/>
                                 <constraint firstItem="suK-ZC-07d" firstAttribute="leading" secondItem="LU0-Y8-8hN" secondAttribute="trailing" constant="4" id="adb-1z-0yE"/>
                                 <constraint firstAttribute="leadingMargin" secondItem="suK-ZC-07d" secondAttribute="leading" constant="-34" id="bsM-XS-4MA"/>
-                                <constraint firstItem="suK-ZC-07d" firstAttribute="top" secondItem="CHD-zb-9Fb" secondAttribute="bottom" constant="27" id="snE-f4-Nuo"/>
+                                <constraint firstItem="suK-ZC-07d" firstAttribute="top" secondItem="CHD-zb-9Fb" secondAttribute="bottom" constant="48" id="snE-f4-Nuo"/>
                                 <constraint firstAttribute="trailingMargin" secondItem="suK-ZC-07d" secondAttribute="trailing" id="uOW-VG-4zZ"/>
                             </constraints>
                         </collectionReusableView>

iOSClient/Networking/OCNetworking.m

@@ -402,7 +402,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
         // Activity
-        [CCCoreData addActivityFile:_metadataNet.serverUrl action:_metadataNet.action note:[error.userInfo valueForKey:@"NSLocalizedDescription"] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseClientDebug account:_metadataNet.account];
+        [CCCoreData addActivityFile:_metadataNet.serverUrl action:@"Read Folder" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseClientDebug account:_metadataNet.account];
         
         [self complete];
     }];