Merge pull request #1 from quickpose/feature/pete-tidyup

tidy up

Author: dvolkhonskiy

FitCount.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,6 +1,10 @@
 {
   "colors" : [
     {
+      "color" : {
+        "platform" : "universal",
+        "reference" : "systemIndigoColor"
+      },
       "idiom" : "universal"
     }
   ],

FitCount/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -12,15 +12,13 @@ class SessionConfig: ObservableObject {
     @Published var nReps : Int = 1
     @Published var nMinutes : Int = 0
     @Published var nSeconds : Int = 1
-    
     @Published var useReps: Bool = true
     @Published var exercise: Exercise = exercises[0] // use first exercise by default but change in the ExerciseDetailsView
 }
 
 struct ContentView: View {
     @StateObject var viewModel = ViewModel()
-    @StateObject var sessionConfig: SessionConfig = SessionConfig()
-    
+    @StateObject var sessionConfig = SessionConfig()
 
     var body: some View {
         NavigationStack(path: $viewModel.path) {
@@ -34,9 +32,11 @@ struct ContentView: View {
                                         .font(.headline)
                                 }
                                 .padding()
-                                .cornerRadius(8) // Add corner radius for a rounded look
+                                .cornerRadius(8)
                             }.navigationDestination(for: Exercise.self) { exercise in
-                                ExerciseDetailsView(exercise: exercise).environmentObject(viewModel).environmentObject(sessionConfig)
+                                ExerciseDetailsView(exercise: exercise)
+                                    .environmentObject(viewModel)
+                                    .environmentObject(sessionConfig)
                             }
                         }
                         .background(.white)
@@ -60,13 +60,9 @@ struct ContentView: View {
 
 
 class ViewModel: ObservableObject {
-    @Published var path: NavigationPath = NavigationPath()
-}
-
-struct ContentView_Previews: PreviewProvider {
-    static var previews: some View {
-        ContentView()
+    @Published var path = NavigationPath()
+    
+    func popToRoot(){
+        path.removeLast(path.count) // pop to root
     }
 }
-
-

FitCount/ContentView.swift

@@ -19,9 +19,9 @@ struct Exercise: Identifiable, Hashable {
 
 let exercises = [
     Exercise(
-        name: "Biceps Curls",
+        name: "Bicep Curls",
         details: "Lift weights in both hands by bending your elbow and lifting them towards your shoulder.",
-        features: [.fitness(.bicepsCurls), .overlay(.upperBody)]
+        features: [.fitness(.bicepCurls), .overlay(.upperBody)]
     ),
     Exercise(
         name: "Squats",

FitCount/FitCountApp.swift

@@ -25,7 +25,7 @@ struct HistoryView: View {
                                     Text(sessionData.exercise)
                                         .font(.title)
                                         .fontWeight(.bold)
-                                        .foregroundColor(.indigo)
+                                        .foregroundColor(Color("AccentColor"))
 
                                     Text(sessionData.date.formatted(
                                         .dateTime

FitCount/History/HistoryView.swift

@@ -8,7 +8,6 @@
 import SwiftUI
 import PagerTabStripView
 
-
 struct TitleNavBarItem: View {
     let title: String
 
@@ -36,7 +35,6 @@ struct ExerciseDetailsView: View {
                 .font(.body)
                 .padding()
 
-            
             Spacer()
 
             PagerTabStripView(
@@ -117,8 +115,8 @@ struct ExerciseDetailsView: View {
                 Text("Start workout")
                     .foregroundColor(.white)
                     .padding()
-                    .background(.indigo) // Set background color to the main color
-                    .cornerRadius(8) // Add corner radius for a rounded look
+                    .background(Color("AccentColor"))
+                    .cornerRadius(8)
 
             }
             .navigationDestination(for: String.self) { _ in

FitCount/Preview Content/Preview Assets.xcassets/Contents.json

@@ -31,9 +31,3 @@ struct InstructionsView: View {
 
     }
 }
-
-struct InstructionsView_Previews: PreviewProvider {
-    static var previews: some View {
-        InstructionsView()
-    }
-}