Replace circular border drawable with a drawable for any shape.

PiperOrigin-RevId: 224205053

Author: ymarian

catalog/java/io/material/catalog/application/theme/res/values/styles.xml

@@ -23,10 +23,6 @@
     <item name="navigationIcon">@drawable/ic_close_vd_theme_24px</item>
   </style>
 
-  <style name="Widget.Catalog.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
-    <item name="borderWidth">0dp</item>
-  </style>
-
   <style name="TextAppearance.Catalog.SectionTitle" parent="TextAppearance.AppCompat.Subhead"/>
 
   <style name="TextAppearance.Catalog.Body" parent="TextAppearance.AppCompat.Body1"/>

catalog/java/io/material/catalog/application/theme/res/values/themes.xml

@@ -25,18 +25,15 @@
 
     <item name="catalogToolbarStyle">@style/Widget.Catalog.Toolbar</item>
     <item name="catalogToolbarWithCloseButtonStyle">@style/Widget.Catalog.Toolbar.WithCloseButton</item>
-    <item name="floatingActionButtonStyle">@style/Widget.Catalog.FloatingActionButton</item>
   </style>
 
   <style name="Theme.Catalog.Dark" parent="Theme.MaterialComponents.NoActionBar">
     <item name="catalogToolbarStyle">@style/Widget.Catalog.Toolbar</item>
     <item name="catalogToolbarWithCloseButtonStyle">@style/Widget.Catalog.Toolbar.WithCloseButton</item>
-    <item name="floatingActionButtonStyle">@style/Widget.Catalog.FloatingActionButton</item>
   </style>
 
   <style name="Theme.Catalog.DayNight" parent="Theme.MaterialComponents.DayNight.NoActionBar">
     <item name="catalogToolbarStyle">@style/Widget.Catalog.Toolbar</item>
     <item name="catalogToolbarWithCloseButtonStyle">@style/Widget.Catalog.Toolbar.WithCloseButton</item>
-    <item name="floatingActionButtonStyle">@style/Widget.Catalog.FloatingActionButton</item>
   </style>
 </resources>

…ial/internal/CircularBorderDrawable.java …floatingactionbutton/BorderDrawable.javalib/java/com/google/android/material/internal/CircularBorderDrawable.java renamed to lib/java/com/google/android/material/floatingactionbutton/BorderDrawable.java lib/java/com/google/android/material/internal/CircularBorderDrawable.java renamed to lib/java/com/google/android/material/floatingactionbutton/BorderDrawable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2018 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,72 +14,96 @@
  * limitations under the License.
  */
 
-package com.google.android.material.internal;
+package com.google.android.material.floatingactionbutton;
 
 import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
 
+import android.annotation.TargetApi;
 import android.content.res.ColorStateList;
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.LinearGradient;
+import android.graphics.Outline;
 import android.graphics.Paint;
+import android.graphics.Path;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Shader;
 import android.graphics.drawable.Drawable;
+import android.os.Build.VERSION_CODES;
 import android.support.annotation.ColorInt;
 import android.support.annotation.Dimension;
-import android.support.annotation.FloatRange;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
+import com.google.android.material.shape.ShapeAppearanceModel;
+import com.google.android.material.shape.ShapeAppearancePathProvider;
 import android.support.v4.graphics.ColorUtils;
 
-/** A drawable which draws an oval 'border'. */
+/**
+ * A Drawable that draws borders for {@link FloatingActionButton}
+ *
+ * @hide
+ * */
 @RestrictTo(LIBRARY_GROUP)
