Fix application badge removal

studioamanga · May 29, 2013 · 478e274 · 478e274
1 parent 4ee367b
commit 478e274
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/client-ios/MyTee/Classes/MTEMyTeeAPIClient.m b/client-ios/MyTee/Classes/MTEMyTeeAPIClient.m
@@ -95,7 +95,7 @@ - (NSDictionary *)attributesForRepresentation:(NSDictionary *)representation
     }
     if ([entity.name isEqualToString:@"MTEWear"] || [entity.name isEqualToString:@"MTEWash"])
     {
-        NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+        NSDateFormatter *formatter = [NSDateFormatter new];
         formatter.dateFormat = @"yyyy-MM-dd";
         if ([representation[@"date"] isKindOfClass:[NSString class]])
             mutablePropertyValues[@"date"] = [formatter dateFromString:representation[@"date"]];
@@ -108,7 +108,9 @@ - (NSDictionary *)representationsForRelationshipsFromRepresentation:(NSDictionar
                                                            ofEntity:(NSEntityDescription *)entity
                                                        fromResponse:(NSHTTPURLResponse *)response
 {
-    NSMutableDictionary *mutableRepresentations = [[super representationsForRelationshipsFromRepresentation:representation ofEntity:entity fromResponse:response] mutableCopy];
+    NSMutableDictionary *mutableRepresentations = [[super representationsForRelationshipsFromRepresentation:representation
+                                                                                                   ofEntity:entity
+                                                                                               fromResponse:response] mutableCopy];
 
     if ([entity.name isEqualToString:@"MTETShirt"])
     {

diff --git a/client-ios/MyTee/Classes/MTETShirtExplorer.m b/client-ios/MyTee/Classes/MTETShirtExplorer.m
@@ -20,6 +20,7 @@ @interface MTETShirtExplorer () <NSFetchedResultsControllerDelegate>
 @property (strong, nonatomic) NSFetchedResultsController *fetchedResultsController;
 
 - (void)filterFetchedObjects;
+- (void)clearBadgeIfNecessary;
 
 @end
 
@@ -81,9 +82,24 @@ - (void)filterFetchedObjects
     else
         self.fetchedTShirts = self.fetchedResultsController.fetchedObjects;
 
+    [self clearBadgeIfNecessary];
+
     return;
 }
 
+- (void)clearBadgeIfNecessary
+{
+    NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"MTEWear"];
+    NSCalendar *calendar = [NSCalendar currentCalendar];
+    NSDateComponents *components = [calendar components:(NSYearCalendarUnit | NSMonthCalendarUnit |  NSDayCalendarUnit)
+                                               fromDate:[NSDate date]];
+    NSDate *thisMorning = [calendar dateFromComponents:components];
+    fetchRequest.predicate = [NSPredicate predicateWithFormat:@"date > %@", thisMorning];
+    NSUInteger countOfWearToday = [self.fetchedResultsController.managedObjectContext countForFetchRequest:fetchRequest error:nil];
+    if (countOfWearToday > 0)
+        [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
+}
+
 - (NSUInteger)numberOfTShirts
 {
     return [self.fetchedTShirts count];

diff --git a/client-ios/MyTee/Classes/MTETShirtViewController.m b/client-ios/MyTee/Classes/MTETShirtViewController.m
@@ -50,16 +50,16 @@ @implementation MTETShirtViewController
 
 - (void)setTshirt:(MTETShirt *)newTShirt
 {
-    if (_tshirt != newTShirt) {
+    if (_tshirt != newTShirt)
+    {
         _tshirt = newTShirt;
 
         // Update the view.
         [self configureView];
     }
 
-    if (self.masterPopoverController != nil) {
+    if (self.masterPopoverController != nil)
         [self.masterPopoverController dismissPopoverAnimated:YES];
-    }
 }
 
 - (void)configureView