Refactor checkPoint:inArray method

maximbilan · Nov 21, 2017 · 2cff4bc · 2cff4bc
1 parent efd89f0
commit 2cff4bc
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/ios_calendar/Sources/CalendarView.m b/ios_calendar/Sources/CalendarView.m
@@ -1065,15 +1065,22 @@ - (void)doubleTap:(UITapGestureRecognizer *)recognizer
 
 #pragma mark - Additional functions
 
-- (BOOL)checkPoint:(CGPoint)point inArray:(NSMutableArray *)array andSetValue:(NSInteger *)value
-{
+- (BOOL)checkPoint:(CGPoint)point inArray:(NSMutableArray *)array andSetValue:(NSInteger *)value{
+    CalendarViewRect *rect = [self checkPoint:point inArray:array];
+    if (!rect) {
+        return NO;
+    }
+    *value = rect.value;
+    return YES;
+}
+
+- (CalendarViewRect *)checkPoint:(CGPoint)point inArray:(NSMutableArray *)array{
     for (CalendarViewRect *rect in array) {
         if (CGRectContainsPoint(rect.frame, point)) {
-            *value = rect.value;
-            return YES;
+            return rect;
         }
     }
-    return NO;
+    return nil;
 }
 
 - (NSDictionary *)generateAttributes:(NSString *)fontName withFontSize:(CGFloat)fontSize withColor:(UIColor *)color withAlignment:(NSTextAlignment)textAlignment