extract rounded bezier builder

7 years ago · 42da082b01
parent 900abf2367
commit 42da082b01
4 changed files with 79 additions and 96 deletions
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleShapeView.h
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleShapeView.h
@ -30,6 +30,14 @@ NS_ASSUME_NONNULL_BEGIN
 + (OWSBubbleShapeView *)bubbleShadowView;
 + (OWSBubbleShapeView *)bubbleClipView;

+ (UIBezierPath *)roundedBezierRectWithBubbleTop:(CGFloat)bubbleTop
+                                      bubbleLeft:(CGFloat)bubbleLeft
+                                    bubbleBottom:(CGFloat)bubbleBottom
+                                     bubbleRight:(CGFloat)bubbleRight
+                               sharpCornerRadius:(CGFloat)sharpCornerRadius
+                                wideCornerRadius:(CGFloat)wideCornerRadius
+                                    sharpCorners:(UIRectCorner)sharpCorners;
+
@end

 NS_ASSUME_NONNULL_END
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleShapeView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleShapeView.m
@ -193,6 +193,60 @@ typedef NS_ENUM(NSUInteger, OWSBubbleShapeViewMode) {
    [CATransaction commit];
 }

+ (UIBezierPath *)roundedBezierRectWithBubbleTop:(CGFloat)bubbleTop
+                                      bubbleLeft:(CGFloat)bubbleLeft
+                                    bubbleBottom:(CGFloat)bubbleBottom
+                                     bubbleRight:(CGFloat)bubbleRight
+                               sharpCornerRadius:(CGFloat)sharpCornerRadius
+                                wideCornerRadius:(CGFloat)wideCornerRadius
+                                    sharpCorners:(UIRectCorner)sharpCorners
+{
+    UIBezierPath *bezierPath = [UIBezierPath new];
+
+    const CGFloat topLeftRounding = (sharpCorners & UIRectCornerTopLeft) ? sharpCornerRadius : wideCornerRadius;
+    const CGFloat topRightRounding = (sharpCorners & UIRectCornerTopRight) ? sharpCornerRadius : wideCornerRadius;
+
+    const CGFloat bottomRightRounding = (sharpCorners & UIRectCornerBottomRight) ? sharpCornerRadius : wideCornerRadius;
+    const CGFloat bottomLeftRounding = (sharpCorners & UIRectCornerBottomLeft) ? sharpCornerRadius : wideCornerRadius;
+
+    const CGFloat topAngle = 3.0f * M_PI_2;
+    const CGFloat rightAngle = 0.0f;
+    const CGFloat bottomAngle = M_PI_2;
+    const CGFloat leftAngle = M_PI;
+
+    // starting just to the right of the top left corner and working clockwise
+    [bezierPath moveToPoint:CGPointMake(bubbleLeft + topLeftRounding, bubbleTop)];
+
+    // top right corner
+    [bezierPath addArcWithCenter:CGPointMake(bubbleRight - topRightRounding, bubbleTop + topRightRounding)
+                          radius:topRightRounding
+                      startAngle:topAngle
+                        endAngle:rightAngle
+                       clockwise:true];
+
+    // bottom right corner
+    [bezierPath addArcWithCenter:CGPointMake(bubbleRight - bottomRightRounding, bubbleBottom - bottomRightRounding)
+                          radius:bottomRightRounding
+                      startAngle:rightAngle
+                        endAngle:bottomAngle
+                       clockwise:true];
+
+    // bottom left corner
+    [bezierPath addArcWithCenter:CGPointMake(bubbleLeft + bottomLeftRounding, bubbleBottom - bottomLeftRounding)
+                          radius:bottomLeftRounding
+                      startAngle:bottomAngle
+                        endAngle:leftAngle
+                       clockwise:true];
+
+    // top left corner
+    [bezierPath addArcWithCenter:CGPointMake(bubbleLeft + topLeftRounding, bubbleTop + topLeftRounding)
+                          radius:topLeftRounding
+                      startAngle:leftAngle
+                        endAngle:topAngle
+                       clockwise:true];
+    return bezierPath;
+}
+
@end

 NS_ASSUME_NONNULL_END
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m
@ -3,6 +3,7 @@
 //

 #import "OWSBubbleView.h"
+#import "OWSBubbleShapeView.h"
 #import <SignalMessaging/UIView+OWS.h>

 NS_ASSUME_NONNULL_BEGIN
@ -142,57 +143,18 @@ const CGFloat kOWSMessageCellCornerRadius_Small = 4;

    UIBezierPath *bezierPath = [UIBezierPath new];

-    CGFloat bubbleLeft = 0.f;
-    CGFloat bubbleRight = size.width;
    CGFloat bubbleTop = 0.f;
+    CGFloat bubbleLeft = 0.f;
    CGFloat bubbleBottom = size.height;
+    CGFloat bubbleRight = size.width;

