iOS: Changed returning image order: images are now ordered in the sa…

src/ios/ELCImagePicker/ELCAsset.h

@@ -23,7 +23,8 @@
 @property (nonatomic, strong) ALAsset *asset;
 @property (nonatomic, weak) id<ELCAssetDelegate> parent;
 @property (nonatomic, assign) BOOL selected;
+@property (nonatomic,assign) double index;
 
 - (id)initWithAsset:(ALAsset *)asset;
-
+- (NSComparisonResult)compareWithIndex:(ELCAsset *)_ass;
 @end

src/ios/ELCImagePicker/ELCAsset.m

@@ -44,6 +44,18 @@ - (void)setSelected:(BOOL)selected
     }
 }
 
+- (NSComparisonResult)compareWithIndex:(ELCAsset *)_ass
+{
+    if (self.index > _ass.index) {
+        return NSOrderedDescending;
+    }
+    else if (self.index < _ass.index)
+    {
+        return NSOrderedAscending;
+    }
+    return NSOrderedSame;
+}
+
 
 @end
 

src/ios/ELCImagePicker/ELCAssetCell.m

@@ -85,6 +85,7 @@ - (void)cellTapped:(UITapGestureRecognizer *)tapRecognizer
         if (CGRectContainsPoint(frame, point)) {
             ELCAsset *asset = [_rowAssets objectAtIndex:i];
             asset.selected = !asset.selected;
+            asset.index = CACurrentMediaTime();
             UIImageView *overlayView = [_overlayViewArray objectAtIndex:i];
             overlayView.hidden = !asset.selected;
             break;

src/ios/ELCImagePicker/ELCAssetTablePicker.m

@@ -26,7 +26,7 @@ - (id)init
     if (self) {
         //Sets a reasonable default bigger then 0 for columns
         //So that we don't have a divide by 0 scenario
-        self.columns = 4;
+        self.columns = 10;
     }
     return self;
 }
@@ -38,13 +38,13 @@ - (void)viewDidLoad
 
     NSMutableArray *tempArray = [[NSMutableArray alloc] init];
     self.elcAssets = tempArray;
-	
+
     if (self.immediateReturn) {
-        
+
     } else {
         UIBarButtonItem *doneButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(doneAction:)];
         [self.navigationItem setRightBarButtonItem:doneButtonItem];
-        [self.navigationItem setTitle:@"Loading..."];
+        [self.navigationItem setTitle:@"Lade..."];
     }
 
 	[self performSelectorInBackground:@selector(preparePhotos) withObject:nil];
@@ -53,7 +53,8 @@ - (void)viewDidLoad
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    self.columns = self.view.bounds.size.width / 80;
+    //self.columns = self.view.bounds.size.width / 80;
+
 }
 
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
@@ -64,7 +65,7 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfa
 - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
 {
     [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
-    self.columns = self.view.bounds.size.width / 80;
+    //self.columns = self.view.bounds.size.width / 80;
     [self.tableView reloadData];
 }
 
@@ -73,14 +74,14 @@ - (void)preparePhotos
     @autoreleasepool {
 
         [self.assetGroup enumerateAssetsUsingBlock:^(ALAsset *result, NSUInteger index, BOOL *stop) {
-            
+
             if (result == nil) {
                 return;
             }
 
             ELCAsset *elcAsset = [[ELCAsset alloc] initWithAsset:result];
             [elcAsset setParent:self];
-            
+
             BOOL isAssetFiltered = NO;
             if (self.assetPickerFilterDelegate &&
                [self.assetPickerFilterDelegate respondsToSelector:@selector(assetTablePicker:isAssetFilteredOut:)])
@@ -106,21 +107,35 @@ - (void)preparePhotos
                                               atScrollPosition:UITableViewScrollPositionBottom
                                                       animated:NO];
             }
-            
-            [self.navigationItem setTitle:self.singleSelection ? @"Pick Photo" : @"Pick Photos"];
+
+            [self.navigationItem setTitle:self.singleSelection ? @"Selektiere ein Foto" : @"Selektiere Fotos"];
         });
     }
 }
 
+
 - (void)doneAction:(id)sender
-{	
+{
+
+    	NSMutableArray *temp = [[NSMutableArray alloc] init];
+    for (ELCAsset *elcAsset in self.elcAssets) {
+        if ([elcAsset selected]) {
+
+           [temp addObject:elcAsset];
+        }
+    }
+ [temp sortUsingSelector:@selector(compareWithIndex:)];
+
 	NSMutableArray *selectedAssetsImages = [[NSMutableArray alloc] init];
-	    
-	for (ELCAsset *elcAsset in self.elcAssets) {
+
+	for (ELCAsset *elcAsset in temp) {
 		if ([elcAsset selected]) {
 			[selectedAssetsImages addObject:[elcAsset asset]];
+          	//[selectedAssetsImages addObject:elcAsset];
 		}
 	}
+
+
     [self.parent selectedAssets:selectedAssetsImages];
 }
 
@@ -166,7 +181,7 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
     if (self.columns <= 0) { //Sometimes called before we know how many columns we have
-        self.columns = 4;
+        self.columns = 10;
     }
     NSInteger numRows = ceil([self.elcAssets count] / (float)self.columns);
     return numRows;
@@ -181,17 +196,17 @@ - (NSArray *)assetsForIndexPath:(NSIndexPath *)path
 
 // Customize the appearance of table view cells.
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{    
+{
     static NSString *CellIdentifier = @"Cell";
-        
+
     ELCAssetCell *cell = (ELCAssetCell*)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
 
-    if (cell == nil) {		        
+    if (cell == nil) {
         cell = [[ELCAssetCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier];
     }
-    
+
     [cell setAssets:[self assetsForIndexPath:indexPath]];
-    
+
     return cell;
 }
 
@@ -203,13 +218,13 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
 - (int)totalSelectedAssets
 {
     int count = 0;
-    
+
     for (ELCAsset *asset in self.elcAssets) {
 		if (asset.selected) {
-            count++;	
+            count++;
 		}
 	}
-    
+
     return count;
 }