Merge pull request #72 from Sandipkakadiya/review

Review

Author: deepikahr

.travis.yml

@@ -26,3 +26,4 @@ before_script:
 script:
   - ./../flutter/bin/flutter analyze .
   - ./../flutter/bin/cache/dart-sdk/bin/dartfmt --dry-run lib
+  - ./../flutter/bin/flutter test

CHANGELOG.md

@@ -1,7 +1,13 @@
 # Changelog
 
 
-## 1.2.3 - 2020-11-12
+## 2.0.0-nullsafety.3 - 2021-03-09
+
+### Added
+* Added nullsafety.
+
+
+## 1.2.4 - 2020-11-12
 
 ### Fixed
 * [GFProgressBar] issue.
@@ -11,6 +17,11 @@
 * [GFCarousel] issue. #185
 * Many more minor improvements.
 
+### Added
+* Test cases added for couple of components
+    - GFLoader
+    - GFTypography
+
 
 
 ## 1.2.2 - 2020-10-02

example/pubspec.lock

@@ -7,42 +7,42 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety.1"
+    version: "2.5.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.3"
+    version: "1.15.0"
   convert:
     dependency: transitive
     description:
@@ -63,7 +63,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -92,28 +92,35 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.2.3"
+    version: "2.0.0-nullsafety.3"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.3"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety.1"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.1"
+    version: "1.8.0"
   path_drawing:
     dependency: transitive
     description:
@@ -153,49 +160,49 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.2"
+    version: "1.8.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety.2"
+    version: "0.2.19"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   url_launcher:
     dependency: "direct main"
     description:
@@ -244,7 +251,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   xml:
     dependency: transitive
     description:
@@ -253,5 +260,5 @@ packages:
     source: hosted
     version: "4.5.1"
 sdks:
-  dart: ">=2.10.0-110 <2.11.0"
-  flutter: ">=1.22.0 <2.0.0"
+  dart: ">=2.12.0 <3.0.0"
+  flutter: ">=1.22.0"

lib/components/accordian/gf_accordian.dart

