fixing inconsistent player tiles ordering when logging a game (#196)

Progrunning · Apr 15, 2023 · 91bdaf8 · 91bdaf8
1 parent 3f6a83d
commit 91bdaf8
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 19 deletions.
diff --git a/board_games_companion/lib/extensions/players_extensions.dart b/board_games_companion/lib/extensions/players_extensions.dart
@@ -0,0 +1,7 @@
+import '../models/hive/player.dart';
+
+extension PlayersExtensions on List<Player> {
+  List<Player> sortAlphabetically() {
+    return [...this]..sort((player, otherPlayer) => player.name!.compareTo(otherPlayer.name!));
+  }
+}
diff --git a/board_games_companion/lib/models/hive/player.dart b/board_games_companion/lib/models/hive/player.dart
@@ -5,6 +5,8 @@ import 'package:image_picker/image_picker.dart';
 import '../../common/constants.dart';
 import '../../common/hive_boxes.dart';
 
+export '../../extensions/players_extensions.dart';
+
 part 'player.freezed.dart';
 part 'player.g.dart';
 

diff --git a/board_games_companion/lib/pages/playthroughs/playthrough_players_selection_view_model.dart b/board_games_companion/lib/pages/playthroughs/playthrough_players_selection_view_model.dart
@@ -18,9 +18,8 @@ abstract class _PlaythroughPlayersSelectionViewModel with Store {
   final PlayersStore _playersStore;
 
   @computed
-  ObservableList<Player> get players => ([..._playersStore.players]
-        ..sort((player, otherPlayer) => player.name!.compareTo(otherPlayer.name!)))
-      .asObservable();
+  ObservableList<Player> get players =>
+      ([..._playersStore.players].sortAlphabetically()).asObservable();
 
   @computed
   Map<String, Player> get playersMap => {for (final player in players) player.id: player};

diff --git a/board_games_companion/lib/pages/playthroughs/playthroughs_log_game_page.dart b/board_games_companion/lib/pages/playthroughs/playthroughs_log_game_page.dart
@@ -115,24 +115,22 @@ class PlaythroughsLogGamePageState extends State<PlaythroughsLogGamePage> {
                   },
                 ),
                 Observer(
-                  builder: (_) {
-                    return _PlayersSection(
-                      playthroughTimeline: viewModel.playthroughTimeline,
-                      gameFamily: viewModel.gameFamily,
-                      players: viewModel.playersState,
-                      onCreatePlayer: () => _handleCreatePlayer(),
-                      onSelectPlayers: () => _handleSelectPlayers(),
-                      onPlayerScoreUpdated: (playerScore, score) =>
-                          _handlePlayerScoreUpdate(playerScore, score),
-                    );
-                  },
+                  builder: (_) => _PlayersSection(
+                    playthroughTimeline: viewModel.playthroughTimeline,
+                    gameFamily: viewModel.gameFamily,
+                    players: viewModel.playersState,
+                    onCreatePlayer: () => _handleCreatePlayer(),
+                    onSelectPlayers: () => _handleSelectPlayers(),
+                    onPlayerScoreUpdated: (playerScore, score) =>
+                        _handlePlayerScoreUpdate(playerScore, score),
+                  ),
                 ),
-                Observer(builder: (_) {
-                  return _SubmitSection(
+                Observer(
+                  builder: (_) => _SubmitSection(
                     players: viewModel.playersState,
                     onLogPlaythrough: () => _handleLoggingPlaythrough(),
-                  );
-                }),
+                  ),
+                ),
               ],
             );
         }

diff --git a/board_games_companion/lib/pages/playthroughs/playthroughs_log_game_view_model.dart b/board_games_companion/lib/pages/playthroughs/playthroughs_log_game_view_model.dart
@@ -131,7 +131,7 @@ abstract class _PlaythroughsLogGameViewModel with Store {
     }
 
     playersState = PlaythroughsLogGamePlayers.playersSelected(
-      players: selectedPlayers,
+      players: selectedPlayers.sortAlphabetically(),
       playerScores: playerScores,
     );
   }