Merge pull request #9 from dillonfagan/shuffle

Add shuffle functionality to SetupPage
dillonfagan · Nov 1, 2022 · ec37b13 · ec37b13
2 parents 8a35d8b + 64a2b9e
commit ec37b13
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/lib/pages/setup/setup.dart b/lib/pages/setup/setup.dart
@@ -28,6 +28,19 @@ class _SetupPageState extends State<SetupPage> {
     final turnLength = mob.turnLength;
 
     return Scaffold(
+      appBar: AppBar(
+        backgroundColor: Colors.transparent,
+        elevation: 0,
+        leading: mobbers.length > 1
+            ? IconButton(
+                onPressed: () {
+                  mob.shuffleMobbers();
+                },
+                icon: const Icon(Icons.rotate_left_rounded),
+                tooltip: 'Shuffle mobbers',
+              )
+            : null,
+      ),
       body: Center(
         child: Container(
           constraints: BoxConstraints(

diff --git a/lib/pages/timer/widgets/appbar_factory.dart b/lib/pages/timer/widgets/appbar_factory.dart
@@ -13,7 +13,7 @@ class AppBarFactory {
       leading: IconButton(
         onPressed: () {
           mob.reset();
-          Navigator.of(context).pushReplacement(MaterialPageRoute(
+          Navigator.of(context).pop(MaterialPageRoute(
             builder: (_) => const SetupPage(),
           ));
         },

diff --git a/lib/providers/mob.dart b/lib/providers/mob.dart
@@ -15,6 +15,11 @@ class MobProvider extends ChangeNotifier {
   int _currentMobberIndex = 0;
   int _turns = 0;
 
+  void shuffleMobbers() {
+    _mobbers.shuffle();
+    notifyListeners();
+  }
+
   MobState _state = MobState.waiting;
 
   MobState get state => _state;