Improved app ui #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

gregoriofs wants to merge 3 commits into main from tablebranch

Spotti/Spotti.xcodeproj/project.pbxproj

-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,8 @@ @@
     		C08DE670289D8895009B82C8 /* MilestoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C08DE66F289D8895009B82C8 /* MilestoneViewController.m */; };
     		C08DE673289D8BB2009B82C8 /* MilestoneCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C08DE672289D8BB2009B82C8 /* MilestoneCell.m */; };
     		C08DE676289D9480009B82C8 /* MilestoneCreatorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C08DE675289D9480009B82C8 /* MilestoneCreatorViewController.m */; };
+    		C08DE67828A43773009B82C8 /* exercise.png in Resources */ = {isa = PBXBuildFile; fileRef = C08DE67728A43772009B82C8 /* exercise.png */; };
+    		C08DE67A28A43892009B82C8 /* plan.png in Resources */ = {isa = PBXBuildFile; fileRef = C08DE67928A43892009B82C8 /* plan.png */; };
     		C0E57F39289362E600AEDEC6 /* ExerciseDetailSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = C0E57F38289362E600AEDEC6 /* ExerciseDetailSegue.m */; };
     		C0F6FBBF28998E03006B0EA7 /* sour-moha-rb5uiqzCOTo-unsplash.jpg in Resources */ = {isa = PBXBuildFile; fileRef = C0F6FBBE28998E03006B0EA7 /* sour-moha-rb5uiqzCOTo-unsplash.jpg */; };
     /* End PBXBuildFile section */
@@ Expand Down Expand Up / @@ -158,6 +160,8 @@ @@
     		C08DE672289D8BB2009B82C8 /* MilestoneCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MilestoneCell.m; sourceTree = "<group>"; };
     		C08DE674289D9480009B82C8 /* MilestoneCreatorViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MilestoneCreatorViewController.h; sourceTree = "<group>"; };
     		C08DE675289D9480009B82C8 /* MilestoneCreatorViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MilestoneCreatorViewController.m; sourceTree = "<group>"; };
+    		C08DE67728A43772009B82C8 /* exercise.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = exercise.png; path = ../../../../../Downloads/exercise.png; sourceTree = "<group>"; };
+    		C08DE67928A43892009B82C8 /* plan.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = plan.png; path = ../../../../../Downloads/plan.png; sourceTree = "<group>"; };
     		C0E57F37289362E600AEDEC6 /* ExerciseDetailSegue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExerciseDetailSegue.h; sourceTree = "<group>"; };
     		C0E57F38289362E600AEDEC6 /* ExerciseDetailSegue.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExerciseDetailSegue.m; sourceTree = "<group>"; };
     		C0F6FBBE28998E03006B0EA7 /* sour-moha-rb5uiqzCOTo-unsplash.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = "sour-moha-rb5uiqzCOTo-unsplash.jpg"; path = "../../../../../Downloads/sour-moha-rb5uiqzCOTo-unsplash.jpg"; sourceTree = "<group>"; };
@@ Expand Down Expand Up / @@ -245,6 +249,8 @@ @@
     				C0672346287612AD00F91288 /* SceneDelegate.m */,
     				C067234B287612AD00F91288 /* Main.storyboard */,
     				C067234E287612AE00F91288 /* Assets.xcassets */,
+    				C08DE67928A43892009B82C8 /* plan.png */,
+    				C08DE67728A43772009B82C8 /* exercise.png */,
     				C0F6FBBE28998E03006B0EA7 /* sour-moha-rb5uiqzCOTo-unsplash.jpg */,
     				C0672350287612AE00F91288 /* LaunchScreen.storyboard */,
     				C0672353287612AE00F91288 /* Info.plist */,
@@ Expand Down Expand Up / @@ -481,6 +487,8 @@ @@
     			buildActionMask = 2147483647;
     			files = (
     				C0672352287612AE00F91288 /* LaunchScreen.storyboard in Resources */,
+    				C08DE67828A43773009B82C8 /* exercise.png in Resources */,
+    				C08DE67A28A43892009B82C8 /* plan.png in Resources */,
     				C067234F287612AE00F91288 /* Assets.xcassets in Resources */,
     				C067234D287612AD00F91288 /* Main.storyboard in Resources */,
     				C0F6FBBF28998E03006B0EA7 /* sour-moha-rb5uiqzCOTo-unsplash.jpg in Resources */,
@@ Expand Down @@

Spotti/Spotti/API/APIManager.m

-Original file line number
+Diff line change
@@ Expand Up @@
                     int numExercisesPerArea = totalExercises/(workout.focusAreas.count);
                     NSMutableArray *exercises = [NSMutableArray new];
                     for(int i = 0; i < workout.focusAreas.count; i++){
-                        NSArray *currentExerciseNumbers = self.muscleNumbers[workout.focusAreas[i]];
+                        NSArray *currentExerciseNumbers = self.muscleNumbers[[[NSString stringWithString:workout.focusAreas[i]] stringByReplacingOccurrencesOfString:@" " withString:@""]];
                         NSArray *filteredArray = [results filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary* binding){
                             for(NSNumber* num in evaluatedObject[@"muscles"]){
                                 if([currentExerciseNumbers containsObject:num]){
@@ Expand Down @@

Spotti/Spotti/Assets.xcassets/biceps.imageset/Contents.json

-Original file line number
+Diff line change
@@ -0,0 +1,21 @@
+    {
+      "images" : [
+        {
+          "filename" : "biceps.png",
+          "idiom" : "universal",
+          "scale" : "1x"
+        },
+        {
+          "idiom" : "universal",
+          "scale" : "2x"
+        },
+        {
+          "idiom" : "universal",
+          "scale" : "3x"
+        }
+      ],
+      "info" : {
+        "author" : "xcode",
+        "version" : 1
+      }
+    }

Spotti/Spotti/Assets.xcassets/biceps.imageset/biceps.png

Sorry, something went wrong. Reload?