-    CGFloat topLeftRounding
-        = (sharpCorners & UIRectCornerTopLeft) ? kOWSMessageCellCornerRadius_Small : kOWSMessageCellCornerRadius_Large;
-    CGFloat topRightRounding
-        = (sharpCorners & UIRectCornerTopRight) ? kOWSMessageCellCornerRadius_Small : kOWSMessageCellCornerRadius_Large;
-    CGFloat bottomRightRounding = (sharpCorners & UIRectCornerBottomRight) ? kOWSMessageCellCornerRadius_Small
-                                                                           : kOWSMessageCellCornerRadius_Large;
-    CGFloat bottomLeftRounding = (sharpCorners & UIRectCornerBottomLeft) ? kOWSMessageCellCornerRadius_Small
-                                                                         : kOWSMessageCellCornerRadius_Large;
-
-    const CGFloat topAngle = 3.0f * M_PI_2;
-    const CGFloat rightAngle = 0.0f;
-    const CGFloat bottomAngle = M_PI_2;
-    const CGFloat leftAngle = M_PI;
-
-    // starting just to the right of the top left corner and working clockwise
-    [bezierPath moveToPoint:CGPointMake(bubbleLeft + topLeftRounding, bubbleTop)];
-
-    // top right corner
-    [bezierPath addArcWithCenter:CGPointMake(bubbleRight - topRightRounding, bubbleTop + topRightRounding)
-                          radius:topRightRounding
-                      startAngle:topAngle
-                        endAngle:rightAngle
-                       clockwise:true];
-
-    // bottom right corner
-    [bezierPath addArcWithCenter:CGPointMake(bubbleRight - bottomRightRounding, bubbleBottom - bottomRightRounding)
-                          radius:bottomRightRounding
-                      startAngle:rightAngle
-                        endAngle:bottomAngle
-                       clockwise:true];
-
-    // bottom left corner
-    [bezierPath addArcWithCenter:CGPointMake(bubbleLeft + bottomLeftRounding, bubbleBottom - bottomLeftRounding)
-                          radius:bottomLeftRounding
-                      startAngle:bottomAngle
-                        endAngle:leftAngle
-                       clockwise:true];
-
-    // top left corner
-    [bezierPath addArcWithCenter:CGPointMake(bubbleLeft + topLeftRounding, bubbleTop + topLeftRounding)
-                          radius:topLeftRounding
-                      startAngle:leftAngle
-                        endAngle:topAngle
-                       clockwise:true];
-
-    return bezierPath;
+    return [OWSBubbleShapeView roundedBezierRectWithBubbleTop:bubbleTop
+                                                   bubbleLeft:bubbleLeft
+                                                 bubbleBottom:bubbleBottom
+                                                  bubbleRight:bubbleRight
+                                            sharpCornerRadius:kOWSMessageCellCornerRadius_Small
+                                             wideCornerRadius:kOWSMessageCellCornerRadius_Large
+                                                 sharpCorners:sharpCorners];
 }

 #pragma mark - Coordination
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
@ -158,8 +158,6 @@ NS_ASSUME_NONNULL_BEGIN
        layoutCallback:^(UIView *layerView) {
            CGRect layerFrame = layerView.bounds;

-            UIBezierPath *bezierPath = [UIBezierPath new];
-
            const CGFloat bubbleLeft = 0.f;
            const CGFloat bubbleRight = layerFrame.size.width;
            const CGFloat bubbleTop = 0.f;
@ -168,52 +166,13 @@ NS_ASSUME_NONNULL_BEGIN
            const CGFloat sharpCornerRadius = 4;
            const CGFloat wideCornerRadius = 10;

-            const CGFloat topLeftRounding = (sharpCorners & UIRectCornerTopLeft) ? sharpCornerRadius : wideCornerRadius;
-            const CGFloat topRightRounding
-                = (sharpCorners & UIRectCornerTopRight) ? sharpCornerRadius : wideCornerRadius;
-
-            const CGFloat bottomRightRounding
-                = (sharpCorners & UIRectCornerBottomRight) ? sharpCornerRadius : wideCornerRadius;
-            const CGFloat bottomLeftRounding
-                = (sharpCorners & UIRectCornerBottomLeft) ? sharpCornerRadius : wideCornerRadius;
-
-            const CGFloat topAngle = 3.0f * M_PI_2;
-            const CGFloat rightAngle = 0.0f;
-            const CGFloat bottomAngle = M_PI_2;
-            const CGFloat leftAngle = M_PI;
-
-            // starting just to the right of the top left corner and working clockwise
-            [bezierPath moveToPoint:CGPointMake(bubbleLeft + topLeftRounding, bubbleTop)];
-
-
-            // top right corner
-            [bezierPath addArcWithCenter:CGPointMake(bubbleRight - topRightRounding, bubbleTop + topRightRounding)
-                                  radius:topRightRounding
-                              startAngle:topAngle
-                                endAngle:rightAngle
-                               clockwise:true];
-
-            // bottom right corner
-            [bezierPath
-                addArcWithCenter:CGPointMake(bubbleRight - bottomRightRounding, bubbleBottom - bottomRightRounding)
-                          radius:bottomRightRounding
-                      startAngle:rightAngle
-                        endAngle:bottomAngle
-                       clockwise:true];
-
-            // bottom left corner
-            [bezierPath addArcWithCenter:CGPointMake(bubbleLeft + bottomLeftRounding, bubbleBottom - bottomLeftRounding)
-                                  radius:bottomLeftRounding
-                              startAngle:bottomAngle
-                                endAngle:leftAngle
-                               clockwise:true];
-
-            // top left corner
-            [bezierPath addArcWithCenter:CGPointMake(bubbleLeft + topLeftRounding, bubbleTop + topLeftRounding)
-                                  radius:topLeftRounding
-                              startAngle:leftAngle
-                                endAngle:topAngle
-                               clockwise:true];
+            UIBezierPath *bezierPath = [OWSBubbleShapeView roundedBezierRectWithBubbleTop:bubbleTop
+                                                                               bubbleLeft:bubbleLeft
+                                                                             bubbleBottom:bubbleBottom
+                                                                              bubbleRight:bubbleRight
+                                                                        sharpCornerRadius:sharpCornerRadius
+                                                                         wideCornerRadius:wideCornerRadius
+                                                                             sharpCorners:sharpCorners];

            maskLayer.path = bezierPath.CGPath;
        }];