#154 Add iOS 9' new Photo Albums

CTAssetsPickerController/CTAssetThumbnailOverlay.m

@@ -28,6 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import "CTAssetThumbnailOverlay.h"
 #import "UIImage+CTAssetsPickerController.h"
 #import "PHAsset+CTAssetsPickerController.h"
+#import "PHAssetCollection+CTAssetsPickerController.h"
 
 
 
@@ -111,34 +112,14 @@ - (void)updateConstraints
 
 - (void)bind:(PHAsset *)asset duration:(NSString *)duration;
 {
-    self.badge.image = [self imageForAsset:asset];
+    self.badge.image = [asset badgeImage];
     self.badge.layoutMargins = [self layoutMarginsForAsset:asset];
     self.duration.text = duration;
 
     [self setNeedsUpdateConstraints];
     [self updateConstraintsIfNeeded];
 }
 
-
-- (UIImage *)imageForAsset:(PHAsset *)asset
-{
-    NSString *imageName;
-
-    if (asset.ctassetsPickerIsHighFrameRateVideo)
-        imageName = @"BadgeSloMoSmall";
-
-    else if (asset.ctassetsPickerIsTimelapseVideo)
-        imageName = @"BadgeTimelapseSmall";
-
-    else if (asset.ctassetsPickerIsVideo)
-        imageName = @"BadgeVideoSmall";
-
-    if (imageName)
-        return [[UIImage ctassetsPickerImageNamed:imageName] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-    else
-        return nil;
-}
-
 - (UIEdgeInsets)layoutMarginsForAsset:(PHAsset *)asset
 {
     if (asset.ctassetsPickerIsHighFrameRateVideo)
@@ -159,55 +140,17 @@ - (UIEdgeInsets)layoutMarginsForAsset:(PHAsset *)asset
 
 - (void)bind:(PHAssetCollection *)assetCollection;
 {
-    self.badge.image = [self imageForAssetCollection:assetCollection];
+    self.badge.image = [assetCollection badgeImage];
     self.badge.layoutMargins = [self layoutMarginsForAssetCollection:assetCollection];
     self.duration.text = nil;
 
     [self setNeedsUpdateConstraints];
     [self updateConstraintsIfNeeded];    
 }
 
-- (UIImage *)imageForAssetCollection:(PHAssetCollection *)assetCollection
-{
-    NSString *imageName;
-
-    if (assetCollection.assetCollectionSubtype == PHAssetCollectionSubtypeSmartAlbumUserLibrary)
-        imageName = @"BadgeAllPhotos";
-
-    else if (assetCollection.assetCollectionSubtype == PHAssetCollectionSubtypeSmartAlbumPanoramas)
-        imageName = @"BadgePanorama";
-
-    else if (assetCollection.assetCollectionSubtype == PHAssetCollectionSubtypeSmartAlbumVideos)
-        imageName = @"BadgeVideo";
-
-    else if (assetCollection.assetCollectionSubtype == PHAssetCollectionSubtypeSmartAlbumFavorites)
-        imageName = @"BadgeFavorites";
-
-    else if (assetCollection.assetCollectionSubtype == PHAssetCollectionSubtypeSmartAlbumTimelapses)
-        imageName = @"BadgeTimelapse";
-
-    else if (assetCollection.assetCollectionSubtype == PHAssetCollectionSubtypeSmartAlbumAllHidden)
-        imageName = nil;
-
-    else if (assetCollection.assetCollectionSubtype == PHAssetCollectionSubtypeSmartAlbumRecentlyAdded)
-        imageName = @"BadgeLastImport";
-
-    else if (assetCollection.assetCollectionSubtype == PHAssetCollectionSubtypeSmartAlbumBursts)
-        imageName = @"BadgeBurst";
-
-    else if (assetCollection.assetCollectionSubtype == PHAssetCollectionSubtypeSmartAlbumSlomoVideos)
-        imageName = @"BadgeSlomo";
-
-
-    if (imageName)
-        return [[UIImage ctassetsPickerImageNamed:imageName] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-    else
-        return nil;
-}
-
 - (UIEdgeInsets)layoutMarginsForAssetCollection:(PHAssetCollection *)assetCollection
 {
-    return UIEdgeInsetsMake(4,4,4,4);
+    return UIEdgeInsetsMake(4.0, 4.0, 4.0, 4.0);
 }
 
 @end

CTAssetsPickerController/CTAssetsPickerController.m

@@ -134,13 +134,23 @@ - (void)initAssetCollectionSubtypes
       [NSNumber numberWithInt:PHAssetCollectionSubtypeSmartAlbumTimelapses],
       [NSNumber numberWithInt:PHAssetCollectionSubtypeSmartAlbumBursts],
       [NSNumber numberWithInt:PHAssetCollectionSubtypeSmartAlbumAllHidden],
-      [NSNumber numberWithInt:PHAssetCollectionSubtypeSmartAlbumGeneric],      
+      [NSNumber numberWithInt:PHAssetCollectionSubtypeSmartAlbumGeneric],
       [NSNumber numberWithInt:PHAssetCollectionSubtypeAlbumRegular],
       [NSNumber numberWithInt:PHAssetCollectionSubtypeAlbumSyncedAlbum],
       [NSNumber numberWithInt:PHAssetCollectionSubtypeAlbumSyncedEvent],
       [NSNumber numberWithInt:PHAssetCollectionSubtypeAlbumSyncedFaces],
       [NSNumber numberWithInt:PHAssetCollectionSubtypeAlbumImported],
       [NSNumber numberWithInt:PHAssetCollectionSubtypeAlbumCloudShared]];
+
+    // Add iOS 9's new albums
+    if ([[PHAsset new] respondsToSelector:@selector(sourceType)])
+    {
+        NSMutableArray *subtypes = [NSMutableArray arrayWithArray:self.assetCollectionSubtypes];
+        [subtypes insertObject:[NSNumber numberWithInt:PHAssetCollectionSubtypeSmartAlbumSelfPortraits] atIndex:4];
+        [subtypes insertObject:[NSNumber numberWithInt:PHAssetCollectionSubtypeSmartAlbumScreenshots] atIndex:10];
+
+        self.assetCollectionSubtypes = [NSArray arrayWithArray:subtypes];
+    }
 }
 
 - (void)initThumbnailRequestOptions

CTAssetsPickerController/Categories/PHAsset+CTAssetsPickerController.h

@@ -33,6 +33,7 @@
 - (BOOL)ctassetsPickerIsHighFrameRateVideo;
 - (BOOL)ctassetsPickerIsTimelapseVideo;
 
+- (UIImage *)badgeImage;
 - (NSString *)ctassetsPickerAccessibilityLabel;
 
 @end

CTAssetsPickerController/Categories/PHAsset+CTAssetsPickerController.m

@@ -25,6 +25,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 
 #import "PHAsset+CTAssetsPickerController.h"
+#import "UIImage+CTAssetsPickerController.h"
+
+
 
 @implementation PHAsset (CTAssetsPickerController)
 
@@ -48,6 +51,25 @@ - (BOOL)ctassetsPickerIsTimelapseVideo
     return (self.mediaType == PHAssetMediaTypeVideo && (self.mediaSubtypes & PHAssetMediaSubtypeVideoTimelapse));    
 }
 
