Add option to sort events by startDate instead of endDate

iBurnApp · Aug 19, 2014 · d376af8 · d376af8
1 parent 845240b
commit d376af8
Show file tree

Hide file tree

Showing 8 changed files with 113 additions and 20 deletions.
diff --git a/iBurn/BRCDatabaseManager.m b/iBurn/BRCDatabaseManager.m
@@ -179,6 +179,7 @@ + (NSComparisonResult) compareDistanceOfFirstObject:(BRCDataObject*)object1 seco
 + (YapDatabaseViewSortingBlock)sortingBlockForClass:(Class)viewClass extensionType:(BRCDatabaseViewExtensionType)extensionType fromLocation:(CLLocation*)fromLocation {
     YapDatabaseViewSortingBlock sortingBlock;
     if (extensionType == BRCDatabaseViewExtensionTypeTimeThenDistance) {
+        BOOL shouldSortEventsByStartTime = [[NSUserDefaults standardUserDefaults] shouldSortEventsByStartTime];
         sortingBlock = ^(NSString *group, NSString *collection1, NSString *key1, id obj1,
                          NSString *collection2, NSString *key2, id obj2){
             if ([obj1 isKindOfClass:[BRCEventObject class]] && [obj2 isKindOfClass:[BRCEventObject class]]) {
@@ -191,8 +192,12 @@ + (YapDatabaseViewSortingBlock)sortingBlockForClass:(Class)viewClass extensionTy
                 else if (!event1.isAllDay && event2.isAllDay) {
                     return NSOrderedAscending;
                 }
-
-                NSComparisonResult dateComparison = [event1.endDate compare:event2.endDate];
+                NSComparisonResult dateComparison = NSOrderedSame;
+                if (shouldSortEventsByStartTime) {
+                    dateComparison = [event1.startDate compare:event2.startDate];
+                } else {
+                    dateComparison = [event1.endDate compare:event2.endDate];
+                }
                 if (dateComparison == NSOrderedSame) {
                     NSComparisonResult distanceComparison = [self compareDistanceOfFirstObject:event1 secondObject:event2 fromLocation:fromLocation];
                     return distanceComparison;

diff --git a/iBurn/BRCEventsFilterTableViewController.h b/iBurn/BRCEventsFilterTableViewController.h
@@ -11,9 +11,9 @@
 @class BRCEventsFilterTableViewController;
 
 @protocol BRCEventsFilterTableViewControllerDelegate <NSObject>
-
+@required
 - (void)didSetNewFilterSettingsInFilterTableViewController:(BRCEventsFilterTableViewController *)viewController;
-
+- (void)didSetNewSortSettingsInFilterTableViewController:(BRCEventsFilterTableViewController *)viewController;
 @end
 
 @interface BRCEventsFilterTableViewController : UIViewController

diff --git a/iBurn/BRCEventsFilterTableViewController.m b/iBurn/BRCEventsFilterTableViewController.m
@@ -45,6 +45,7 @@ @interface BRCEventsFilterTableViewController () <UITableViewDelegate, UITableVi
 @property (nonatomic, strong) NSArray *eventTypeArray;
 
 @property (nonatomic) BOOL showExpiredEvents;
+@property (nonatomic) BOOL shouldSortEventsByStartTime;
 
 @property (nonatomic, strong) YapDatabaseConnection* databaseConnection;
 
@@ -81,9 +82,10 @@ - (void)viewDidLoad
 
     [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:BRCFilterTableViewCellIdentifier];
 
-    self.timeStrings = @[@"Show Expired Events"];
+    self.timeStrings = @[@"Show Expired Events", @"Sort Events by Start Time"];
 
     self.showExpiredEvents = [[NSUserDefaults standardUserDefaults] showExpiredEvents];
+    self.shouldSortEventsByStartTime = [[NSUserDefaults standardUserDefaults] shouldSortEventsByStartTime];
 
     //All the event types to select from
     NSArray *eventTypes = @[@(BRCEventTypeWorkshop),
@@ -130,9 +132,17 @@ - (void)viewWillDisappear:(BOOL)animated
     [[NSUserDefaults standardUserDefaults] setSelectedEventTypes:filteredArray];
     [[NSUserDefaults standardUserDefaults] setShowExpiredEvents:self.showExpiredEvents];
 
-    if ([self.delegate respondsToSelector:@selector(didSetNewFilterSettingsInFilterTableViewController:)]) {
-        [self.delegate didSetNewFilterSettingsInFilterTableViewController:self];
+    BOOL didChangeSort = NO;
+    BOOL oldShouldSortEventsByStartTime = [[NSUserDefaults standardUserDefaults] shouldSortEventsByStartTime];
+    if (self.shouldSortEventsByStartTime != oldShouldSortEventsByStartTime) {
+        didChangeSort = YES;
     }
+    [[NSUserDefaults standardUserDefaults] setShouldSortEventsByStartTime:self.shouldSortEventsByStartTime];
+    if (didChangeSort) {
+        [self.delegate didSetNewSortSettingsInFilterTableViewController:self];
+    }
+
+    [self.delegate didSetNewFilterSettingsInFilterTableViewController:self];    
 }
 
 - (NSArray *)filteredTypes
@@ -168,9 +178,11 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
     BOOL showCheckMark = NO;
     if (indexPath.section == 0) {
-
-        showCheckMark = self.showExpiredEvents;
-
+        if (indexPath.row == 0) {
+            showCheckMark = self.showExpiredEvents;
+        } else if (indexPath.row == 1) {
+            showCheckMark = self.shouldSortEventsByStartTime;
+        }
         NSString *text = self.timeStrings[indexPath.row];
         cell.textLabel.text = text;
 
@@ -213,7 +225,11 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     if (indexPath.section == 0) {
-       self.showExpiredEvents = !self.showExpiredEvents;
+        if (indexPath.row == 0) {
+            self.showExpiredEvents = !self.showExpiredEvents;
+        } else if (indexPath.row == 1) {
+            self.shouldSortEventsByStartTime = !self.shouldSortEventsByStartTime;
+        }
     }
     else if (indexPath.section == 1) {
         BRCEventTypeContainer *container = self.eventTypeArray[indexPath.row];

diff --git a/iBurn/BRCEventsTableViewController.m b/iBurn/BRCEventsTableViewController.m
@@ -29,7 +29,7 @@ @interface BRCEventsTableViewController () <BRCEventsFilterTableViewControllerDe
 @property (nonatomic, strong, readwrite) NSString *filteredByDayDistanceViewName;
 @property (nonatomic, strong, readwrite) NSString *filteredDistanceViewName;
 @property (nonatomic, strong, readwrite) NSString *favoritesFilterForTimeAndDistanceViewName;
-
+@property (nonatomic) BOOL isRefreshingEventTimeSort;
 @property (nonatomic, strong) BRCStringPickerView *dayPicker;
 @end
 
@@ -153,7 +153,7 @@ - (void) setupDayPicker {
     self.dayPicker = [[BRCStringPickerView alloc] initWithTitle:@"Choose a Day" pickerStrings:self.dayPickerRowTitles initialSelection:currentSelection doneBlock:^(BRCStringPickerView *picker, NSUInteger selectedIndex, NSString *selectedValue) {
         NSDate *selectedDate = [self dateForIndex:selectedIndex];
         self.selectedDay = selectedDate;
-        [self refreshDistanceInformationFromLocation:self.locationManager.location];
+        [self refreshDistanceInformationFromLocation:self.locationManager.location forceRefresh:NO];
     } cancelBlock:nil];
 }
 
@@ -260,6 +260,49 @@ - (void) replaceTimeBasedEventMappings {
     }];
 }
 
+- (BOOL) shouldAnimateLoadingIndicator {
+    BOOL shouldAnimate = [super shouldAnimateLoadingIndicator];
+    if (shouldAnimate || self.isRefreshingEventTimeSort) {
+        return YES;
+    } else {
+        return NO;
+    }
+}
+
+- (void) setIsRefreshingEventTimeSort:(BOOL)isRefreshingEventTimeSort {
+    _isRefreshingEventTimeSort = isRefreshingEventTimeSort;
+    [self refreshLoadingIndicatorViewAnimation];
+}
+
+- (void) refreshEventTimeSort {
+    if (self.isRefreshingEventTimeSort) {
+        return;
+    }
+    self.isRefreshingEventTimeSort = YES;
+
+    // Refresh the distance view sorting block here
+
+    [[BRCDatabaseManager sharedInstance].readWriteDatabaseConnection asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+        YapDatabaseViewTransaction *viewTransaction = [transaction ext:self.timeAndDistanceViewName];
+        if (!viewTransaction) {
+            return;
+        }
+        BRCDatabaseViewExtensionType extensionType = BRCDatabaseViewExtensionTypeTimeThenDistance;
+        Class viewClass = self.viewClass;
+        YapDatabaseViewGroupingBlock groupingBlock = [BRCDatabaseManager groupingBlockForClass:viewClass extensionType:extensionType];
+        YapDatabaseViewBlockType groupingBlockType = [BRCDatabaseManager groupingBlockTypeForClass:viewClass extensionType:extensionType];
+        YapDatabaseViewSortingBlock sortingBlock = [BRCDatabaseManager sortingBlockForClass:viewClass extensionType:extensionType fromLocation:self.locationManager.location];
+        YapDatabaseViewBlockType sortingBlockType = [BRCDatabaseManager sortingBlockTypeForClass:viewClass extensionType:extensionType];
+        [viewTransaction setGroupingBlock:groupingBlock groupingBlockType:groupingBlockType sortingBlock:sortingBlock sortingBlockType:sortingBlockType versionTag:[[NSUUID UUID] UUIDString]];
+    } completionBlock:^{
+        [self updateAllMappingsWithCompletionBlock:^{
+            [self.tableView reloadData];
+            self.isRefreshingEventTimeSort = NO;
+        }];
+    }];
+}
+
+
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     BRCEventObjectTableViewCell *cell = (BRCEventObjectTableViewCell*)[super tableView:tableView cellForRowAtIndexPath:indexPath];
@@ -274,4 +317,9 @@ - (void)didSetNewFilterSettingsInFilterTableViewController:(BRCEventsFilterTable
     [self updateFilteredViews];
 }
 
+- (void)didSetNewSortSettingsInFilterTableViewController:(BRCEventsFilterTableViewController *)viewController
+{
+    [self refreshEventTimeSort];
+}
+
 @end
diff --git a/iBurn/BRCFilteredTableViewController.m b/iBurn/BRCFilteredTableViewController.m
@@ -98,7 +98,7 @@ - (instancetype)initWithViewClass:(Class)viewClass
         [self registerDatabaseExtensions];
         [self setupMappingsDictionary];
         [self updateAllMappingsWithCompletionBlock:nil];
-        [self refreshDistanceInformationFromLocation:self.locationManager.location];
+        [self refreshDistanceInformationFromLocation:self.locationManager.location forceRefresh:NO];
     }
     return self;
 }
@@ -125,8 +125,16 @@ - (void) setupLoadingIndicatorView {
     self.navigationItem.rightBarButtonItem = loadingButtonItem;
 }
 
-- (void) refreshLoadingIndicatorViewAnimation {
+- (BOOL) shouldAnimateLoadingIndicator {
     if (self.isUpdatingDistanceInformation || self.isUpdatingFilters) {
+        return YES;
+    } else {
+        return NO;
+    }
+}
+
+- (void) refreshLoadingIndicatorViewAnimation {
+    if ([self shouldAnimateLoadingIndicator]) {
         [self.loadingIndicatorView startAnimating];
     } else {
         [self.loadingIndicatorView stopAnimating];
@@ -238,7 +246,7 @@ - (void) updateAllMappingsWithCompletionBlock:(dispatch_block_t)completionBlock
 
 - (void) viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    [self refreshDistanceInformationFromLocation:self.locationManager.location];
+    [self refreshDistanceInformationFromLocation:self.locationManager.location forceRefresh:NO];
     self.navBarHairlineImageView.hidden = YES;
 }
 
@@ -259,7 +267,7 @@ - (void) locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArra
     if (!recentLocation) {
         return;
     }
-    [self refreshDistanceInformationFromLocation:recentLocation];
+    [self refreshDistanceInformationFromLocation:recentLocation forceRefresh:NO];
 }
 
 - (void) setIsUpdatingDistanceInformation:(BOOL)isUpdatingDistanceInformation {
@@ -289,11 +297,11 @@ - (BOOL) shouldRefreshDistanceInformationForNewLocation:(CLLocation*)newLocation
     return NO;
 }
 
-- (void) refreshDistanceInformationFromLocation:(CLLocation*)fromLocation {
+- (void) refreshDistanceInformationFromLocation:(CLLocation*)fromLocation forceRefresh:(BOOL)forceRefresh {
     if (self.isUpdatingDistanceInformation) {
         return;
     }
-    if (![self shouldRefreshDistanceInformationForNewLocation:fromLocation]) {
+    if (![self shouldRefreshDistanceInformationForNewLocation:fromLocation] && !forceRefresh) {
         return;
     }
     self.isUpdatingDistanceInformation = YES;

diff --git a/iBurn/BRCFilteredTableViewController_Private.h b/iBurn/BRCFilteredTableViewController_Private.h
@@ -29,8 +29,9 @@
 - (void) setupMappingsDictionary;
 - (void) updateAllMappingsWithCompletionBlock:(dispatch_block_t)completionBlock;
 
+- (BOOL) shouldAnimateLoadingIndicator;
 - (void) refreshLoadingIndicatorViewAnimation;
-- (void) refreshDistanceInformationFromLocation:(CLLocation*)fromLocation;
+- (void) refreshDistanceInformationFromLocation:(CLLocation*)fromLocation forceRefresh:(BOOL)forceRefresh;
 - (BOOL) shouldRefreshDistanceInformationForNewLocation:(CLLocation*)newLocation;
 
 - (NSArray *) segmentedControlInfo;

diff --git a/iBurn/NSUserDefaults+iBurn.h b/iBurn/NSUserDefaults+iBurn.h
@@ -21,6 +21,9 @@ extern NSString *const kBRCGateUnlockNotificationKey;
 - (NSArray *)selectedEventTypes;
 - (void)setSelectedEventTypes:(NSArray *)selectedEventTypes;
 
+- (BOOL)shouldSortEventsByStartTime;
+- (void)setShouldSortEventsByStartTime:(BOOL)shouldSortByStart;
+
 - (BOOL)showExpiredEvents;
 - (void)setShowExpiredEvents:(BOOL)showEpiredEvents;
 

diff --git a/iBurn/NSUserDefaults+iBurn.m b/iBurn/NSUserDefaults+iBurn.m
@@ -13,6 +13,7 @@
 static NSString *const kBRCRecentLocationKey         = @"kBRCRecentLocationKey";
 static NSString *const kBRCEnteredEmbargoPasscodeKey = @"kBRCEnteredEmbargoPasscodeKey";
 NSString *const kBRCGateUnlockNotificationKey = @"kBRCGateUnlockNotificationKey";
+NSString *const kBRCSortEventsByStartTimeKey = @"kBRCSortEventsByStartTimeKey";
 
 
 @implementation NSUserDefaults (iBurn)
@@ -69,6 +70,17 @@ - (void)setShowExpiredEvents:(BOOL)showEpiredEvents
     [self synchronize];
 }
 
+- (BOOL)shouldSortEventsByStartTime
+{
+    return [self boolForKey:kBRCSortEventsByStartTimeKey];
+}
+
+- (void)setShouldSortEventsByStartTime:(BOOL)shouldSortByStart
+{
+    [self setBool:shouldSortByStart forKey:kBRCSortEventsByStartTimeKey];
+    [self synchronize];
+}
+
 - (void) setRecentLocation:(CLLocation *)recentLocation {
     NSData *locationData = [NSKeyedArchiver archivedDataWithRootObject:recentLocation];
     [self setObject:locationData forKey:kBRCRecentLocationKey];