Merge branch 'master' of git://github.com/platform-platform/FlutterSwitch into platform-platform-master

Author: nickr-dev

lib/flutter_switch.dart

@@ -173,11 +173,12 @@ class _FlutterSwitchState extends State<FlutterSwitch>
     super.initState();
     _animationController = AnimationController(
       vsync: this,
+      value: widget.value ? 1.0 : 0.0,
       duration: Duration(milliseconds: 60),
     );
     _toggleAnimation = AlignmentTween(
-      begin: widget.value ? Alignment.centerRight : Alignment.centerLeft,
-      end: widget.value ? Alignment.centerLeft : Alignment.centerRight,
+      begin: Alignment.centerLeft,
+      end: Alignment.centerRight,
     ).animate(
       CurvedAnimation(parent: _animationController, curve: Curves.linear),
     );
@@ -192,6 +193,9 @@ class _FlutterSwitchState extends State<FlutterSwitch>
   @override
   void didUpdateWidget(FlutterSwitch oldWidget) {
     super.didUpdateWidget(oldWidget);
+
+    if (oldWidget.value == widget.value) return;
+
     if (widget.value)
       _animationController.forward();
     else

test/flutter_switch_test.dart

@@ -0,0 +1,108 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import '../lib/flutter_switch.dart';
+
+void main() {
+  group("FlutterSwitch", () {
+    final alignToggleIndicatorFinder = find.byWidgetPredicate(
+        (widget) => widget is Align && widget.child is Container);
+
+    testWidgets(
+      "displays the toggle indicator on the right if the given value is true",
+      (WidgetTester tester) async {
+        await tester.pumpWidget(
+          _FlutterSwitchTestbed(
+            value: true,
+          ),
+        );
+
+        final align = tester.widget<Align>(alignToggleIndicatorFinder);
+
+        expect(align.alignment, equals(Alignment.centerRight));
+      },
+    );
+
+    testWidgets(
+      "displays the toggle indicator on the left if the given value is false",
+      (WidgetTester tester) async {
+        await tester.pumpWidget(
+          _FlutterSwitchTestbed(
+            value: false,
+          ),
+        );
+
+        final align = tester.widget<Align>(alignToggleIndicatorFinder);
+
+        expect(align.alignment, equals(Alignment.centerLeft));
+      },
+    );
+
+    testWidgets(
+      "changes the toggle indicator alignment to the right on tap when the given value is false",
+      (WidgetTester tester) async {
+        await tester.pumpWidget(
+          _FlutterSwitchTestbed(
+            value: false,
+          ),
+        );
+
+        await tester.tap(find.byType(FlutterSwitch));
+        await tester.pump();
+
+        final align = tester.widget<Align>(alignToggleIndicatorFinder);
+
+        expect(align.alignment, equals(Alignment.centerLeft));
+      },
+    );
+
+    testWidgets(
+      "changes the toggle indicator alignment to the left on tap when the given value is true",
+      (WidgetTester tester) async {
+        await tester.pumpWidget(
+          _FlutterSwitchTestbed(
+            value: true,
+          ),
+        );
+
+        await tester.tap(find.byType(FlutterSwitch));
+        await tester.pumpAndSettle();
+
+        final align = tester.widget<Align>(alignToggleIndicatorFinder);
+
+        expect(align.alignment, equals(Alignment.centerLeft));
+      },
+    );
+  });
+}
+
+/// A testbed class needed to test the [FlutterSwitch] widget.
+class _FlutterSwitchTestbed extends StatelessWidget {
+  /// A callback that is called when the switch is toggled.
+  final ValueChanged<bool> onToggle;
+
+  /// An initial value of the switch.
+  final bool value;
+
+  /// Creates a new instance of this testbed.
+  const _FlutterSwitchTestbed({
+    Key key,
+    this.onToggle = _defaultOnToggle,
+    this.value,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      home: Scaffold(
+        body: FlutterSwitch(
+          value: value,
+          onToggle: onToggle,
+        ),
+      ),
+    );
+  }
+
+  /// A default on toggle callback of the switch.
+  static void _defaultOnToggle(bool value) {}
+}