Add update methods to UserData

SwiftUIShogi/Board Side/PieceStandView.swift

@@ -18,14 +18,14 @@ struct PieceStandView: View {
 
  ForEach(capturedPiecesWithoutPawns, id: \.self) { piece in
  Button(action: {
- self.userData.validMoves = self.userData.game.validMoves(from: .capturedPiece, piece: piece)
+ self.userData.updateForCapturedPiece(with: piece)
  }) {
  Text(piece.string)
  }
  }
  if !capturedPawnPieces.isEmpty {
  Button(action: {
- self.userData.validMoves = self.userData.game.validMoves(from: .capturedPiece, piece: self.capturedPawnPieces.first!)
+ self.userData.updateForCapturedPiece(with: self.capturedPawnPieces.first!)
  }) {
  Text(capturedPawnPieces.first!.string)
  }

SwiftUIShogi/Board/BoardView.swift

@@ -16,7 +16,7 @@ struct BoardSquaresView: View {
  var body: some View {
  SquaresView() { square in
  Button(action: {
- self.updateUserData(with: square)
+ self.userData.updateForBoard(with: square)
  }) {
  SquareView(square: square, piece: self.userData.game.board[square])
  .scaleEffect(self.scaleEffect(at: square))
@@ -25,27 +25,6 @@ struct BoardSquaresView: View {
  }
  }
 
- private func updateUserData(with square: Square) {
- switch (validMove(to: square), piece(at: square)) {
- case let (move?, _):
- try! userData.game.perform(move)
- userData.previousMove = move
- userData.validMoves = []
- case let (_, piece?):
- userData.validMoves = userData.game.validMoves(from: .board(square), piece: piece)
- default:
- break
- }
- }
-
- private func validMove(to square: Square) -> Move? {
- userData.validMoves.first { $0.destination == .board(square) }
- }
-
- private func piece(at square: Square) -> Piece? {
- userData.game.board[square]
- }
-
  private func scaleEffect(at square: Square) -> CGFloat {
  userData.validMoves.contains(where: { $0.source == .board(square) }) ? 1.2 : 1
  }

SwiftUIShogi/UserData.swift

@@ -10,3 +10,32 @@ final class UserData: ObservableObject {
  self.game = game
  }
 }
+
+extension UserData {
+ func updateForBoard(with square: Square) {
+ switch (validMove(to: square), piece(at: square)) {
+ case let (move?, _):
+ try! game.perform(move)
+ previousMove = move
+ validMoves = []
+ case let (_, piece?):
+ validMoves = game.validMoves(from: .board(square), piece: piece)
+ default:
+ break
+ }
+ }
+
+ func updateForCapturedPiece(with piece: Piece) {
+ validMoves = game.validMoves(from: .capturedPiece, piece: piece)
+ }
+}
+
+private extension UserData {
+ func validMove(to square: Square) -> Move? {
+ validMoves.first { $0.destination == .board(square) }
+ }
+
+ func piece(at square: Square) -> Piece? {
+ game.board[square]
+ }
+}