Generator feature

FitnessApp.xcodeproj/project.pbxproj

@@ -17,8 +17,9 @@
 		7C17544C25680F4600E6685E /* FitnessAppUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C17544B25680F4600E6685E /* FitnessAppUITests.swift */; };
 		7C17545C256830FC00E6685E /* Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C17545B256830FC00E6685E /* Menu.swift */; };
 		7C17545E25683E1100E6685E /* GeneratorDisplay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C17545D25683E1000E6685E /* GeneratorDisplay.swift */; };
-		7C1754612568624200E6685E /* CalorieCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C1754602568624200E6685E /* CalorieCalculator.swift */; };
+		7C1754612568624200E6685E /* CalorieCalculatorDisplay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C1754602568624200E6685E /* CalorieCalculatorDisplay.swift */; };
 		7C175467256D47AE00E6685E /* GenerateSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C175466256D47AE00E6685E /* GenerateSelection.swift */; };
+		7C175469256E987E00E6685E /* CalorieCalculatorSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C175468256E987E00E6685E /* CalorieCalculatorSelection.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -55,8 +56,9 @@
 		7C17544D25680F4600E6685E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		7C17545B256830FC00E6685E /* Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Menu.swift; sourceTree = "<group>"; };
 		7C17545D25683E1000E6685E /* GeneratorDisplay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneratorDisplay.swift; sourceTree = "<group>"; };
-		7C1754602568624200E6685E /* CalorieCalculator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalorieCalculator.swift; sourceTree = "<group>"; };
+		7C1754602568624200E6685E /* CalorieCalculatorDisplay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalorieCalculatorDisplay.swift; sourceTree = "<group>"; };
 		7C175466256D47AE00E6685E /* GenerateSelection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenerateSelection.swift; sourceTree = "<group>"; };
+		7C175468256E987E00E6685E /* CalorieCalculatorSelection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalorieCalculatorSelection.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -143,7 +145,8 @@
 				7C17545B256830FC00E6685E /* Menu.swift */,
 				7C17545D25683E1000E6685E /* GeneratorDisplay.swift */,
 				7C175466256D47AE00E6685E /* GenerateSelection.swift */,
-				7C1754602568624200E6685E /* CalorieCalculator.swift */,
+				7C1754602568624200E6685E /* CalorieCalculatorDisplay.swift */,
+				7C175468256E987E00E6685E /* CalorieCalculatorSelection.swift */,
 			);
 			path = ViewControllers;
 			sourceTree = "<group>";
@@ -280,9 +283,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				7C17543125680F4300E6685E /* FitnessApp.xcdatamodeld in Sources */,
-				7C1754612568624200E6685E /* CalorieCalculator.swift in Sources */,
+				7C1754612568624200E6685E /* CalorieCalculatorDisplay.swift in Sources */,
 				7C17542725680F4300E6685E /* AppDelegate.swift in Sources */,
 				7C17545E25683E1100E6685E /* GeneratorDisplay.swift in Sources */,
+				7C175469256E987E00E6685E /* CalorieCalculatorSelection.swift in Sources */,
 				7C17545C256830FC00E6685E /* Menu.swift in Sources */,
 				7C175467256D47AE00E6685E /* GenerateSelection.swift in Sources */,
 				7C17542925680F4300E6685E /* SceneDelegate.swift in Sources */,

FitnessApp.xcodeproj/xcuserdata/thomasv5.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,4 +3,22 @@
    uuid = "088A9208-DA12-49D5-8D54-03BE8E29FC61"
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "4067CD1D-B83F-4B3C-B48F-F9D07C9543A0"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "FitnessAppUITests/FitnessAppUITests.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "21"
+            endingLineNumber = "21"
+            landmarkName = "FitnessAppUITests"
+            landmarkType = "3">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

FitnessApp/AppDelegate.swift

@@ -17,8 +17,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         // changed the colour of the
-       // UITabBar.appearance().barTintColor = .black
-        //UITabBar.appearance().tintColor = .red
+        UITabBar.appearance().barTintColor = .black
+        UITabBar.appearance().tintColor = .red
 
         return true
     }

FitnessApp/Assets.xcassets/FitnessGen-logos.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "FitnessGen-logos.jpeg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

FitnessApp/Assets.xcassets/FitnessGen-logos_black.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "FitnessGen-logos_black.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

FitnessApp/Assets.xcassets/FitnessGen-logos_transparent.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "FitnessGen-logos_transparent.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

FitnessApp/Assets.xcassets/FitnessGen-logos_white.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "FitnessGen-logos_white.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

FitnessApp/Assets.xcassets/Workout.imageset/Contents.json → FitnessApp/Assets.xcassets/Workout1.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "Workout.jpg",
+      "filename" : "Group 1.png",
       "scale" : "1x"
     },
     {

FitnessApp/Assets.xcassets/Workout2.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Group 2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

FitnessApp/Assets.xcassets/Workout3.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Group 3.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

FitnessApp/Assets.xcassets/calculator.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icons8-calculator-30.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

FitnessApp/Assets.xcassets/icons8-calculator-31.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icons8-calculator-30.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

FitnessApp/Assets.xcassets/icons8-dumbbell-31.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icons8-dumbbell-30.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

FitnessApp/Assets.xcassets/icons8-dumbbell-90.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icons8-dumbbell-90.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

FitnessApp/Assets.xcassets/menu.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "menu.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

FitnessApp/Assets.xcassets/workout.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icons8-dumbbell-30.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

FitnessApp/Assets.xcassets/workoutsBackground.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "workoutsBackground.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}