[BottomAppBar] Fix bottom app bar animation for leading and trailing …

…states. (#2036) * Fix bottom app bar animation * Update file comments to correct year * [BottomAppBar] Fix bottom app bar animation for leading and trailing states
material-components · Sep 25, 2017 · e0ce854 · e0ce854
1 parent e68fee2
commit e0ce854
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/components/BottomAppBar/src/private/MDCBottomAppBarLayer.m b/components/BottomAppBar/src/private/MDCBottomAppBarLayer.m
@@ -216,14 +216,15 @@ - (CGPathRef)pathWithoutCutFromRect:(CGRect)rect
 - (UIBezierPath *)pathWithoutCutLeft:(UIBezierPath *)bottomBarPath
                                width:(CGFloat)width
                               height:(CGFloat)height {
+  CGFloat offsetRadiusDiff = kMDCBottomAppBarYOffset - kMDCBottomAppBarFloatingButtonRadius;
   [bottomBarPath moveToPoint:CGPointMake(0, kMDCBottomAppBarYOffset)];
   [bottomBarPath addLineToPoint:CGPointMake(kMDCBottomAppBarFloatingButtonPositionX -
-                                            kMDCBottomAppBarFloatingButtonRadius,
+                                            offsetRadiusDiff,
                                             kMDCBottomAppBarYOffset)];
   [bottomBarPath addLineToPoint:CGPointMake(kMDCBottomAppBarFloatingButtonPositionX,
                                             kMDCBottomAppBarYOffset)];
   [bottomBarPath addLineToPoint:CGPointMake(kMDCBottomAppBarFloatingButtonPositionX +
-                                            kMDCBottomAppBarFloatingButtonRadius,
+                                            offsetRadiusDiff,
                                             kMDCBottomAppBarYOffset)];
   [bottomBarPath addLineToPoint:CGPointMake(width, kMDCBottomAppBarYOffset)];
   [bottomBarPath addLineToPoint:CGPointMake(width, height * 2 + kMDCBottomAppBarYOffset)];
@@ -235,14 +236,15 @@ - (UIBezierPath *)pathWithoutCutLeft:(UIBezierPath *)bottomBarPath
 - (UIBezierPath *)pathWithoutCutRight:(UIBezierPath *)bottomBarPath
                                 width:(CGFloat)width
                                height:(CGFloat)height {
+  CGFloat offsetRadiusDiff = kMDCBottomAppBarYOffset - kMDCBottomAppBarFloatingButtonRadius;
   [bottomBarPath moveToPoint:CGPointMake(0, kMDCBottomAppBarYOffset)];
   [bottomBarPath addLineToPoint:CGPointMake(width - kMDCBottomAppBarFloatingButtonPositionX -
-                                            kMDCBottomAppBarFloatingButtonRadius,
+                                            offsetRadiusDiff,
                                             kMDCBottomAppBarYOffset)];
   [bottomBarPath addLineToPoint:CGPointMake(width - kMDCBottomAppBarFloatingButtonPositionX,
                                             kMDCBottomAppBarYOffset)];
   [bottomBarPath addLineToPoint:CGPointMake(width - kMDCBottomAppBarFloatingButtonPositionX +
-                                            kMDCBottomAppBarFloatingButtonRadius,
+                                            offsetRadiusDiff,
                                             kMDCBottomAppBarYOffset)];
   [bottomBarPath addLineToPoint:CGPointMake(width, kMDCBottomAppBarYOffset)];
   [bottomBarPath addLineToPoint:CGPointMake(width, height * 2 + kMDCBottomAppBarYOffset)];