-public class CircularBorderDrawable extends Drawable {
+class BorderDrawable extends Drawable {
 
   /**
    * We actually draw the stroke wider than the border size given. This is to reduce any potential
    * transparent space caused by anti-aliasing and padding rounding. This value defines the
    * multiplier used to determine to draw stroke width.
    */
   private static final float DRAW_STROKE_WIDTH_MULTIPLE = 1.3333f;
+  private final ShapeAppearancePathProvider pathProvider = new ShapeAppearancePathProvider();
 
-  final Paint paint;
-  final Rect rect = new Rect();
-  final RectF rectF = new RectF();
-  final CircularBorderState state = new CircularBorderState();
+  private final Paint paint;
+  private final Path shapePath = new Path();
+  private final Rect rect = new Rect();
+  private final RectF rectF = new RectF();
 
   @Dimension float borderWidth;
-
   @ColorInt private int topOuterStrokeColor;
   @ColorInt private int topInnerStrokeColor;
   @ColorInt private int bottomOuterStrokeColor;
   @ColorInt private int bottomInnerStrokeColor;
-
-  private ColorStateList borderTint;
   @ColorInt private int currentBorderTintColor;
 
   private boolean invalidateShader = true;
+  private ColorStateList borderTint;
+  private ShapeAppearanceModel shapeAppearanceModel;
 
-  @FloatRange(from = 0, to = 360)
-  private float rotation;
-
-  public CircularBorderDrawable() {
+  BorderDrawable(ShapeAppearanceModel shapeAppearanceModel) {
+    this.shapeAppearanceModel = shapeAppearanceModel;
     paint = new Paint(Paint.ANTI_ALIAS_FLAG);
     paint.setStyle(Paint.Style.STROKE);
   }
 
-  @Nullable
+  public void setBorderWidth(@Dimension float width) {
+    if (borderWidth != width) {
+      borderWidth = width;
+      paint.setStrokeWidth(width * DRAW_STROKE_WIDTH_MULTIPLE);
+      invalidateShader = true;
+      invalidateSelf();
+    }
+  }
+
+  void setBorderTint(ColorStateList tint) {
+    if (tint != null) {
+      currentBorderTintColor = tint.getColorForState(getState(), currentBorderTintColor);
+    }
+    borderTint = tint;
+    invalidateShader = true;
+    invalidateSelf();
+  }
+
   @Override
-  public ConstantState getConstantState() {
-    return state;
+  public void setColorFilter(ColorFilter colorFilter) {
+    paint.setColorFilter(colorFilter);
+    invalidateSelf();
   }
 
-  public void setGradientColors(
+  void setGradientColors(
       @ColorInt int topOuterStrokeColor,
       @ColorInt int topInnerStrokeColor,
       @ColorInt int bottomOuterStrokeColor,
@@ -90,16 +114,6 @@ public void setGradientColors(
     this.bottomInnerStrokeColor = bottomInnerStrokeColor;
   }
 
-  /** Set the border width */
-  public void setBorderWidth(@Dimension float width) {
-    if (borderWidth != width) {
-      borderWidth = width;
-      paint.setStrokeWidth(width * DRAW_STROKE_WIDTH_MULTIPLE);
-      invalidateShader = true;
-      invalidateSelf();
-    }
-  }
-
   @Override
   public void draw(Canvas canvas) {
     if (invalidateShader) {
@@ -108,49 +122,59 @@ public void draw(Canvas canvas) {
     }
 
     final float halfBorderWidth = paint.getStrokeWidth() / 2f;
-    final RectF rectF = this.rectF;
+    copyBounds(rect);
+    rectF.set(rect);
 
     // We need to inset the oval bounds by half the border width. This is because stroke draws
     // the center of the border on the dimension. Whereas we want the stroke on the inside.
+    if (shapeAppearanceModel.isRoundRect()) {
+      rectF.inset(halfBorderWidth, halfBorderWidth);
+      canvas.drawRoundRect(rectF, rectF.width() / 2f, rectF.height() / 2f, paint);
+      return;
+    }
+
+    pathProvider.calculatePath(shapeAppearanceModel, 1f, rectF, shapePath);
+    canvas.drawPath(shapePath, paint);
+  }
+
+  @TargetApi(VERSION_CODES.LOLLIPOP)
+  @Override
+  public void getOutline(@NonNull Outline outline) {
+    if (shapeAppearanceModel.isRoundRect()) {
+      float radius = shapeAppearanceModel.getTopLeftCorner().getCornerSize();
+      outline.setRoundRect(getBounds(), radius);
+      return;
+    }
+
     copyBounds(rect);
     rectF.set(rect);
-    rectF.left += halfBorderWidth;
-    rectF.top += halfBorderWidth;
-    rectF.right -= halfBorderWidth;
-    rectF.bottom -= halfBorderWidth;
-
-    canvas.save();
-    canvas.rotate(rotation, rectF.centerX(), rectF.centerY());
-    // Draw the oval
-    canvas.drawOval(rectF, paint);
-    canvas.restore();
+    pathProvider.calculatePath(shapeAppearanceModel, 1f, rectF, shapePath);
+    if (shapePath.isConvex()) {
+      outline.setConvexPath(shapePath);
+    }
   }
 
   @Override
   public boolean getPadding(Rect padding) {
-    final int borderWidth = Math.round(this.borderWidth);
-    padding.set(borderWidth, borderWidth, borderWidth, borderWidth);
+    if (shapeAppearanceModel.isRoundRect()) {
+      final int borderWidth = Math.round(this.borderWidth);
+      padding.set(borderWidth, borderWidth, borderWidth, borderWidth);
+    }
     return true;
   }
 
-  @Override
-  public void setAlpha(@IntRange(from = 0, to = 255) int alpha) {
-    paint.setAlpha(alpha);
-    invalidateSelf();
+  public ShapeAppearanceModel getShapeAppearanceModel() {
+    return shapeAppearanceModel;
   }
 
-  public void setBorderTint(ColorStateList tint) {
-    if (tint != null) {
-      currentBorderTintColor = tint.getColorForState(getState(), currentBorderTintColor);
-    }
-    borderTint = tint;
-    invalidateShader = true;
-    invalidateSelf();
+  public void setShapeAppearanceModel(
+      ShapeAppearanceModel shapeAppearanceModel) {
+    this.shapeAppearanceModel = shapeAppearanceModel;
   }
 
   @Override
-  public void setColorFilter(ColorFilter colorFilter) {
-    paint.setColorFilter(colorFilter);
+  public void setAlpha(@IntRange(from = 0, to = 255) int alpha) {
+    paint.setAlpha(alpha);
     invalidateSelf();
   }
 
@@ -159,13 +183,6 @@ public int getOpacity() {
     return borderWidth > 0 ? PixelFormat.TRANSLUCENT : PixelFormat.TRANSPARENT;
   }
 
-  public final void setRotation(float rotation) {
-    if (rotation != this.rotation) {
-      this.rotation = rotation;
-      invalidateSelf();
-    }
-  }
-
   @Override
   protected void onBoundsChange(Rect bounds) {
     invalidateShader = true;
@@ -191,11 +208,6 @@ protected boolean onStateChange(int[] state) {
     return invalidateShader;
   }
 
-  /**
-   * Creates a vertical {@link LinearGradient}
-   *
-   * @return
-   */
   private Shader createGradientShader() {
     final Rect rect = this.rect;
     copyBounds(rect);
@@ -225,22 +237,4 @@ private Shader createGradientShader() {
     return new LinearGradient(
         0, rect.top, 0, rect.bottom, colors, positions, Shader.TileMode.CLAMP);
   }
-
-  /**
-   * Dummy implementation of constant state. This drawable doesn't have shared state. Implementing
-   * so that calls to getConstantState().newDrawable() don't crash on L and M.
-   */
-  private class CircularBorderState extends ConstantState {
-
-    @NonNull
-    @Override
-    public Drawable newDrawable() {
-      return CircularBorderDrawable.this;
-    }
-
-    @Override
-    public int getChangingConfigurations() {
-      return 0;
-    }
-  }
 }

lib/java/com/google/android/material/floatingactionbutton/FloatingActionButtonImpl.java

@@ -43,7 +43,6 @@
 import com.google.android.material.animation.ImageMatrixProperty;
 import com.google.android.material.animation.MatrixEvaluator;
 import com.google.android.material.animation.MotionSpec;
-import com.google.android.material.internal.CircularBorderDrawable;
 import com.google.android.material.internal.StateListAnimator;
 import com.google.android.material.ripple.RippleUtils;
 import com.google.android.material.shadow.ShadowViewDelegate;
@@ -92,7 +91,7 @@ class FloatingActionButtonImpl {
 
   MaterialShapeDrawable shapeDrawable;
   Drawable rippleDrawable;
-  CircularBorderDrawable borderDrawable;
+  BorderDrawable borderDrawable;
   Drawable contentBackground;
 
   float elevation;
@@ -309,6 +308,10 @@ final void setShapeAppearance(ShapeAppearanceModel shapeAppearance, boolean usin
     if (rippleDrawable instanceof MaterialShapeDrawable) {
       ((MaterialShapeDrawable) rippleDrawable).setShapeAppearanceModel(shapeAppearance);
     }
+
+    if (borderDrawable != null) {
+      borderDrawable.setShapeAppearanceModel(shapeAppearance);
+    }
   }
 
   @Nullable
@@ -812,8 +815,5 @@ void updateFromViewRotation() {
     if (shapeDrawable != null) {
       shapeDrawable.setShadowCompatRotation((int) rotation);
     }
-    if (borderDrawable != null) {
-      borderDrawable.setRotation(-rotation);
-    }
   }
 }

lib/java/com/google/android/material/floatingactionbutton/FloatingActionButtonImplLollipop.java

@@ -33,8 +33,6 @@
 import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
 import android.support.annotation.RequiresApi;
-import com.google.android.material.internal.CircularBorderDrawable;
-import com.google.android.material.internal.CircularBorderDrawableLollipop;
 import com.google.android.material.ripple.RippleUtils;
 import com.google.android.material.shadow.ShadowViewDelegate;
 import com.google.android.material.shape.MaterialShapeDrawable;
@@ -208,9 +206,9 @@ boolean requirePreDrawListener() {
     return false;
   }
 
-  CircularBorderDrawable createBorderDrawable(int borderWidth, ColorStateList backgroundTint) {
+  BorderDrawable createBorderDrawable(int borderWidth, ColorStateList backgroundTint) {
     final Context context = view.getContext();
-    CircularBorderDrawable borderDrawable =  new CircularBorderDrawableLollipop();
+    BorderDrawable borderDrawable =  new BorderDrawable(shapeAppearance);
     borderDrawable.setGradientColors(
         ContextCompat.getColor(context, R.color.design_fab_stroke_top_outer_color),
         ContextCompat.getColor(context, R.color.design_fab_stroke_top_inner_color),