Mercurial > public > geoquiz

changeset 1:259a15f485c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bug with NavigationLink
author Dennis C. M. <dennis@denniscm.com>
date Tue, 20 Sep 2022 11:53:54 +0200
parents 413e2d21333e
children 5b7c89bd45c3
files GeoQuiz/ContentView.swift GeoQuiz/Logic/CustomGradients.swift GeoQuiz/Logic/GameSelection.swift
diffstat 3 files changed, 36 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/GeoQuiz/ContentView.swift	Tue Sep 20 08:13:26 2022 +0200
+++ b/GeoQuiz/ContentView.swift	Tue Sep 20 11:53:54 2022 +0200
@@ -16,21 +16,47 @@
             ScrollView(showsIndicators: false) {
                 VStack(spacing: 20) {
                     
-                    NavigationLink(tag: GameName.guessTheFlag, selection: $gameName) {
-                        GuessTheFlagView(gameName: $gameName)
-                    } label: {
+                    NavigationLink(
+                        destination: GuessTheFlagView(gameName: $gameName),
+                        tag: GameName.guessTheFlag,
+                        selection: $gameName
+                    ) {
                         GameButton(
                             gradient: .main,
-                            level: "Level 1", symbol: "globe.americas.fill", name: "Guess the flag"
+                            level: "Level 1", symbol: "flag.fill", name: "Guess the flag"
                         )
                     }
                     
-                    NavigationLink(tag: GameName.guessTheCapital, selection: $gameName) {
-                        GuessTheCapitalView(gameName: $gameName)
-                    } label: {
+                    NavigationLink(
+                        destination: GuessTheCapitalView(gameName: $gameName),
+                        tag: GameName.guessTheCapital,
+                        selection: $gameName
+                    ) {
                         GameButton(
                             gradient: .secondary,
-                            level: "Level 2", symbol: "globe.americas.fill", name: "Guess the capital"
+                            level: "Level 2", symbol: "building.2.fill", name: "Guess the capital"
+                        )
+                    }
+                    
+                    NavigationLink(
+                        destination: Text("Guess the country"),
+                        tag: GameName.guessTheCountry,
+                        selection: $gameName
+                    ) {
+                        GameButton(
+                            gradient: .tertiary,
+                            level: "Level 3", symbol: "globe.americas.fill", name: "Guess the country"
+                        )
+                    }
+                    
+                    NavigationLink(
+                        destination: Text("Guess the population"),
+                        tag: GameName.guessThePopulation,
+                        selection: $gameName
+                    ) {
+                        GameButton(
+                            gradient: .quaternary,
+                            level: "Level 4", symbol: "person.3.fill", name: "Guess the population"
                         )
                     }
                 }
--- a/GeoQuiz/Logic/CustomGradients.swift	Tue Sep 20 08:13:26 2022 +0200
+++ b/GeoQuiz/Logic/CustomGradients.swift	Tue Sep 20 11:53:54 2022 +0200
@@ -22,6 +22,6 @@
     }
     
     static var quaternary: Gradient {
-        Gradient(colors: [Color("PinkLavender"), Color("Main2")])
+        Gradient(colors: [Color("MaizeCrayola"), Color("MiddleRed")])
     }
 }
--- a/GeoQuiz/Logic/GameSelection.swift	Tue Sep 20 08:13:26 2022 +0200
+++ b/GeoQuiz/Logic/GameSelection.swift	Tue Sep 20 11:53:54 2022 +0200
@@ -8,5 +8,5 @@
 import Foundation
 
 enum GameName {
-    case guessTheFlag, guessTheCapital
+    case guessTheFlag, guessTheCapital, guessTheCountry, guessThePopulation
 }