Merge pull request #73 from shravyackm/toast

Toast

Author: shravyackm

lib/components/accordian/gf_accordian.dart

@@ -6,17 +6,18 @@ class GFAccordion extends StatefulWidget {
       {Key key,
       this.child,
       this.content,
-      this.titlebackgroundColor,
+      this.collapsedTitlebackgroundColor =  Colors.white,
+        this.expandedTitlebackgroundColor= const Color(0xFFE0E0E0),
       this.collapsedIcon = const Icon(Icons.keyboard_arrow_down),
       this.expandedIcon = const Icon(Icons.keyboard_arrow_up),
       this.title,
       this.textStyle = const TextStyle(color: Colors.black, fontSize: 16),
-      this.titlePadding,
+      this.titlePadding = const EdgeInsets.all(10),
       this.contentbackgroundColor,
-      this.contentPadding,
+      this.contentPadding = const EdgeInsets.all(10),
       this.contentChild,
-      this.titleborderColor,
-      this.contentBorderColor,
+      this.titleborderColor = const Border(),
+      this.contentBorderColor = const Border(),
       this.margin})
       : super(key: key);
 
@@ -29,8 +30,11 @@ class GFAccordion extends StatefulWidget {
   /// contentChild of  type [Widget]is alternative to content key. content will get priority over contentChild
   final Widget contentChild;
 
-  /// type of [Color] or [GFColor] which is used to change the background color of the [GFAccordion] title
-  final dynamic titlebackgroundColor;
+  /// type of [Color] or [GFColor] which is used to change the background color of the [GFAccordion] title when it is collapsed
+  final dynamic collapsedTitlebackgroundColor;
+
+  /// type of [Color] or [GFColor] which is used to change the background color of the [GFAccordion] title when it is expanded
+  final dynamic expandedTitlebackgroundColor;
 
   ///collapsedIcon of type [Widget] which is used to show when the [GFAccordion] is collapsed
   final Widget collapsedIcon;
@@ -86,6 +90,11 @@ class _GFAccordionState extends State<GFAccordion>
       ),
     );
   }
+  @override
+  void dispose() {
+    animationController.dispose();
+    super.dispose();
+  }
 
   bool showAccordion = false;
 
