Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions lib/src/view/game/game_player.dart
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ class GamePlayer extends StatelessWidget {
),
if (timeToMove != null)
MoveExpiration(timeToMove: timeToMove!, mePlaying: mePlaying)
else if (materialDiff != null)
else
MaterialDifferenceDisplay(
materialDiff: materialDiff!,
materialDiff: materialDiff,
materialDifferenceFormat: materialDifferenceFormat,
),
// to avoid shifts use an empty text widget
Expand Down Expand Up @@ -322,26 +322,28 @@ class MaterialDifferenceDisplay extends StatelessWidget {
this.materialDifferenceFormat = MaterialDifferenceFormat.materialDifference,
});

final MaterialDiffSide materialDiff;
final MaterialDiffSide? materialDiff;
final MaterialDifferenceFormat? materialDifferenceFormat;

@override
Widget build(BuildContext context) {
final IMap<Role, int> piecesToRender =
(materialDifferenceFormat == MaterialDifferenceFormat.capturedPieces
? materialDiff.capturedPieces
: materialDiff.pieces);
materialDiff != null
? (materialDifferenceFormat == MaterialDifferenceFormat.capturedPieces
? materialDiff!.capturedPieces
: materialDiff!.pieces)
: IMap();

return materialDifferenceFormat?.visible ?? true
? Row(
children: [
for (final role in Role.values)
for (int i = 0; i < piecesToRender[role]!; i++)
for (int i = 0; i < (piecesToRender.get(role) ?? 0); i++)
Icon(_iconByRole[role], size: 13, color: textShade(context, 0.5)),
const SizedBox(width: 3),
Text(
style: TextStyle(fontSize: 13, color: textShade(context, 0.5)),
materialDiff.score > 0 ? '+${materialDiff.score}' : '',
materialDiff != null && materialDiff!.score > 0 ? '+${materialDiff!.score}' : '',
),
],
)
Expand Down