Merge pull request #36 from ionicfirebaseapp/master

master pull

Author: shravyackm

example/pubspec.lock

@@ -1,69 +1,69 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  archive:
+  async:
     dependency: transitive
     description:
-      name: archive
+      name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.11"
-  args:
+    version: "2.4.2"
+  boolean_selector:
     dependency: transitive
     description:
-      name: args
+      name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.2"
-  async:
+    version: "2.0.0"
+  characters:
     dependency: transitive
     description:
-      name: async
+      name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
-  boolean_selector:
+    version: "1.0.0"
+  charcode:
     dependency: transitive
     description:
-      name: boolean_selector
+      name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
-  charcode:
+    version: "1.1.3"
+  clock:
     dependency: transitive
     description:
-      name: charcode
+      name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
+    version: "1.0.1"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.14.13"
   convert:
     dependency: transitive
     description:
       name: convert
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.3"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.3"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -75,7 +75,7 @@ packages:
       name: flutter_svg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.17.1"
+    version: "0.18.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -93,20 +93,13 @@ packages:
       relative: true
     source: path
     version: "1.1.3"
-  image:
-    dependency: transitive
-    description:
-      name: image
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.6"
+    version: "0.12.8"
   meta:
     dependency: transitive
     description:
@@ -120,49 +113,35 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.4"
+    version: "1.7.0"
   path_drawing:
     dependency: transitive
     description:
       name: path_drawing
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.1"
+    version: "0.4.1+1"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.4"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.0+1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "3.0.4"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -174,14 +153,14 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.7.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.3"
+    version: "1.9.5"
   stream_channel:
     dependency: transitive
     description:
@@ -209,14 +188,14 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.11"
+    version: "0.2.17"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.2.0"
   url_launcher:
     dependency: "direct main"
     description:
@@ -258,7 +237,7 @@ packages:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.5.0"
+    version: "4.2.0"
 sdks:
-  dart: ">=2.4.0 <3.0.0"
-  flutter: ">=1.12.8 <2.0.0"
+  dart: ">=2.9.0-14.0.dev <3.0.0"
+  flutter: ">=1.18.0-6.0.pre <2.0.0"

example/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
   getwidget:
     path: ../
   cupertino_icons: ^0.1.2
-  flutter_svg: ^0.17.1
+  flutter_svg: ^0.18.0
   url_launcher: ^5.4.1
 
 dev_dependencies:

lib/components/accordian/gf_accordian.dart

@@ -6,21 +6,23 @@ class GFAccordion extends StatefulWidget {
       {Key key,
       this.titleChild,
       this.content,
-      this.collapsedTitlebackgroundColor = GFColors.WHITE,
-      this.expandedTitlebackgroundColor = const Color(0xFFE0E0E0),
+      this.collapsedTitleBackgroundColor = GFColors.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 = const EdgeInsets.all(10),
-      this.contentbackgroundColor,
+      this.contentBackgroundColor,
       this.contentPadding = const EdgeInsets.all(10),
       this.contentChild,
-      this.titleborder = const Border(),
-      this.contentBorder = const Border(),
+      this.titleBorder = const Border(),
+      this.contentborder = const Border(),
       this.margin,
       this.showAccordion = false,
-      this.onToggleCollapsed})
+      this.onToggleCollapsed,
+      this.titleBorderRadius = const BorderRadius.all(Radius.circular(0)),
+      this.contentBorderRadius = const BorderRadius.all(Radius.circular(0))})
       : super(key: key);
 
   final Function(bool) onToggleCollapsed;
@@ -38,10 +40,10 @@ class GFAccordion extends StatefulWidget {
   final Widget contentChild;
 
   /// type of [Color] or [GFColors] which is used to change the background color of the [GFAccordion] title when it is collapsed
-  final Color collapsedTitlebackgroundColor;
+  final Color collapsedTitleBackgroundColor;
 
   /// type of [Color] or [GFColors] which is used to change the background color of the [GFAccordion] title when it is expanded
-  final Color expandedTitlebackgroundColor;
+  final Color expandedTitleBackgroundColor;
 
   ///collapsedIcon of type [Widget] which is used to show when the [GFAccordion] is collapsed
   final Widget collapsedIcon;
@@ -62,16 +64,22 @@ class GFAccordion extends StatefulWidget {
   final EdgeInsets contentPadding;
 
   /// type of [Color] or [GFColors] which is used to change the background color of the [GFAccordion] description
-  final Color contentbackgroundColor;
+  final Color contentBackgroundColor;
 
   ///margin of type [EdgeInsets] which is used to set the margin of the [GFAccordion]
   final EdgeInsets margin;
 
-  ///titleborderColor of type  [Color] or [GFColors] which is used to change the border color of title
-  final Border titleborder;
+  ///titleBorderColor of type  [Color] or [GFColors] which is used to change the border color of title
+  final Border titleBorder;
 
   ///contentBorderColor of type  [Color] or [GFColors] which is used to change the border color of content
-  final Border contentBorder;
+  final Border contentborder;
+
+  ///titleBorderRadius of type  [Radius]  which is used to change the border radius of title
+  final BorderRadius titleBorderRadius;
+
+  ///contentBorderRadius of type  [Radius]  which is used to change the border radius of content
+  final BorderRadius contentBorderRadius;
 
   @override
   _GFAccordionState createState() => _GFAccordionState();
@@ -124,10 +132,11 @@ class _GFAccordionState extends State<GFAccordion>
               onTap: _toggleCollapsed,
               child: Container(
                 decoration: BoxDecoration(
-                  border: widget.titleborder,
+                  borderRadius: widget.titleBorderRadius,
+                  border: widget.titleBorder,
                   color: showAccordion
-                      ? widget.expandedTitlebackgroundColor
-                      : widget.collapsedTitlebackgroundColor,
+                      ? widget.expandedTitleBackgroundColor
+                      : widget.collapsedTitleBackgroundColor,
                 ),
                 padding: widget.titlePadding,
                 child: Row(
@@ -146,8 +155,9 @@ class _GFAccordionState extends State<GFAccordion>
             showAccordion
                 ? Container(
                     decoration: BoxDecoration(
-                      border: widget.contentBorder,
-                      color: widget.contentbackgroundColor ?? Colors.white70,
+                      borderRadius: widget.contentBorderRadius,
+                      border: widget.contentborder,
+                      color: widget.contentBackgroundColor ?? Colors.white70,
                     ),
                     width: MediaQuery.of(context).size.width,
                     padding: widget.contentPadding,

lib/components/alert/gf_alert.dart

@@ -109,7 +109,7 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
                       : GFColors.WHITE,
                   boxShadow: [
                     BoxShadow(
-                        color: Colors.black.withOpacity(0.40), blurRadius: 3)
+                        color: Colors.black.withOpacity(0.10), blurRadius: 2)
                   ]),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,