Browse Source

view activity

Marino Faggiana 8 years ago
parent
commit
e1a30014ca

+ 23 - 0
iOSClient/Images.xcassets/activityTypeInfoServer.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/activityTypeInfoServer.imageset/activityTypeInfoServer.png


BIN
iOSClient/Images.xcassets/activityTypeInfoServer.imageset/activityTypeInfoServer@2x.png


BIN
iOSClient/Images.xcassets/activityTypeInfoServer.imageset/activityTypeInfoServer@3x.png


+ 10 - 3
iOSClient/MenuAccount+ControlCenter/CCControlCenterActivity.m

@@ -11,7 +11,7 @@
 #import "AppDelegate.h"
 #import "CCSection.h"
 
-#define fontSizeData    [UIFont systemFontOfSize:16]
+#define fontSizeData    [UIFont boldSystemFontOfSize:15]
 #define fontSizeAction  [UIFont systemFontOfSize:14]
 #define fontSizeNote    [UIFont systemFontOfSize:14]
 
@@ -172,17 +172,24 @@
     [actionLabel setFont:fontSizeAction];
     actionLabel.text = [NSString stringWithFormat:@"%@ %@", activity.action, activity.file];
 
-    if ([activity.type length] == 0 || [activity.type isEqualToString:k_activityTypeInfo]) {
+    if ([activity.type isEqualToString:k_activityTypeInfo]) {
+        
         actionLabel.textColor = COLOR_BRAND;
-        typeImage.image = [UIImage imageNamed:@"activityTypeInfo"];
+        
+        if ([activity.verbose integerValue] == k_activityVerboseDebug)
+            typeImage.image = [UIImage imageNamed:@"activityTypeInfo"];
+        else
+            typeImage.image = [UIImage imageNamed:@"activityTypeInfoServer"];
     }
     
     if ([activity.type isEqualToString:k_activityTypeSuccess]) {
+        
         actionLabel.textColor = [UIColor colorWithRed:87.0/255.0 green:187.0/255.0 blue:57.0/255.0 alpha:1.0];;
         typeImage.image = [UIImage imageNamed:@"activityTypeSuccess"];
     }
     
     if ([activity.type isEqualToString:k_activityTypeFailure]) {
+        
         actionLabel.textColor = [UIColor redColor];
         typeImage.image = [UIImage imageNamed:@"activityTypeFailure"];
     }

+ 7 - 7
iOSClient/MenuAccount+ControlCenter/ControlCenter.storyboard

@@ -53,7 +53,7 @@
                             <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">
-                                    <rect key="frame" x="8" y="8" width="359" height="20"/>
+                                    <rect key="frame" x="46" y="8" width="321" height="20"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="20" id="KNG-FZ-Mkw"/>
                                     </constraints>
@@ -62,7 +62,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" 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"/>
+                                    <rect key="frame" x="46" y="33" width="321" height="40"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
@@ -75,7 +75,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="76" width="325" height="30"/>
+                                    <rect key="frame" x="46" y="76" width="321" height="30"/>
                                     <constraints>
                                         <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="30" id="v2e-1C-t22"/>
                                     </constraints>
@@ -90,11 +90,11 @@
                                 <constraint firstItem="LU0-Y8-8hN" firstAttribute="top" secondItem="6Zg-lt-YR9" secondAttribute="topMargin" constant="25" id="OId-UY-MUK"/>
                                 <constraint firstItem="qKB-Ig-OvH" firstAttribute="top" secondItem="LU0-Y8-8hN" secondAttribute="top" id="SIc-a4-Nkr"/>
                                 <constraint firstItem="suK-ZC-07d" firstAttribute="top" secondItem="qKB-Ig-OvH" secondAttribute="bottom" constant="3" id="SxN-Fc-gWw"/>
-                                <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="CHD-zb-9Fb" secondAttribute="leading" constant="-38" id="TE8-eb-tc2"/>
+                                <constraint firstItem="suK-ZC-07d" firstAttribute="leading" secondItem="LU0-Y8-8hN" secondAttribute="trailing" constant="8" id="adb-1z-0yE"/>
                                 <constraint firstAttribute="trailingMargin" secondItem="qKB-Ig-OvH" secondAttribute="trailing" id="bUL-VU-h7V"/>
-                                <constraint firstItem="qKB-Ig-OvH" firstAttribute="leading" secondItem="CHD-zb-9Fb" secondAttribute="leading" constant="34" id="bpL-29-hDV"/>
-                                <constraint firstAttribute="leadingMargin" secondItem="suK-ZC-07d" secondAttribute="leading" constant="-34" id="bsM-XS-4MA"/>
+                                <constraint firstItem="qKB-Ig-OvH" firstAttribute="leading" secondItem="CHD-zb-9Fb" secondAttribute="leading" id="bpL-29-hDV"/>
+                                <constraint firstAttribute="leadingMargin" secondItem="suK-ZC-07d" secondAttribute="leading" constant="-38" id="bsM-XS-4MA"/>
                                 <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>