Merge pull request #15 from ionicfirebaseapp/master

master pull

Author: deepikahr

README.md

@@ -7,7 +7,7 @@
   </a>
 </p>
 
-[**GetFlutter**](https://www.getflutter.dev) is a 100% free Flutter open-source UI library that is built to make Flutter development easier and more joyful than ever. GetFlutter has 1000+ pre-build widgets that you can reuse to develop both Flutter mobile app and web app. Our motto is to provide the best Flutter UI library to the Flutter community to speed up their development process and build awesome apps with pre-build Flutter Library Components.
+[**GetFlutter**](https://www.getflutter.dev) is a 100% free Flutter open-source UI library built with <a href="https://flutter.dev/" target="_blank">Flutter SDK</a> to make Flutter development easier and more joyful than ever. GetFlutter has 1000+ pre-build widgets that you can reuse to develop both Flutter mobile app and web app. Our motto is to provide the best Flutter UI library to the Flutter community to speed up their development process and build awesome apps with pre-build Flutter Library Components.
 
 ## Table of contents 
 
@@ -78,7 +78,8 @@ Facebook: <https://www.facebook.com/getflutter>
 Linkedin: <https://www.linkedin.com/company/getflutter>
 
 Instagram: <https://www.instagram.com/getflutter.dev/> 
- 
+
+### Note: GetFlutter is not directly and/or indirectly associated/affiliated with Flutter or Google LLC. We are the team of Flutter Developers and we built this open-source library for the Flutter development community to made app development more easier. 
 
  ## Copyright-and-license 
  Code and documentation Copyright 2017-2020 the [GETFLUTTER Authors](https://www.getflutter.dev) and [IONICFIREBASEAPP](https://ionicfirebaseapp.com) Code released under the [MIT License]. Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).

example/lib/main.dart

@@ -74,10 +74,10 @@ class _MyHomePageState extends State<MyHomePage>
   Widget build(BuildContext context) {
     return Scaffold(
       drawer: GFDrawer(
-        colorFilter: new ColorFilter.mode(
-            Colors.black.withOpacity(0.6), BlendMode.darken),
-        backgroundImage: NetworkImage(
-            "https://cdn.pixabay.com/photo/2017/12/03/18/04/christmas-balls-2995437_960_720.jpg"),
+//        colorFilter: new ColorFilter.mode(
+//            Colors.teal.withOpacity(0.6), BlendMode.darken),
+//        backgroundImage: NetworkImage(
+//            "https://cdn.pixabay.com/photo/2017/12/03/18/04/christmas-balls-2995437_960_720.jpg"),
         gradient: LinearGradient(
           begin: Alignment.topRight,
           end: Alignment.bottomLeft,
@@ -89,6 +89,7 @@ class _MyHomePageState extends State<MyHomePage>
             Colors.teal[200],
           ],
         ),
+        color: Colors.greenAccent,
         child: ListView(
           padding: EdgeInsets.zero,
           children: <Widget>[
@@ -99,7 +100,7 @@ class _MyHomePageState extends State<MyHomePage>
                     "https://cdn.pixabay.com/photo/2017/12/03/18/04/christmas-balls-2995437_960_720.jpg"),
               ),
               decoration: BoxDecoration(
-                color: Colors.teal.withOpacity(0.45),
+                color: Colors.teal,
               ),
               otherAccountsPictures: <Widget>[
                 Image(
@@ -111,24 +112,23 @@ class _MyHomePageState extends State<MyHomePage>
                   child: Text("dcf"),
                 )
               ],
+//              closeButton: Text("Close"),
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
-                  Text('user'),
-                  Text('user@asdf.com'),
+                  Text('user name'),
+                  Text('user@userid.com'),
                 ],
               ),
             ),
             ListTile(
               title: Text('Item 1'),
-              onTap: () {
-                Navigator.pop(context);
-              },
+              onTap: null,
             ),
             ListTile(
               title: Text('Item 2'),
-              onTap: () {},
+              onTap: null,
             ),
           ],
         ),
@@ -175,15 +175,17 @@ class _MyHomePageState extends State<MyHomePage>
 //          Container(color: Colors.green),
 //          Container(color: Colors.blue)
 //      ]),
+
+
           SingleChildScrollView(
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.center,
           children: <Widget>[
             GFSearchBar(
               searchList: list,
-              hideSearchBoxWhenItemSelected: false,
-              overlaySearchListHeight: 100.0,
+//              hideSearchBoxWhenItemSelected: false,
+//              overlaySearchListHeight: 100.0,
               searchQueryBuilder: (query, list) {
                 return list
                     .where((item) =>
@@ -192,17 +194,17 @@ class _MyHomePageState extends State<MyHomePage>
               },
               overlaySearchListItemBuilder: (item) {
                 return Container(
-                  padding: const EdgeInsets.all(12),
+                  padding: const EdgeInsets.all(8),
                   child: Text(
                     item,
                     style: const TextStyle(fontSize: 18),
                   ),
                 );
               },
-              noItemsFoundWidget: Container(
-                color: Colors.green,
-                child: Text("no items found"),
-              ),
+//              noItemsFoundWidget: Container(
+//                color: Colors.green,
+//                child: Text("no items found..."),
+//              ),
               onItemSelected: (item) {
                 setState(() {
                   print('ssssssss $item');
@@ -646,6 +648,7 @@ class _MyHomePageState extends State<MyHomePage>
 //            ),
 //
             GFButton(
+//              position: GFPosition.end,
 //              icon: GFBadge(
 //                child: Text("12"),
 //                color: GFColor.dark,
@@ -662,9 +665,9 @@ class _MyHomePageState extends State<MyHomePage>
 //          hoverColor: GFColor.dark,
               color: GFColor.secondary,
 //          focusColor: GFColor.danger,
-              type: GFButtonType.solid,
-              shape: GFButtonShape.pills,
-              buttonBoxShadow: true,
+//              type: GFButtonType.solid,
+//              shape: GFButtonShape.pills,
+//              buttonBoxShadow: true,
 //              boxShadow: BoxShadow(
 //                color: Colors.pink,
 //                blurRadius: 2.0,
@@ -676,7 +679,7 @@ class _MyHomePageState extends State<MyHomePage>
 //          size: GFSize.large,
 //          disabledColor: GFColor.dark,
 //          disabledTextColor: GFColor.light,
-              blockButton: true,
+//              blockButton: true,
 //          fullWidthButton: true,
 //          borderSide: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid),
 //          borderShape: RoundedRectangleBorder(side: BorderSide(color: Colors.pink, width: 2.0, style: BorderStyle.solid), borderRadius: BorderRadius.zero),

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(