Fix selector background if not provided, and fix warnings

nighthawk · Jul 31, 2020 · ffee2b1 · ffee2b1
1 parent 689af44
commit ffee2b1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/Classes/ASDaySelectionView.m b/Classes/ASDaySelectionView.m
@@ -25,6 +25,7 @@ - (void)drawRect:(CGRect)rect
     CGContextSetStrokeColorWithColor(context, self.circleColor.CGColor);
     CGContextStrokeEllipseInRect(context, circleRect);
   }
+
 }
 
 #pragma mark - Private helpers

diff --git a/Classes/ASWeekSelectorView.m b/Classes/ASWeekSelectorView.m
@@ -84,7 +84,9 @@ - (void)setSelectedDate:(NSDate *)selectedDate animated:(BOOL)animated
                      completion:
      ^(BOOL finished) {
        self.isAnimating = NO;
-       [self colorLabelForDate:selectedDate withTextColor:self.selectorLetterTextColor];
+       if (finished) {
+         [self colorLabelForDate:selectedDate withTextColor:self.selectorLetterTextColor];
+       }
      }];
   }
 }
@@ -95,7 +97,8 @@ - (void)setLocale:(NSLocale *)locale
   [self updateDateFormatters];
 }
 
-- (void)refresh {
+- (void)refresh
+{
   [self rebuildWeeks];
 }
 
@@ -181,7 +184,7 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
   }
 
   // prevent horizontal scrolling
-  if (offset.y != 0) {
+  if (fabs(offset.y) > 0.01) {
     offset.y = 0;
     updatedOffset = YES;
   }
@@ -342,7 +345,9 @@ - (void)singleWeekView:(ASSingleWeekView *)singleWeekView didSelectDate:(NSDate
    }
                    completion:
    ^(BOOL finished) {
-     [self userDidSelectDate:date];
+    if (finished) {
+      [self userDidSelectDate:date];
+    }
    }];
 }
 
@@ -425,7 +430,7 @@ - (void)rebuildWeeks
 
   // determine where the start of the previews week was as that'll be our start date
   NSDateComponents *component = [self.gregorian components:NSCalendarUnitWeekday fromDate:self.selectedDate];
-  NSInteger weekday = [component weekday];
+  NSUInteger weekday = (NSUInteger) [component weekday];
   NSInteger daysToSubtract;
   if (weekday == self.firstWeekday) {
     daysToSubtract = 0;
@@ -513,7 +518,9 @@ - (void)animateSelectionToPreDrag
      ^{
        self.selectionView.frame = selectionViewFrame;
      } completion:^(BOOL finished) {
-       [self colorLabelForDate:self.selectedDate withTextColor:self.selectorLetterTextColor];
+       if (finished) {
+         [self colorLabelForDate:self.selectedDate withTextColor:self.selectorLetterTextColor];
+       }
      }];
 
     self.preDragOffsetX = MAXFLOAT;
@@ -557,7 +564,7 @@ - (ASDaySelectionView *)selectionView
     CGFloat height = CGRectGetHeight(self.frame);
 
     ASDaySelectionView *view = [[ASDaySelectionView alloc] initWithFrame:CGRectMake(0, 0, width, height)];
-    view.backgroundColor = self.selectorBackgroundColor;
+    view.backgroundColor = self.selectorBackgroundColor ?: [UIColor clearColor];
     view.fillCircle = YES;
     view.circleCenter = CGPointMake(width / 2, 20 + (height - 20) / 2);
     view.circleColor = self.tintColor;