From 715f6d7e54df13bfe73ffb609e0d27413c0bcfac Mon Sep 17 00:00:00 2001
From: Harsh Bhikadia <harsh.bhikadiya@gmail.com>
Date: Thu, 6 Jan 2022 12:21:12 +0530
Subject: [PATCH] feat: added `frontLayerShape` in-place of
 `frontLayerBorderRadius` in `BackdropScaffold` (#116)

---
 lib/src/scaffold.dart | 42 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/lib/src/scaffold.dart b/lib/src/scaffold.dart
index 92b5f0f..752a55d 100644
--- a/lib/src/scaffold.dart
+++ b/lib/src/scaffold.dart
@@ -111,7 +111,27 @@ class BackdropScaffold extends StatefulWidget {
   ///     topRight: Radius.circular(16),
   /// )
   /// ```
-  final BorderRadius frontLayerBorderRadius;
+  ///
+  /// > NOTE: This is deprecated and will be removed in future. Use
+  /// > [frontLayerShape] instead.
+  @Deprecated(
+      "This member is deprecated since v0.7.1 and will be removed in future. "
+      "Use `frontLayerShape` instead.")
+  final BorderRadius? frontLayerBorderRadius;
+
+  /// Defines the [ShapeBorder] applied to the front layer.
+  ///
+  ///
+  /// Defaults to
+  /// ```dart
+  /// const RoundedRectangleBorder(
+  ///     borderRadius: BorderRadius.only(
+  ///         topLeft: Radius.circular(16),
+  ///         topRight: Radius.circular(16),
+  ///     ),
+  /// )
+  /// ```
+  final ShapeBorder frontLayerShape;
 
   /// Defines the elevation applied to the front layer.
   ///
@@ -291,10 +311,13 @@ class BackdropScaffold extends StatefulWidget {
     this.subHeader,
     this.subHeaderAlwaysActive = true,
     this.headerHeight,
-    this.frontLayerBorderRadius = const BorderRadius.only(
-      topLeft: Radius.circular(16),
-      topRight: Radius.circular(16),
+    ShapeBorder frontLayerShape = const RoundedRectangleBorder(
+      borderRadius: BorderRadius.only(
+        topLeft: Radius.circular(16),
+        topRight: Radius.circular(16),
+      ),
     ),
+    this.frontLayerBorderRadius,
     this.frontLayerElevation = 1,
     this.stickyFrontLayer = false,
     this.revealBackLayerAtStart = false,
@@ -331,7 +354,10 @@ class BackdropScaffold extends StatefulWidget {
     this.drawerEnableOpenDragGesture = true,
     this.endDrawerEnableOpenDragGesture = true,
     this.restorationId,
-  })  : frontLayerActiveFactor = frontLayerActiveFactor.clamp(0, 1).toDouble(),
+  })  : frontLayerShape = frontLayerBorderRadius != null
+            ? RoundedRectangleBorder(borderRadius: frontLayerBorderRadius)
+            : frontLayerShape,
+        frontLayerActiveFactor = frontLayerActiveFactor.clamp(0, 1).toDouble(),
         super(key: key);
 
   @override
@@ -545,9 +571,9 @@ class BackdropScaffoldState extends State<BackdropScaffold>
     return Material(
       color: widget.frontLayerBackgroundColor,
       elevation: widget.frontLayerElevation,
-      borderRadius: widget.frontLayerBorderRadius,
-      child: ClipRRect(
-        borderRadius: widget.frontLayerBorderRadius,
+      shape: widget.frontLayerShape,
+      child: ClipPath(
+        clipper: ShapeBorderClipper(shape: widget.frontLayerShape),
         child: Stack(
           children: <Widget>[
             Column(