@@ -4,7 +4,7 @@ import 'package:getwidget/getwidget.dart';
 class GFAccordion extends StatefulWidget {
   /// An accordion is used to show (and hide) content. Use [showAccordion] to hide & show the accordion content.
   const GFAccordion(
-      {Key key,
+      {Key? key,
       this.title,
       this.content,
       this.titleChild,
@@ -30,13 +30,13 @@ class GFAccordion extends StatefulWidget {
   final bool showAccordion;
 
   /// child of  type [Widget]is alternative to title key. title will get priority over titleChild
-  final Widget titleChild;
+  final Widget? titleChild;
 
   /// content of type[String] which shows the messages after the [GFAccordion] is expanded
-  final String content;
+  final String? content;
 
   /// contentChild of  type [Widget]is alternative to content key. content will get priority over contentChild
-  final Widget contentChild;
+  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;
@@ -51,7 +51,7 @@ class GFAccordion extends StatefulWidget {
   final Widget expandedIcon;
 
   /// text of type [String] is alternative to child. text will get priority over titleChild
-  final String title;
+  final String? title;
 
   /// textStyle of type [textStyle] will be applicable to text only and not for the child
   final TextStyle textStyle;
@@ -63,10 +63,10 @@ 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;
+  final EdgeInsets? margin;
 
   /// titleBorderColor of type  [Color] or [GFColors] which is used to change the border color of title
   final Border titleBorder;
@@ -81,18 +81,18 @@ class GFAccordion extends StatefulWidget {
   final BorderRadius contentBorderRadius;
 
   /// function called when the content body collapsed
-  final Function(bool) onToggleCollapsed;
+  final Function(bool)? onToggleCollapsed;
 
   @override
   _GFAccordionState createState() => _GFAccordionState();
 }
 
 class _GFAccordionState extends State<GFAccordion>
     with TickerProviderStateMixin {
-  AnimationController animationController;
-  AnimationController controller;
-  Animation<Offset> offset;
-  bool showAccordion;
+  late AnimationController animationController;
+  late AnimationController controller;
+  late Animation<Offset> offset;
+  late bool showAccordion;
 
   @override
   void initState() {
@@ -142,7 +142,7 @@ class _GFAccordionState extends State<GFAccordion>
                   children: <Widget>[
                     Expanded(
                       child: widget.title != null
-                          ? Text(widget.title, style: widget.textStyle)
+                          ? Text(widget.title!, style: widget.textStyle)
                           : (widget.titleChild ?? Container()),
                     ),
                     showAccordion ? widget.expandedIcon : widget.collapsedIcon
@@ -162,7 +162,7 @@ class _GFAccordionState extends State<GFAccordion>
                     child: SlideTransition(
                       position: offset,
                       child: widget.content != null
-                          ? Text(widget.content)
+                          ? Text(widget.content!)
                           : (widget.contentChild ?? Container()),
                     ))
                 : Container()
@@ -183,7 +183,7 @@ class _GFAccordionState extends State<GFAccordion>
       }
       showAccordion = !showAccordion;
       if (widget.onToggleCollapsed != null) {
-        widget.onToggleCollapsed(showAccordion);
+        widget.onToggleCollapsed!(showAccordion);
       }
     });
   }

lib/components/alert/gf_alert.dart

@@ -5,7 +5,7 @@ import 'package:getwidget/getwidget.dart';
 class GFAlert extends StatefulWidget {
   /// Alert has to be wrap inside the body like [GFFloatingWidget]. See [GFFloatingWidget]
   const GFAlert(
-      {Key key,
+      {Key? key,
       this.content,
       this.title,
       this.child,
@@ -24,45 +24,45 @@ class GFAlert extends StatefulWidget {
       : super(key: key);
 
   /// child of  type [Widget]is alternative to title key. title will get priority over child
-  final Widget child;
+  final Widget? child;
 
   /// title of type [String] used to describe the title of the [GFAlert]
-  final String title;
+  final String? title;
 
   /// child of  type [Widget]is alternative to title key. title will get priority over contentchild
-  final Widget contentChild;
+  final Widget? contentChild;
 
   /// title of type [String] used to describe the content of the [GFAlert]
-  final String content;
+  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 [GFColors] for background of [GFAlert]
-  final Color backgroundColor;
+  final Color? backgroundColor;
 
   ///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;
+  final double? width;
 
   ///type of [GFAlertType] which takes the type ie, basic, rounded and fullWidth for the [GFAlert]
   final GFAlertType type;
 
   /// type of [Alignment] used to align the text inside the [GFAlert]
-  final Alignment alignment;
+  final Alignment? alignment;
 
   ///type of [Widget] used for the buttons ie, OK, Cancel for the action in [GFAlert]
-  final Widget bottombar;
+  final Widget? bottombar;
 
   @override
   _GFAlertState createState() => _GFAlertState();
 }
 
 class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
-  AnimationController animationController;
-  Animation<double> animation;
+  late AnimationController animationController;
+  late Animation<double> animation;
 
   @override
   void initState() {
@@ -115,7 +115,7 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
                   Align(
                     alignment: widget.alignment ?? Alignment.topLeft,
                     child: widget.title != null
-                        ? Text(widget.title, style: widget.titleTextStyle)
+                        ? Text(widget.title!, style: widget.titleTextStyle)
                         : (widget.child ?? Container()),
                   ),
                   const SizedBox(
@@ -124,7 +124,7 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
                   Align(
                     alignment: widget.alignment ?? Alignment.topLeft,
                     child: widget.content != null
-                        ? Text(widget.content, style: widget.contentTextStyle)
+                        ? Text(widget.content!, style: widget.contentTextStyle)
                         : (widget.contentChild ?? Container()),
                   ),
                   const SizedBox(