Merge pull request arturgrigor#1 from MSchmidt/master

Add option to show saved photos (camera roll, photo stream) on top of list
Xummer · Apr 24, 2012 · 99aca00 · 99aca00
2 parents 11eb92f + 340ba06
commit 99aca00
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/AGImagePickerController Demo/AGViewController.m b/AGImagePickerController Demo/AGViewController.m
@@ -155,6 +155,9 @@ - (void)openAction:(id)sender
         [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault animated:YES];
     }];
 
+    // Show saved photos on top
+    imagePickerController.shouldShowSavedPhotosOnTop = YES;
+
     // Custom toolbar items
     AGIPCToolbarItem *selectAll = [[AGIPCToolbarItem alloc] initWithBarButtonItem:[[[UIBarButtonItem alloc] initWithTitle:@"+ Select All" style:UIBarButtonItemStyleBordered target:nil action:nil] autorelease] andSelectionBlock:^BOOL(NSUInteger index, ALAsset *asset) {
         return YES;

diff --git a/AGImagePickerController/AGIPCAlbumsController.h b/AGImagePickerController/AGIPCAlbumsController.h
@@ -19,5 +19,6 @@
 }
 
 @property (retain) IBOutlet UITableView *tableView;
+@property (assign) BOOL savedPhotosOnTop;
 
 @end
diff --git a/AGImagePickerController/AGIPCAlbumsController.m b/AGImagePickerController/AGIPCAlbumsController.m
@@ -39,6 +39,7 @@ @implementation AGIPCAlbumsController
 #pragma mark - Properties
 
 @synthesize tableView;
+@synthesize savedPhotosOnTop;
 
 - (NSMutableArray *)assetsGroups
 {
@@ -181,7 +182,17 @@ - (void)loadAssetsGroups
                     return;
                 }
 
-                [self.assetsGroups addObject:group];
+                if (savedPhotosOnTop) {
+                    if ([[group valueForProperty:ALAssetsGroupPropertyType] intValue] == ALAssetsGroupSavedPhotos) {
+                        [self.assetsGroups insertObject:group atIndex:0];
+                    } else if ([[group valueForProperty:ALAssetsGroupPropertyType] intValue] > ALAssetsGroupSavedPhotos) {
+                        [self.assetsGroups insertObject:group atIndex:1];
+                    } else {
+                        [self.assetsGroups addObject:group];
+                    }
+                } else {
+                    [self.assetsGroups addObject:group];
+                }
 
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [self reloadData];

diff --git a/AGImagePickerController/AGIPCAssetsController.m b/AGImagePickerController/AGIPCAssetsController.m
@@ -315,6 +315,9 @@ - (void)reloadData
     [self.tableView reloadData];
     [self setTitle:[self.assetsGroup valueForProperty:ALAssetsGroupPropertyName]];
     [self changeSelectionInformation];
+
+    NSInteger totalRows = [self.tableView numberOfRowsInSection:0];
+    [self.tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:totalRows-1 inSection:0] atScrollPosition:UITableViewScrollPositionBottom animated:NO];
 }
 
 - (void)doneAction:(id)sender

diff --git a/AGImagePickerController/AGImagePickerController.h b/AGImagePickerController/AGImagePickerController.h
@@ -31,6 +31,7 @@ typedef void (^AGIPCDidFail)(NSError *error);
 
     BOOL shouldChangeStatusBarStyle;
     BOOL shouldDisplaySelectionInformation;
+    BOOL shouldShowSavedPhotosOnTop;
     UIStatusBarStyle oldStatusBarStyle;
 
     AGIPCDidFinish didFinishBlock;
@@ -43,6 +44,7 @@ typedef void (^AGIPCDidFail)(NSError *error);
 
 @property (assign) BOOL shouldChangeStatusBarStyle;
 @property (assign) BOOL shouldDisplaySelectionInformation;
+@property (assign) BOOL shouldShowSavedPhotosOnTop;
 @property NSUInteger maximumNumberOfPhotos;
 
 @property (nonatomic, assign) id delegate;

diff --git a/AGImagePickerController/AGImagePickerController.m b/AGImagePickerController/AGImagePickerController.m
@@ -29,7 +29,7 @@ @implementation AGImagePickerController
 
 #pragma mark - Properties
 
-@synthesize delegate, maximumNumberOfPhotos, shouldChangeStatusBarStyle, shouldDisplaySelectionInformation;
+@synthesize delegate, maximumNumberOfPhotos, shouldChangeStatusBarStyle, shouldDisplaySelectionInformation, shouldShowSavedPhotosOnTop;
 
 @synthesize didFailBlock, didFinishBlock;
 
@@ -150,12 +150,13 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 
-    UIViewController *rootViewController = nil;
+    AGIPCAlbumsController *rootViewController = nil;
     if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
         rootViewController = [[AGIPCAlbumsController alloc] initWithNibName:@"AGIPCAlbumsController_iPhone" bundle:nil];
     } else {
         rootViewController = [[AGIPCAlbumsController alloc] initWithNibName:@"AGIPCAlbumsController_iPad" bundle:nil];
     }
+    rootViewController.savedPhotosOnTop = shouldShowSavedPhotosOnTop;
     self.viewControllers = [NSArray arrayWithObject:rootViewController];
     [rootViewController release];
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,5 +19,6 @@ @@
     }
     @property (retain) IBOutlet UITableView *tableView;
+    @property (assign) BOOL savedPhotosOnTop;
     @end