Don't Shuffle Tiles on First Run

Author: tsinis

lib/puzzle/bloc/puzzle_bloc.dart

@@ -21,8 +21,11 @@ class PuzzleBloc extends Bloc<PuzzleEvent, PuzzleState> {
     on<PuzzleReset>(_onPuzzleReset);
   }
 
-  void _onPuzzleInitialized(PuzzleInitialized _, Emitter<PuzzleState> emit) {
-    final puzzle = _generatePuzzle(_size);
+  void _onPuzzleInitialized(
+    PuzzleInitialized event,
+    Emitter<PuzzleState> emit,
+  ) {
+    final puzzle = _generatePuzzle(_size, isFirstRun: event.isFirstRun);
     emit(
       PuzzleState(
         puzzle: puzzle.sort(),
@@ -82,7 +85,7 @@ class PuzzleBloc extends Bloc<PuzzleEvent, PuzzleState> {
   }
 
   /// Build a randomized, solvable puzzle of the given size.
-  Puzzle _generatePuzzle(int size) {
+  Puzzle _generatePuzzle(int size, {bool isFirstRun = false}) {
     final correctPositions = <Position>[];
     final currentPositions = <Position>[];
     final whitespacePosition = Position(x: size, y: size);
@@ -101,7 +104,9 @@ class PuzzleBloc extends Bloc<PuzzleEvent, PuzzleState> {
       }
     }
 
-    currentPositions.shuffle(random);
+    if (!isFirstRun) {
+      currentPositions.shuffle(random);
+    }
 
     final tiles =
         _getTileListFromPositions(size, correctPositions, currentPositions);

lib/puzzle/bloc/puzzle_event.dart

@@ -10,10 +10,11 @@ abstract class PuzzleEvent extends Equatable {
 }
 
 class PuzzleInitialized extends PuzzleEvent {
+  final bool isFirstRun;
   @override
-  List<Object> get props => [];
+  List<Object> get props => [isFirstRun];
 
-  const PuzzleInitialized();
+  const PuzzleInitialized({this.isFirstRun = false});
 }
 
 class TileTapped extends PuzzleEvent {

lib/puzzle/view/puzzle_page.dart

@@ -65,7 +65,8 @@ class PuzzleView extends StatelessWidget {
             providers: [
               BlocProvider(create: (_) => TimerBloc(ticker: const Ticker())),
               BlocProvider(
-                create: (_) => PuzzleBloc(4)..add(const PuzzleInitialized()),
+                create: (_) => PuzzleBloc(4)
+                  ..add(const PuzzleInitialized(isFirstRun: true)),
               ),
             ],
             child: const _Puzzle(key: Key('puzzle_view_puzzle')),