add VideoOverlay icon in Photos

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

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

iOSClient/Main/Main.storyboard

@@ -240,10 +240,10 @@
                                     <rect key="frame" x="0.0" y="0.0" width="75" height="75"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <imageView userInteractionEnabled="NO" tag="100" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wv7-Pl-1S9">
+                                        <imageView userInteractionEnabled="NO" tag="100" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wv7-Pl-1S9" userLabel="Image">
                                             <rect key="frame" x="0.0" y="0.0" width="75" height="75"/>
                                         </imageView>
-                                        <visualEffectView hidden="YES" opaque="NO" tag="200" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Vaz-kb-VZC">
+                                        <visualEffectView hidden="YES" opaque="NO" tag="200" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Vaz-kb-VZC" userLabel="VisualEffect">
                                             <rect key="frame" x="0.0" y="0.0" width="75" height="75"/>
                                             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="zTo-QZ-xyF">
                                                 <rect key="frame" x="0.0" y="0.0" width="75" height="75"/>
@@ -252,13 +252,20 @@
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <blurEffect style="extraLight"/>
                                         </visualEffectView>
-                                        <imageView hidden="YES" opaque="NO" userInteractionEnabled="NO" tag="300" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="sj1-BH-NWl">
+                                        <imageView hidden="YES" opaque="NO" userInteractionEnabled="NO" tag="300" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="sj1-BH-NWl" userLabel="ImageCheckled">
                                             <rect key="frame" x="25" y="25" width="25" height="25"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="25" id="8D0-Br-VLn"/>
                                                 <constraint firstAttribute="width" constant="25" id="JTW-Py-sqE"/>
                                             </constraints>
                                         </imageView>
+                                        <imageView hidden="YES" opaque="NO" userInteractionEnabled="NO" tag="400" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ie8-HI-w6E" userLabel="ImageVideo">
+                                            <rect key="frame" x="55" y="61" width="20" height="14"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="20" id="Ehd-rd-RIc"/>
+                                                <constraint firstAttribute="height" constant="14" id="Yam-RU-2Qc"/>
+                                            </constraints>
+                                        </imageView>
                                     </subviews>
                                 </view>
                                 <constraints>
@@ -266,7 +273,9 @@
                                     <constraint firstItem="wv7-Pl-1S9" firstAttribute="bottom" secondItem="Vaz-kb-VZC" secondAttribute="bottom" id="8nn-9h-h8F"/>
                                     <constraint firstItem="sj1-BH-NWl" firstAttribute="centerX" secondItem="zTo-QZ-xyF" secondAttribute="centerX" id="Aou-FC-rhP"/>
                                     <constraint firstItem="wv7-Pl-1S9" firstAttribute="trailing" secondItem="Vaz-kb-VZC" secondAttribute="trailing" id="CGZ-Ir-z0l"/>
+                                    <constraint firstItem="ie8-HI-w6E" firstAttribute="top" secondItem="zTo-QZ-xyF" secondAttribute="bottom" constant="-14" id="FlS-6N-OuF"/>
                                     <constraint firstItem="wv7-Pl-1S9" firstAttribute="top" secondItem="ax6-Kq-EOT" secondAttribute="top" id="H2J-n2-czF"/>
+                                    <constraint firstItem="ie8-HI-w6E" firstAttribute="leading" secondItem="zTo-QZ-xyF" secondAttribute="trailing" constant="-20" id="NkC-RJ-YOg"/>
                                     <constraint firstItem="wv7-Pl-1S9" firstAttribute="leading" secondItem="Vaz-kb-VZC" secondAttribute="leading" id="TKe-Ml-mj4"/>
                                     <constraint firstItem="wv7-Pl-1S9" firstAttribute="top" secondItem="Vaz-kb-VZC" secondAttribute="top" id="V3X-qR-o1I"/>
                                     <constraint firstAttribute="trailing" secondItem="wv7-Pl-1S9" secondAttribute="trailing" id="WRD-6l-xgj"/>
@@ -802,6 +811,6 @@
         <image name="tabBarPlus" width="40" height="40"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="2Qm-A6-CfB"/>
+        <segue reference="op6-ow-K8v"/>
     </inferredMetricsTieBreakers>
 </document>

iOSClient/Photos/CCPhotos.m

@@ -697,8 +697,11 @@
     UIImageView *imageView = (UIImageView *)[cell viewWithTag:100];
     UIVisualEffectView *effect = [cell viewWithTag:200];
 
-    UIImageView *checked = [cell viewWithTag:300];
-    checked.image = [UIImage imageNamed:@"checked"];
+    UIImageView *checkedOverlay = [cell viewWithTag:300];
+    checkedOverlay.image = [UIImage imageNamed:@"checked"];
+    
+    UIImageView *videoOverlay = [cell viewWithTag:400];
+    videoOverlay.image = [UIImage imageNamed:@"VideoOverlay"];
 
     NSArray *metadatasForKey = [sectionDataSource.sectionArrayRow objectForKey:[sectionDataSource.sections objectAtIndex:indexPath.section]];
     
@@ -722,15 +725,22 @@
             }
         }
     
-        // Cheched
+        // Cheched Overlay
         if (cell.selected) {
-            checked.hidden = NO;
+            checkedOverlay.hidden = NO;
             effect.hidden = NO;
             effect.alpha = 0.4;
         } else {
-            checked.hidden = YES;
+            checkedOverlay.hidden = YES;
             effect.hidden = YES;
         }
+        
+        // Video Overlay
+        if ([metadata.typeFile isEqualToString: k_metadataTypeFile_video]) {
+            videoOverlay.hidden = NO;
+        } else {
+            videoOverlay.hidden = YES;
+        }
     }
     
     return cell;