Refactoring

nek023 · Apr 5, 2015 · 8971bdf · 8971bdf
1 parent 7475228
commit 8971bdf
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 31 deletions.
diff --git a/QBImagePicker.xcodeproj/project.pbxproj b/QBImagePicker.xcodeproj/project.pbxproj
@@ -167,10 +167,10 @@
 				AAF1CA3A1ACE765F005F6295 /* QBFooterView.m */,
 				AABBF08E1ACEDDFF003188A3 /* QBCheckmarkView.h */,
 				AABBF08F1ACEDDFF003188A3 /* QBCheckmarkView.m */,
-				AA3AD0711ACFA06700BF523E /* QBVideoIndicatorView.h */,
-				AA3AD0721ACFA06700BF523E /* QBVideoIndicatorView.m */,
 				AA3AD06D1ACF9A3A00BF523E /* QBVideoIconView.h */,
 				AA3AD06E1ACF9A3A00BF523E /* QBVideoIconView.m */,
+				AA3AD0711ACFA06700BF523E /* QBVideoIndicatorView.h */,
+				AA3AD0721ACFA06700BF523E /* QBVideoIndicatorView.m */,
 			);
 			name = Views;
 			sourceTree = "<group>";

diff --git a/QBImagePicker/QBAssetsViewController.m b/QBImagePicker/QBAssetsViewController.m
@@ -153,9 +153,6 @@ - (void)setAssetCollection:(PHAssetCollection *)assetCollection
 {
     _assetCollection = assetCollection;
 
-    // Set title
-    self.navigationItem.title = self.assetCollection.localizedTitle;
-
     [self updateFetchRequest];
     [self.collectionView reloadData];
 }
@@ -534,13 +531,13 @@ - (BOOL)collectionView:(UICollectionView *)collectionView shouldSelectItemAtInde
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
     QBImagePickerController *imagePickerController = self.imagePickerController;
-    NSMutableOrderedSet *selectedAssets = imagePickerController.selectedAssets;
-
-    // Add asset to set
     PHAsset *asset = self.fetchResult[indexPath.item];
-    [selectedAssets addObject:asset];
 
     if (imagePickerController.allowsMultipleSelection) {
+        // Add asset to set
+        NSMutableOrderedSet *selectedAssets = imagePickerController.selectedAssets;
+        [selectedAssets addObject:asset];
+
         [self updateControlState];
 
         if (imagePickerController.showsNumberOfSelectedAssets) {
@@ -551,38 +548,38 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa
                 [self.navigationController setToolbarHidden:NO animated:YES];
             }
         }
+    } else {
+        if ([imagePickerController.delegate respondsToSelector:@selector(qb_imagePickerController:didFinishPickingAssets:)]) {
+            [imagePickerController.delegate qb_imagePickerController:imagePickerController didFinishPickingAssets:@[asset]];
+        }
     }
 
     if ([imagePickerController.delegate respondsToSelector:@selector(qb_imagePickerController:didSelectAsset:)]) {
         [imagePickerController.delegate qb_imagePickerController:imagePickerController didSelectAsset:asset];
     }
-
-    if (!imagePickerController.allowsMultipleSelection) {
-        if ([imagePickerController.delegate respondsToSelector:@selector(qb_imagePickerController:didFinishPickingAssets:)]) {
-            [imagePickerController.delegate qb_imagePickerController:imagePickerController didFinishPickingAssets:@[asset]];
-        }
-    }
 }
 
 - (void)collectionView:(UICollectionView *)collectionView didDeselectItemAtIndexPath:(NSIndexPath *)indexPath
 {
+    if (!self.imagePickerController.allowsMultipleSelection) {
+        return;
+    }
+
     QBImagePickerController *imagePickerController = self.imagePickerController;
     NSMutableOrderedSet *selectedAssets = imagePickerController.selectedAssets;
 
     // Remove asset from set
     PHAsset *asset = self.fetchResult[indexPath.item];
     [selectedAssets removeObject:asset];
 
-    if (imagePickerController.allowsMultipleSelection) {
-        [self updateControlState];
+    [self updateControlState];
+
+    if (imagePickerController.showsNumberOfSelectedAssets) {
+        [self updateSelectionInfo];
 
-        if (imagePickerController.showsNumberOfSelectedAssets) {
-            [self updateSelectionInfo];
-
-            if (selectedAssets.count == 0) {
-                // Hide toolbar
-                [self.navigationController setToolbarHidden:YES animated:YES];
-            }
+        if (selectedAssets.count == 0) {
+            // Hide toolbar
+            [self.navigationController setToolbarHidden:YES animated:YES];
         }
     }
 

diff --git a/QBImagePicker/QBImagePicker.h b/QBImagePicker/QBImagePicker.h
@@ -6,8 +6,7 @@
 //  Copyright (c) 2015 Katsuma Tanaka. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-#import <Photos/Photos.h>
+#import <Foundation/Foundation.h>
 
 //! Project version number for QBImagePicker.
 FOUNDATION_EXPORT double QBImagePickerVersionNumber;

diff --git a/QBImagePicker/QBImagePickerController.h b/QBImagePicker/QBImagePickerController.h
@@ -7,9 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
+#import <Photos/Photos.h>
 
 @class QBImagePickerController;
-@class PHAsset;
 
 @protocol QBImagePickerControllerDelegate <NSObject>
 

diff --git a/QBImagePicker/QBVideoIconView.h b/QBImagePicker/QBVideoIconView.h
@@ -3,7 +3,7 @@
 //  QBImagePicker
 //
 //  Created by Katsuma Tanaka on 2015/04/04.
-//  Copyright (c) 2015年 Katsuma Tanaka. All rights reserved.
+//  Copyright (c) 2015 Katsuma Tanaka. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/QBImagePicker/QBVideoIconView.m b/QBImagePicker/QBVideoIconView.m
@@ -3,7 +3,7 @@
 //  QBImagePicker
 //
 //  Created by Katsuma Tanaka on 2015/04/04.
-//  Copyright (c) 2015年 Katsuma Tanaka. All rights reserved.
+//  Copyright (c) 2015 Katsuma Tanaka. All rights reserved.
 //
 
 #import "QBVideoIconView.h"

diff --git a/QBImagePicker/QBVideoIndicatorView.h b/QBImagePicker/QBVideoIndicatorView.h
@@ -3,7 +3,7 @@
 //  QBImagePicker
 //
 //  Created by Katsuma Tanaka on 2015/04/04.
-//  Copyright (c) 2015年 Katsuma Tanaka. All rights reserved.
+//  Copyright (c) 2015 Katsuma Tanaka. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/QBImagePicker/QBVideoIndicatorView.m b/QBImagePicker/QBVideoIndicatorView.m
@@ -3,7 +3,7 @@
 //  QBImagePicker
 //
 //  Created by Katsuma Tanaka on 2015/04/04.
-//  Copyright (c) 2015年 Katsuma Tanaka. All rights reserved.
+//  Copyright (c) 2015 Katsuma Tanaka. All rights reserved.
 //
 
 #import "QBVideoIndicatorView.h"