diff --git a/Set/SetGameModelView.swift b/Set/SetGameModelView.swift index 761cae2..f2ddf1a 100644 --- a/Set/SetGameModelView.swift +++ b/Set/SetGameModelView.swift @@ -20,7 +20,11 @@ class SetGameModelView: ObservableObject { } var cardsOnTable: Array { - model.displayedCards + model.displayedCards.filter(showCard) + } + + private func showCard(card: SetGameModelView.Card) -> Bool { + !card.isMatched } func newGame() { diff --git a/Set/SetGameView.swift b/Set/SetGameView.swift index e313944..9965e09 100644 --- a/Set/SetGameView.swift +++ b/Set/SetGameView.swift @@ -78,8 +78,6 @@ struct CardView: View { cardShape.aspectRatio(2/3, contentMode: .fit) if (card.isSelected) { cardShape.foregroundColor(selectedGreen) - } else if (card.isMatched) { - cardShape.foregroundColor(colors[card.matchId]) } else { cardShape.foregroundColor(.white) }