File tree 2 files changed +6
-6
lines changed
lib/java/com/google/android/material/bottomappbar
2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -551,7 +551,7 @@ boolean setFabDiameter(@Px int diameter) {
551
551
return false ;
552
552
}
553
553
554
- void setFabCornerSize (@ Px int radius ) {
554
+ void setFabCornerSize (@ Dimension float radius ) {
555
555
if (radius != getTopEdgeTreatment ().getFabCornerRadius ()) {
556
556
getTopEdgeTreatment ().setFabCornerSize (radius );
557
557
materialShapeDrawable .invalidateSelf ();
@@ -1036,7 +1036,7 @@ public void onLayoutChange(
1036
1036
child .setFabDiameter (height );
1037
1037
1038
1038
// Assume symmetrical corners
1039
- int cornerSize = ( int ) fab .getShapeAppearanceModel ().getTopLeftCornerSize ()
1039
+ float cornerSize = fab .getShapeAppearanceModel ().getTopLeftCornerSize ()
1040
1040
.getCornerSize (new RectF (fabContentRect ));
1041
1041
1042
1042
child .setFabCornerSize (cornerSize );
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ public class BottomAppBarTopEdgeTreatment extends EdgeTreatment implements Clone
50
50
private float fabDiameter ;
51
51
private float cradleVerticalOffset ;
52
52
private float horizontalOffset ;
53
- private int fabCornerSize = -1 ;
53
+ private float fabCornerSize = -1f ;
54
54
55
55
/**
56
56
* @param fabMargin the margin in pixels between the cutout and the fab.
@@ -101,7 +101,7 @@ public void getEdgePath(
101
101
// Calculate the X distance between the center of the two adjacent circles using pythagorean
102
102
// theorem.
103
103
float cornerSize = fabCornerSize * interpolation ;
104
- boolean useCircleCutout = fabCornerSize == -1 || abs (fabCornerSize * 2 - fabDiameter ) < .1f ;
104
+ boolean useCircleCutout = fabCornerSize == -1 || abs (fabCornerSize * 2f - fabDiameter ) < .1f ;
105
105
float arcOffset = 0 ;
106
106
if (!useCircleCutout ) {
107
107
verticalOffset = 0 ;
@@ -251,11 +251,11 @@ void setFabCradleRoundedCornerRadius(float roundedCornerRadius) {
251
251
this .roundedCornerRadius = roundedCornerRadius ;
252
252
}
253
253
254
- public int getFabCornerRadius () {
254
+ public float getFabCornerRadius () {
255
255
return fabCornerSize ;
256
256
}
257
257
258
- public void setFabCornerSize (int size ) {
258
+ public void setFabCornerSize (float size ) {
259
259
this .fabCornerSize = size ;
260
260
}
261
261
}
You can’t perform that action at this time.
0 commit comments