+- (UIImage *)badgeImage
+{
+    NSString *imageName;
+
+    if (self.ctassetsPickerIsHighFrameRateVideo)
+        imageName = @"BadgeSlomoSmall";
+
+    else if (self.ctassetsPickerIsTimelapseVideo)
+        imageName = @"BadgeTimelapseSmall";
+
+    else if (self.ctassetsPickerIsVideo)
+        imageName = @"BadgeVideoSmall";
+
+    if (imageName)
+        return [[UIImage ctassetsPickerImageNamed:imageName] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+    else
+        return nil;
+}
+
 - (NSString *)ctassetsPickerAccessibilityLabel
 {
     return nil;

CTAssetsPickerController/Categories/PHAssetCollection+CTAssetsPickerController.h

@@ -30,5 +30,6 @@
 
 + (PHAssetCollectionType)ctassetPickerAssetCollectionTypeOfSubtype:(PHAssetCollectionSubtype)subtype;
 - (NSUInteger)ctassetPikcerCountOfAssetsFetchedWithOptions:(PHFetchOptions *)fetchOptions;
+- (UIImage *)badgeImage;
 
 @end

CTAssetsPickerController/Categories/PHAssetCollection+CTAssetsPickerController.m

@@ -25,6 +25,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 
 #import "PHAssetCollection+CTAssetsPickerController.h"
+#import "UIImage+CTAssetsPickerController.h"
+
+
 
 @implementation PHAssetCollection (CTAssetsPickerController)
 
@@ -39,5 +42,62 @@ - (NSUInteger)ctassetPikcerCountOfAssetsFetchedWithOptions:(PHFetchOptions *)fet
     return result.count;
 }
 
+- (UIImage *)badgeImage
+{
+    NSString *imageName;
+
+    switch (self.assetCollectionSubtype)
+    {
+        case PHAssetCollectionSubtypeSmartAlbumUserLibrary:
+            imageName = @"BadgeAllPhotos";
+            break;
+
+        case PHAssetCollectionSubtypeSmartAlbumPanoramas:
+            imageName = @"BadgePanorama";
+            break;
+
+        case PHAssetCollectionSubtypeSmartAlbumVideos:
+            imageName = @"BadgeVideo";
+            break;
+
+        case PHAssetCollectionSubtypeSmartAlbumFavorites:
+            imageName = @"BadgeFavorites";
+            break;
+
+        case PHAssetCollectionSubtypeSmartAlbumTimelapses:
+            imageName = @"BadgeTimelapse";
+            break;
+
+        case PHAssetCollectionSubtypeSmartAlbumRecentlyAdded:
+            imageName = @"BadgeLastImport";
+            break;
+
+        case PHAssetCollectionSubtypeSmartAlbumBursts:
+            imageName = @"BadgeBurst";
+            break;
+
+        case PHAssetCollectionSubtypeSmartAlbumSlomoVideos:
+            imageName = @"BadgeSlomo";
+            break;
+
+        case PHAssetCollectionSubtypeSmartAlbumScreenshots:
+            imageName = @"BadgeScreenshots";
+            break;
+
+        case PHAssetCollectionSubtypeSmartAlbumSelfPortraits:
+            imageName = @"BadgeSelfPortraits";
+            break;
+
+        default:
+            imageName = nil;
+            break;
+    }
+
+    if (imageName)
+        return [[UIImage ctassetsPickerImageNamed:imageName] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+    else
+        return nil;
+}
+
 
 @end

CTAssetsPickerController/Resources/CTAssetsPicker.xcassets/BadgeScreenshots.imageset/Contents.json

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

CTAssetsPickerController/Resources/CTAssetsPicker.xcassets/BadgeSelfPortraits.imageset/Contents.json

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

CTAssetsPickerController/Resources/CTAssetsPicker.xcassets/BadgeSloMoSmall.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "BadgeSloMoSmall.png",
+      "filename" : "BadgeSlomoSmall.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "BadgeSloMoSmall@2x.png",
+      "filename" : "BadgeSlomoSmall@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "BadgeSloMoSmall@3x.png",
+      "filename" : "BadgeSlomoSmall@3x.png",
       "scale" : "3x"
     }
   ],