Multiple changes

Author: alexandrei64

BetterRest/BetterRest.xcodeproj/project.xcworkspace/xcuserdata/alexandruandrei.xcuserdatad/UserInterfaceState.xcuserstate

@@ -9,7 +9,8 @@ import SwiftUI
 
 struct AstronautView: View {
     let astronaut: Astronaut
-    
+    let missions: [Mission]
+
     var body: some View {
         GeometryReader { geometry in
             ScrollView(.vertical) {
@@ -20,7 +21,12 @@ struct AstronautView: View {
                         .frame(width: geometry.size.width)
 
                     //  Challenge 2 ForEach self.mission -- make horizontal scroll view with missions (flight patch + name at bottom)
-
+               /*     ScrollView(.horizontal) {
+                        ForEach(self.missions) { mission in
+                            MissionListRow(mission: mission, showingNames: false)
+                        }
+                    }*/
+                    
                     Text(self.astronaut.description)
                         .padding()
                         .layoutPriority(1)
@@ -29,6 +35,16 @@ struct AstronautView: View {
         }
         .navigationBarTitle(Text(astronaut.name), displayMode: .inline)
     }
+    init(astronaut: Astronaut) {
+        self.astronaut = astronaut
+        
+        let missions: [Mission] = Bundle.main.decode("missions.json")
+        
+        let matches = missions.filter { mission in
+            mission.crew.contains(where: { $0.name == astronaut.id })
+        }
+        self.missions = matches
+    }
 }
 
 struct AstronautView_Previews: PreviewProvider {

Moonshot/Moonshot.xcodeproj/project.xcworkspace/xcuserdata/alexandruandrei.xcuserdatad/UserInterfaceState.xcuserstate

@@ -22,7 +22,7 @@ struct Question {
 struct SettingScreen: View {
     let questionAlternatives: [String] = ["5", "10", "20", "All"]
 
-    @State private var numberOfTables = 1
+    @State private var numberOfTables = 2
     @State private var questionSelection = 1
 
     var body: some View {
@@ -41,7 +41,7 @@ struct SettingScreen: View {
                     Spacer()
 
                     Group {
-                        Stepper(value: $numberOfTables, in: 1...12) {
+                        Stepper(value: $numberOfTables, in: 2...12) {
                             Text("Tables up to: \(numberOfTables)")
                                 .font(.title3)
                                 .fontWeight(.bold)
@@ -124,6 +124,7 @@ struct GameScreen: View {
 
                 Text("what's")
                     .font(.system(size: 30))
+                    .bold()
 
                 Text("")
                     .font(.system(size: 50))
@@ -162,7 +163,7 @@ struct GameScreen: View {
                 Spacer()
             }
         }
-        .onAppear(perform: { createQuestions(for: tablesReturned) })
+       // .onAppear(perform: { createQuestions(for: tablesReturned) })
         .preferredColorScheme(.light)
     }