Merge pull request #178 from hacktons/feature-support-shadowcolor

support shadow color

Author: avenwu

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [3.1.0]
+* Bug fix;
+* New API to set shadow color
+* Fix lint warning 
+
 ## [3.0.0-nullsafety.1]
 * Prepare for Flutter 2.
 

analysis_options.yaml

@@ -6,5 +6,4 @@ include: package:pedantic/analysis_options.yaml
 analyzer:
   exclude:
     - example/**
-  enable-experiment:
-    - non-nullable
+    - test/**

example/lib/data.dart

@@ -47,12 +47,20 @@ class Data {
 
   static const namedColors = [
     NamedColor(Colors.blue, 'Blue'),
-    NamedColor(Color(0xFFf44336), 'Read'),
+    NamedColor(Color(0xFFf44336), 'Red'),
     NamedColor(Color(0xFF673AB7), 'Purple'),
     NamedColor(Color(0xFF009688), 'Green'),
     NamedColor(Color(0xFFFFC107), 'Yellow'),
     NamedColor(Color(0xFF607D8B), 'Grey'),
   ];
+  static const namedShadowColors = [
+    NamedColor(Colors.black38, 'Black'),
+    NamedColor(Color(0xeef44336), 'Red'),
+    NamedColor(Color(0xee673AB7), 'Purple'),
+    NamedColor(Color(0xee009688), 'Green'),
+    NamedColor(Color(0xeeFFC107), 'Yellow'),
+    NamedColor(Color(0xee607D8B), 'Grey'),
+  ];
   static const badges = [
     null,
     Badge('1'),

example/lib/default_appbar_demo.dart

@@ -96,6 +96,7 @@ class _State extends State<DefaultAppBarDemo>
   ChoiceValue<TabStyle> _style = kStyles.first;
   ChoiceValue<Curve> _curve = Data.curves.first;
   Color _barColor = Data.namedColors.first.color;
+  Color _shadowColor = Data.namedColors.first.color;
   Gradient? _gradient = Data.gradients.first;
   Badge? _badge;
   TabController? _tabController;
@@ -112,6 +113,8 @@ class _State extends State<DefaultAppBarDemo>
     var options = <Widget>[
       const Heading('Appbar Color'),
       ColorsItem(Data.namedColors, _barColor, _onBarColorChanged),
+      const Heading('Shadow Color'),
+      ColorsItem(Data.namedShadowColors, _shadowColor, _onShadowColorChanged),
       const Heading('Background Gradient'),
       GradientItem(Data.gradients, _gradient, _onGradientChanged),
       const Heading('Badge Chip'),
@@ -190,6 +193,7 @@ class _State extends State<DefaultAppBarDemo>
                 items: _tabItems.value,
                 style: _style.value,
                 curve: _curve.value,
+                shadowColor: _shadowColor,
                 backgroundColor: _barColor,
                 gradient: _gradient,
                 controller: _tabController,
@@ -208,6 +212,7 @@ class _State extends State<DefaultAppBarDemo>
                 items: _tabItems.value,
                 style: _style.value,
                 curve: _curve.value,
+                shadowColor: _shadowColor,
                 backgroundColor: _barColor,
                 gradient: _gradient,
                 controller: _tabController,
@@ -252,6 +257,12 @@ class _State extends State<DefaultAppBarDemo>
     });
   }
 
+  void _onShadowColorChanged(Color value) {
+    setState(() {
+      _shadowColor = value;
+    });
+  }
+
   void _onGradientChanged(Gradient? value) {
     setState(() {
       _gradient = value;

lib/src/bar.dart

@@ -110,6 +110,9 @@ class ConvexAppBar extends StatefulWidget {
   /// Color of the AppBar.
   final Color? backgroundColor;
 
+  /// Color of the elevation.
+  final Color? shadowColor;
+
   /// Draw the background with topLeft and topRight corner; Only work work with fixed style
   ///
   /// ![corner image](https://github.com/hacktons/convex_bottom_bar/raw/master/doc/appbar-corner.png)
@@ -196,6 +199,7 @@ class ConvexAppBar extends StatefulWidget {
     Color? color,
     Color? activeColor,
     Color? backgroundColor,
+    Color? shadowColor,
     Gradient? gradient,
     double? height,
     double? curveSize,
@@ -219,6 +223,7 @@ class ConvexAppBar extends StatefulWidget {
           onTapNotify: onTabNotify,
           controller: controller,
           backgroundColor: backgroundColor,
+          shadowColor: shadowColor,
           count: items.length,
           initialActiveIndex: initialActiveIndex,
           disableDefaultTabController: disableDefaultTabController ?? false,
@@ -257,6 +262,7 @@ class ConvexAppBar extends StatefulWidget {
     this.onTapNotify,
     this.controller,
     this.backgroundColor,
+    this.shadowColor,
     this.gradient,
     this.height,
     this.curveSize,
@@ -308,6 +314,7 @@ class ConvexAppBar extends StatefulWidget {
     Color? color,
     Color? activeColor,
     Color? backgroundColor,
+    Color? shadowColor,
     Gradient? gradient,
     double? height,
     double? curveSize,
@@ -339,6 +346,7 @@ class ConvexAppBar extends StatefulWidget {
       color: color,
       activeColor: activeColor,
       backgroundColor: backgroundColor,
+      shadowColor: shadowColor,
       gradient: gradient,
       height: height,
       curveSize: curveSize,
@@ -553,6 +561,7 @@ class ConvexAppBarState extends State<ConvexAppBar>
               width: widget.curveSize ?? CONVEX_SIZE,
               height: widget.curveSize ?? CONVEX_SIZE,
               color: widget.backgroundColor ?? Colors.blue,
+              shadowColor: widget.shadowColor ?? Colors.black38,
               gradient: widget.gradient,
               sigma: widget.elevation ?? ELEVATION,
               leftPercent: percent,

lib/src/painter.dart

@@ -15,7 +15,6 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 import 'convex_shape.dart';
 import 'reused_gradient.dart';

lib/src/style/fixed_circle_tab_style.dart

@@ -14,7 +14,6 @@
  *  limitations under the License.
  */
 
-import 'dart:ui';
 import 'package:flutter/material.dart';
 
 import '../item.dart';

lib/src/style/fixed_tab_style.dart

@@ -14,8 +14,6 @@
  *  limitations under the License.
  */
 
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 
 import '../item.dart';

lib/src/style/inner_builder.dart

@@ -14,8 +14,6 @@
  *  limitations under the License.
  */
 
-import 'dart:ui';
-
 import 'package:flutter/cupertino.dart';
 
 import '../bar.dart';

lib/src/style/transition_container_builder.dart

@@ -16,7 +16,6 @@
 
 import 'dart:math';
 
-import 'package:flutter/animation.dart';
 import 'package:flutter/cupertino.dart';
 
 import 'transition_container.dart';