@@ -113,21 +122,10 @@ class _GFAccordionState extends State<GFAccordion>
             },
             child: Container(
               decoration: BoxDecoration(
-                  border: widget.titleborderColor == null
-                      ? widget.titleborderColor
-                      : Border(
-                          top: BorderSide(color: Colors.black38),
-                          left: BorderSide(color: Colors.black38),
-                          right: BorderSide(color: Colors.black38),
-                          bottom: BorderSide(color: Colors.black38)),
-                  color: showAccordion
-                      ? widget.titlebackgroundColor != null
-                          ? widget.titlebackgroundColor
-                          : Color(0xFFE0E0E0)
-                      : widget.titlebackgroundColor),
-              padding: widget.titlePadding != null
-                  ? widget.titlePadding
-                  : EdgeInsets.all(10),
+                border: widget.titleborderColor,
+                  color: showAccordion ? widget.expandedTitlebackgroundColor: widget.collapsedTitlebackgroundColor),
+              padding:  widget.titlePadding
+                  ,
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: <Widget>[
@@ -144,20 +142,13 @@ class _GFAccordionState extends State<GFAccordion>
           showAccordion
               ? Container(
                   decoration: BoxDecoration(
-                    border: widget.contentBorderColor == null
-                        ? widget.contentBorderColor
-                        : Border(
-                            bottom: BorderSide(color: Colors.black38),
-                            left: BorderSide(color: Colors.black38),
-                            right: BorderSide(color: Colors.black38)),
+                    border: widget.contentBorderColor,
                     color: widget.contentbackgroundColor != null
                         ? widget.contentbackgroundColor
                         : Colors.white70,
                   ),
                   width: MediaQuery.of(context).size.width,
-                  padding: widget.contentPadding != null
-                      ? widget.contentPadding
-                      : EdgeInsets.all(10),
+                  padding: widget.contentPadding ,
                   child: SlideTransition(
                     position: offset,
                     child: widget.content != null

lib/components/alert/gf_alert.dart

@@ -16,16 +16,15 @@ class GFAlert extends StatefulWidget {
       this.contentChild,
       this.title,
       this.bottombar,
-      this.animationDuration = const Duration(milliseconds: 300),
-      this.textStyle = const TextStyle(color: Colors.black87),
+      this.contentTextStyle = const TextStyle(color: Colors.black87),
       this.titleTextStyle = const TextStyle(
           color: Colors.black87, fontSize: 17, fontWeight: FontWeight.w500)})
       : super(key: key);
 
-  /// child of  type [Widget]is alternative to text key. text will get priority over child
+  /// child of  type [Widget]is alternative to title key. title will get priority over child
   final Widget child;
 
-  /// title of type [String] used to descripe the title of the [GFAlert]
+  /// title of type [String] used to describe the title of the [GFAlert]
   final String title;
 
   /// child of  type [Widget]is alternative to title key. title will get priority over contentchild
@@ -34,24 +33,22 @@ class GFAlert extends StatefulWidget {
   /// title of type [String] used to describe the content of the [GFAlert]
   final String content;
 
+  ///type of [TextStyle] to change the style of the title not for the child
   final TextStyle titleTextStyle;
 
   ///pass color of type [Color] or [GFColor] for background of [GFAlert]
   final dynamic backgroundColor;
 
-  /// textStyle of type [textStyle] will be applicable to text only and not for the child
-  final TextStyle textStyle;
+  ///type of [TextStyle] to change the style of the content not for the contentchild
+  final TextStyle contentTextStyle;
 
   /// width of type [double] used to control the width of the [GFAlert]
   final double width;
 
   ///type of [GFAlertType] which takes the type ie, basic, rounded and fullWidth for the [GFAlert]
   final GFAlertType type;
 
-  ///type of [Duration] which takes the duration of the fade in animation
-  final Duration animationDuration;
-
-  /// type of [Alignment] used to align the text inside the toast
+  /// type of [Alignment] used to align the text inside the [GFAlert]
   final Alignment alignment;
 
   ///type of [Widget] used for the buttons ie, OK, Cancel for the action in [GFAlert]
@@ -71,7 +68,6 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
         duration: const Duration(milliseconds: 300), vsync: this);
     animation = CurvedAnimation(
         parent: animationController, curve: Curves.fastOutSlowIn);
-
     animationController.forward();
     super.initState();
   }
@@ -113,9 +109,13 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
-                widget.title != null
-                    ? Text(widget.title, style: widget.titleTextStyle)
-                    : (widget.child ?? Container()),
+                Align(
+                  alignment: widget.alignment!=null? widget.alignment:Alignment.topLeft,
+                  child:  widget.title != null
+                      ? Text(widget.title, style: widget.titleTextStyle)
+                      : (widget.child ?? Container()),
+                ),
+
                 SizedBox(
                   height: 10,
                 ),
@@ -124,7 +124,7 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
                       ? widget.alignment
                       : Alignment.topLeft,
                   child: widget.content != null
-                      ? Text(widget.content, style: widget.textStyle)
+                      ? Text(widget.content, style: widget.contentTextStyle)
                       : (widget.contentChild ?? Container()),
                 ),
                 SizedBox(

lib/components/toast/gf_toast.dart

@@ -76,6 +76,7 @@ class _GFToastState extends State<GFToast> with TickerProviderStateMixin {
       vsync: this,
       duration: widget.animationDuration,
     )..addListener(() => setState(() {}));
+
     fadeanimation = Tween<double>(
       begin: 0.0,
       end: 1.0,