Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • android/org.benoitharrault.suguru
1 result
Show changes
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
fastlane/metadata/android/en-US/changelogs/7.txt 0 → 100644
View file @ 16afc6a2
Fix cells borders.
fastlane/metadata/android/fr-FR/changelogs/7.txt 0 → 100644
View file @ 16afc6a2
Correction sur les bordures des cellules.
lib/ui/widgets/game/cell.dart
View file @ 16afc6a2
...@@ -157,26 +157,24 @@ class CellWidget extends StatelessWidget { ...@@ -157,26 +157,24 @@ class CellWidget extends StatelessWidget {
borders = Border( borders = Border(
top: BorderSide( top: BorderSide(
width: cellBorderWidth, width: cellBorderWidth,
color: (hasBlockBorderTop || color: (hasBlockBorderTop || (cell.location.row == 0))
(((cell.location.row) % activity.board.boardSizeVertical) == 0))
? cellBorderDarkColor ? cellBorderDarkColor
: cellBorderLightColor), : cellBorderLightColor),
left: BorderSide( left: BorderSide(
width: cellBorderWidth, width: cellBorderWidth,
color: (hasBlockBorderLeft || color: (hasBlockBorderLeft || (cell.location.col == 0))
(((cell.location.col) % activity.board.boardSizeHorizontal) == 0))
? cellBorderDarkColor ? cellBorderDarkColor
: cellBorderLightColor), : cellBorderLightColor),
right: BorderSide( right: BorderSide(
width: cellBorderWidth, width: cellBorderWidth,
color: (hasBlockBorderRight || color: (hasBlockBorderRight ||
((((cell.location.col) + 1) % activity.board.boardSizeHorizontal) == 0)) ((cell.location.col + 1) == activity.board.boardSizeHorizontal))
? cellBorderDarkColor ? cellBorderDarkColor
: cellBorderLightColor), : cellBorderLightColor),
bottom: BorderSide( bottom: BorderSide(
width: cellBorderWidth, width: cellBorderWidth,
color: (hasBlockBorderBottom || color: (hasBlockBorderBottom ||
((((cell.location.row) + 1) % activity.board.boardSizeVertical) == 0)) ((cell.location.row + 1) == activity.board.boardSizeVertical))
? cellBorderDarkColor ? cellBorderDarkColor
: cellBorderLightColor), : cellBorderLightColor),
); );
......
lib/ui/widgets/game/game_board.dart
View file @ 16afc6a2
...@@ -47,36 +47,30 @@ class GameBoardWidget extends StatelessWidget { ...@@ -47,36 +47,30 @@ class GameBoardWidget extends StatelessWidget {
children: [ children: [
CellWidget( CellWidget(
cell: currentActivity.board.get(CellLocation.go(row, col)), cell: currentActivity.board.get(CellLocation.go(row, col)),
hasBlockBorderBottom: hasBlockBorderBottom: currentActivity.board
row == currentActivity.board.boardSizeVertical || .get(CellLocation.go(row, col))
currentActivity.board .blockId !=
.get(CellLocation.go(row, col))
.blockId !=
currentActivity.board
.get(CellLocation.go(row + 1, col))
.blockId,
hasBlockBorderLeft: col == 0 ||
currentActivity.board currentActivity.board
.get(CellLocation.go(row, col)) .get(CellLocation.go(row + 1, col))
.blockId != .blockId,
currentActivity.board hasBlockBorderLeft: currentActivity.board
.get(CellLocation.go(row, col - 1)) .get(CellLocation.go(row, col))
.blockId, .blockId !=
hasBlockBorderRight:
col == currentActivity.board.boardSizeVertical ||
currentActivity.board
.get(CellLocation.go(row, col))
.blockId !=
currentActivity.board
.get(CellLocation.go(row, col + 1))
.blockId,
hasBlockBorderTop: row == 0 ||
currentActivity.board currentActivity.board
.get(CellLocation.go(row, col)) .get(CellLocation.go(row, col - 1))
.blockId != .blockId,
currentActivity.board hasBlockBorderRight: currentActivity.board
.get(CellLocation.go(row - 1, col)) .get(CellLocation.go(row, col))
.blockId, .blockId !=
currentActivity.board
.get(CellLocation.go(row, col + 1))
.blockId,
hasBlockBorderTop: currentActivity.board
.get(CellLocation.go(row, col))
.blockId !=
currentActivity.board
.get(CellLocation.go(row - 1, col))
.blockId,
) )
], ],
), ),
......
pubspec.yaml
View file @ 16afc6a2
...@@ -3,7 +3,7 @@ description: A suguru game application. ...@@ -3,7 +3,7 @@ description: A suguru game application.
publish_to: "none" publish_to: "none"
version: 0.0.6+6 version: 0.0.7+7
environment: environment:
sdk: "^3.0.0" sdk: "^3.0.0"
......