Merge pull request #31 from boringdeveloper/0.2.x

null safety migration

Author: boringdeveloper

example/pubspec.lock

@@ -157,4 +157,4 @@ packages:
     source: hosted
     version: "2.1.0"
 sdks:
-  dart: ">=2.12.0-0.0 <3.0.0"
+  dart: ">=2.12.0 <3.0.0"

lib/flutter_switch.dart

@@ -12,14 +12,14 @@ class FlutterSwitch extends StatefulWidget {
   ///
 
   const FlutterSwitch({
-    Key key,
-    @required this.value,
-    @required this.onToggle,
+    Key? key,
+    required this.value,
+    required this.onToggle,
     this.activeColor = Colors.blue,
     this.inactiveColor = Colors.grey,
     this.activeTextColor = Colors.white70,
     this.inactiveTextColor = Colors.white70,
-    this.toggleColor,
+    this.toggleColor = Colors.white,
     this.activeToggleColor,
     this.inactiveToggleColor,
     this.width = 70.0,
@@ -43,11 +43,6 @@ class FlutterSwitch extends StatefulWidget {
     this.inactiveIcon,
     this.duration = const Duration(milliseconds: 200),
   })  : assert(
-            (toggleColor == null || activeToggleColor == null) &&
-                (toggleColor == null || inactiveToggleColor == null),
-            'Cannot provide toggleColor when an activeToggleColor or inactiveToggleColor was given\n'
-            'To give the toggle a color, use "activeToggleColor: color" and "inactiveToggleColor: color".'),
-        assert(
             (switchBorder == null || activeSwitchBorder == null) &&
                 (switchBorder == null || inactiveSwitchBorder == null),
             'Cannot provide switchBorder when an activeSwitchBorder or inactiveSwitchBorder was given\n'
@@ -102,7 +97,7 @@ class FlutterSwitch extends StatefulWidget {
   ///
   /// [activeTextColor] - The color to use on the text value when the switch is on.
   /// [activeTextFontWeight] - The font weight to use on the text value when the switch is on.
-  final String activeText;
+  final String? activeText;
 
   /// The text to display when the switch is off.
   /// This parameter is only necessary when [showOnOff] property is true.
@@ -113,7 +108,7 @@ class FlutterSwitch extends StatefulWidget {
   ///
   /// [inactiveTextColor] - The color to use on the text value when the switch is off.
   /// [inactiveTextFontWeight] - The font weight to use on the text value when the switch is off.
-  final String inactiveText;
+  final String? inactiveText;
 
   /// The color to use on the switch when the switch is on.
   ///
@@ -141,13 +136,13 @@ class FlutterSwitch extends StatefulWidget {
   /// This parameter is only necessary when [showOnOff] property is true.
   ///
   /// Defaults to [FontWeight.w900].
-  final FontWeight activeTextFontWeight;
+  final FontWeight? activeTextFontWeight;
 
   /// The font weight to use on the text value when the switch is off.
   /// This parameter is only necessary when [showOnOff] property is true.
   ///
   /// Defaults to [FontWeight.w900].
-  final FontWeight inactiveTextFontWeight;
+  final FontWeight? inactiveTextFontWeight;
 
   /// The color to use on the toggle of the switch.
   ///
@@ -160,13 +155,13 @@ class FlutterSwitch extends StatefulWidget {
   ///
   /// If [inactiveToggleColor] is used and this property is null. the value of
   /// [Colors.white] will be used.
-  final Color activeToggleColor;
+  final Color? activeToggleColor;
 
   /// The color to use on the toggle of the switch when the given value is false.
   ///
   /// If [activeToggleColor] is used and this property is null. the value of
   /// [Colors.white] will be used.
-  final Color inactiveToggleColor;
+  final Color? inactiveToggleColor;
 
   /// The given width of the switch.
   ///
@@ -204,44 +199,44 @@ class FlutterSwitch extends StatefulWidget {
   /// This property will give a uniform border to both states of the toggle
   ///
   /// If the [activeSwitchBorder] or [inactiveSwitchBorder] is used, this property must be null.
-  final BoxBorder switchBorder;
+  final BoxBorder? switchBorder;
 
   /// The border of the switch when the given value is true.
   ///
   /// This property is optional.
-  final BoxBorder activeSwitchBorder;
+  final BoxBorder? activeSwitchBorder;
 
   /// The border of the switch when the given value is false.
   ///
   /// This property is optional.
-  final BoxBorder inactiveSwitchBorder;
+  final BoxBorder? inactiveSwitchBorder;
 
   /// The border of the toggle.
   ///
   /// This property will give a uniform border to both states of the toggle
   ///
   /// If the [activeToggleBorder] or [inactiveToggleBorder] is used, this property must be null.
-  final BoxBorder toggleBorder;
+  final BoxBorder? toggleBorder;
 
   /// The border of the toggle when the given value is true.
   ///
   /// This property is optional.
-  final BoxBorder activeToggleBorder;
+  final BoxBorder? activeToggleBorder;
 
   /// The border of the toggle when the given value is false.
   ///
   /// This property is optional.
-  final BoxBorder inactiveToggleBorder;
+  final BoxBorder? inactiveToggleBorder;
 
   /// The icon inside the toggle when the given value is true.
   ///
   /// This property is optional.
-  final Icon activeIcon;
+  final Icon? activeIcon;
 
   /// The icon inside the toggle when the given value is false.
   ///
   /// This property is optional.
-  final Icon inactiveIcon;
+  final Icon? inactiveIcon;
 
   /// The duration in milliseconds to change the state of the switch
   ///
@@ -254,8 +249,8 @@ class FlutterSwitch extends StatefulWidget {
 
 class _FlutterSwitchState extends State<FlutterSwitch>
     with SingleTickerProviderStateMixin {
-  Animation _toggleAnimation;
-  AnimationController _animationController;
+  late final Animation _toggleAnimation;
+  late final AnimationController _animationController;
 
   @override
   void initState() {
@@ -298,19 +293,23 @@ class _FlutterSwitchState extends State<FlutterSwitch>
   Widget build(BuildContext context) {
     Color _toggleColor = Colors.white;
     Color _switchColor = Colors.white;
-    Border _switchBorder;
-    Border _toggleBorder;
+    Border? _switchBorder;
+    Border? _toggleBorder;
 
     if (widget.value) {
       _toggleColor = widget.activeToggleColor ?? widget.toggleColor;
       _switchColor = widget.activeColor;
-      _switchBorder = widget.activeSwitchBorder ?? widget.switchBorder;
-      _toggleBorder = widget.activeToggleBorder ?? widget.toggleBorder;
+      _switchBorder = widget.activeSwitchBorder as Border? ??
+          widget.switchBorder as Border?;
+      _toggleBorder = widget.activeToggleBorder as Border? ??
+          widget.toggleBorder as Border?;
     } else {
       _toggleColor = widget.inactiveToggleColor ?? widget.toggleColor;
       _switchColor = widget.inactiveColor;
-      _switchBorder = widget.inactiveSwitchBorder ?? widget.switchBorder;
-      _toggleBorder = widget.inactiveToggleBorder ?? widget.toggleBorder;
+      _switchBorder = widget.inactiveSwitchBorder as Border? ??
+          widget.switchBorder as Border?;
+      _toggleBorder = widget.inactiveToggleBorder as Border? ??
+          widget.toggleBorder as Border?;
     }
 
     double _textSpace = widget.width - widget.toggleSize;
@@ -370,7 +369,7 @@ class _FlutterSwitchState extends State<FlutterSwitch>
                         height: widget.toggleSize,
                         decoration: BoxDecoration(
                           shape: BoxShape.circle,
-                          color: _toggleColor ?? Colors.white,
+                          color: _toggleColor,
                           border: _toggleBorder,
                         ),
                         child: Container(
@@ -405,18 +404,15 @@ class _FlutterSwitchState extends State<FlutterSwitch>
     );
   }
 
-  FontWeight get _activeTextFontWeight => widget.activeTextFontWeight != null
-      ? widget.activeTextFontWeight
-      : FontWeight.w900;
+  FontWeight get _activeTextFontWeight =>
+      widget.activeTextFontWeight ?? FontWeight.w900;
   FontWeight get _inactiveTextFontWeight =>
-      widget.inactiveTextFontWeight != null
-          ? widget.inactiveTextFontWeight
-          : FontWeight.w900;
+      widget.inactiveTextFontWeight ?? FontWeight.w900;
 
   Widget get _activeText {
     if (widget.showOnOff) {
       return Text(
-        (widget?.activeText != null) ? widget.activeText : "On",
+        widget.activeText ?? "On",
         style: TextStyle(
           color: widget.activeTextColor,
           fontWeight: _activeTextFontWeight,
@@ -431,7 +427,7 @@ class _FlutterSwitchState extends State<FlutterSwitch>
   Widget get _inactiveText {
     if (widget.showOnOff) {
       return Text(
-        (widget?.inactiveText != null) ? widget.inactiveText : "Off",
+        widget.inactiveText ?? "Off",
         style: TextStyle(
           color: widget.inactiveTextColor,
           fontWeight: _inactiveTextFontWeight,

pubspec.lock

@@ -143,4 +143,4 @@ packages:
     source: hosted
     version: "2.1.0"
 sdks:
-  dart: ">=2.12.0-0.0 <3.0.0"
+  dart: ">=2.12.0 <3.0.0"

pubspec.yaml

@@ -4,7 +4,7 @@ version: 0.2.2
 homepage: https://github.com/boringdeveloper/FlutterSwitch
 
 environment:
-  sdk: ">=2.8.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   flutter:

test/flutter_switch_test.dart

@@ -74,40 +74,6 @@ void main() {
       },
     );
 
-    testWidgets(
-      "throws an assertion error when both toggleColor and activeToggleColor property is not null",
-      (WidgetTester tester) async {
-        await tester.pumpWidget(
-          _FlutterSwitchTest(
-            status: false,
-            toggleColor: Colors.white,
-            activeToggleColor: Colors.blue,
-          ),
-        );
-
-        final assertion = tester.takeException();
-
-        expect(assertion, isAssertionError);
-      },
-    );
-
-    testWidgets(
-      "throws an assertion error when both toggleColor and inactiveToggleColor property is not null",
-      (WidgetTester tester) async {
-        await tester.pumpWidget(
-          _FlutterSwitchTest(
-            status: false,
-            toggleColor: Colors.blue,
-            inactiveToggleColor: Colors.blueGrey,
-          ),
-        );
-
-        final assertion = tester.takeException();
-
-        expect(assertion, isAssertionError);
-      },
-    );
-
     testWidgets(
       "throws an assertion error when both switchBorder and activeSwitchBorder property is not null",
       (WidgetTester tester) async {
@@ -205,22 +171,16 @@ void main() {
 /// A testbed class needed to test the [FlutterSwitch] widget.
 class _FlutterSwitchTest extends StatefulWidget {
   final bool status;
-  final Color toggleColor;
-  final Color activeToggleColor;
-  final Color inactiveToggleColor;
-  final Border switchBorder;
-  final Border activeSwitchBorder;
-  final Border inactiveSwitchBorder;
-  final Border toggleBorder;
-  final Border activeToggleBorder;
-  final Border inactiveToggleBorder;
+  final Border? switchBorder;
+  final Border? activeSwitchBorder;
+  final Border? inactiveSwitchBorder;
+  final Border? toggleBorder;
+  final Border? activeToggleBorder;
+  final Border? inactiveToggleBorder;
 
   _FlutterSwitchTest({
-    Key key,
-    this.status,
-    this.toggleColor,
-    this.activeToggleColor,
-    this.inactiveToggleColor,
+    Key? key,
+    required this.status,
     this.switchBorder,
     this.activeSwitchBorder,
     this.inactiveSwitchBorder,
@@ -251,9 +211,6 @@ class __FlutterSwitchTestState extends State<_FlutterSwitchTest> {
       home: Scaffold(
         body: FlutterSwitch(
           value: _status,
-          toggleColor: widget.toggleColor,
-          activeToggleColor: widget.activeToggleColor,
-          inactiveToggleColor: widget.inactiveToggleColor,
           switchBorder: widget.switchBorder,
           activeSwitchBorder: widget.activeSwitchBorder,
           inactiveSwitchBorder: widget.inactiveSwitchBorder,