diff --git a/.gitignore b/.gitignore index c9e4de1..eebe035 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ build xcuserdata/ *.diff Other Resources +.idea/workspace.xml \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 6564d52..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 99e63db..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,743 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - GeneralJavaScript - - - JavaScript - - - Potentially confusing code constructsJavaScript - - - Probable bugsJavaScript - - - Spelling - - - XPath - - - - - SpellCheckingInspection - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - 1419803886434 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index 5887294..0cf1412 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ TDA Enrichment App ================== + +Thomas Deacon Academy Enrichment app, created by George Garside. +For more information, see the [TDA Enrichment App](http://georgegarside.com/apps/tda-enrichment/) website. \ No newline at end of file diff --git a/config.xml b/config.xml index 3051b49..a6c0f79 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + TDA-Enrichment Always have access to Thomas Deacon Academy's Sports Enrichment with the official TDA Enrichment app. diff --git a/platforms/ios/TDA-Enrichment.xcodeproj/project.pbxproj b/platforms/ios/TDA-Enrichment.xcodeproj/project.pbxproj index 2eb2d67..dfabad4 100644 --- a/platforms/ios/TDA-Enrichment.xcodeproj/project.pbxproj +++ b/platforms/ios/TDA-Enrichment.xcodeproj/project.pbxproj @@ -195,6 +195,11 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0510; + TargetAttributes = { + 1D6058900D05DD3D006BFB54 = { + DevelopmentTeam = 5TFUK958NL; + }; + }; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TDA-Enrichment" */; compatibilityVersion = "Xcode 3.2"; @@ -294,6 +299,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_OBJC_ARC = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -328,6 +334,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_OBJC_ARC = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "TDA-Enrichment/TDA-Enrichment-Prefix.pch"; diff --git a/platforms/ios/TDA-Enrichment.xcodeproj/project.xcworkspace/xcshareddata/TDA-Enrichment.xccheckout b/platforms/ios/TDA-Enrichment.xcodeproj/project.xcworkspace/xcshareddata/TDA-Enrichment.xccheckout new file mode 100644 index 0000000..6866013 --- /dev/null +++ b/platforms/ios/TDA-Enrichment.xcodeproj/project.xcworkspace/xcshareddata/TDA-Enrichment.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 00C1D4A9-98DA-4C9A-855D-88722D9580D6 + IDESourceControlProjectName + TDA-Enrichment + IDESourceControlProjectOriginsDictionary + + 563714291DAEC42E078A4B5E77991B140A90D26C + https://github.com/deacons/TDA-Enrichment.git + + IDESourceControlProjectPath + platforms/ios/TDA-Enrichment.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + 563714291DAEC42E078A4B5E77991B140A90D26C + ../../../.. + + IDESourceControlProjectURL + https://github.com/deacons/TDA-Enrichment.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + 563714291DAEC42E078A4B5E77991B140A90D26C + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 563714291DAEC42E078A4B5E77991B140A90D26C + IDESourceControlWCCName + TDA-Enrichment + + + + diff --git a/platforms/ios/TDA-Enrichment/TDA-Enrichment-Info.plist b/platforms/ios/TDA-Enrichment/TDA-Enrichment-Info.plist index 89af207..55c460f 100644 --- a/platforms/ios/TDA-Enrichment/TDA-Enrichment-Info.plist +++ b/platforms/ios/TDA-Enrichment/TDA-Enrichment-Info.plist @@ -21,11 +21,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.0 + 2.1 CFBundleSignature ???? CFBundleVersion - 2.0 + 17 LSRequiresIPhoneOS NSMainNibFile diff --git a/platforms/ios/TDA-Enrichment/config.xml b/platforms/ios/TDA-Enrichment/config.xml index dae2bfb..638f922 100644 --- a/platforms/ios/TDA-Enrichment/config.xml +++ b/platforms/ios/TDA-Enrichment/config.xml @@ -1,5 +1,5 @@ - + diff --git a/resources/4s/iOS Simulator Screen Shot 10 Jan 2015 09.51.55.png b/resources/4s/iOS Simulator Screen Shot 10 Jan 2015 09.51.55.png new file mode 100644 index 0000000..9295a7d Binary files /dev/null and b/resources/4s/iOS Simulator Screen Shot 10 Jan 2015 09.51.55.png differ diff --git a/resources/4s/iOS Simulator Screen Shot 29 Dec 2014 16.31.03.png b/resources/4s/iOS Simulator Screen Shot 29 Dec 2014 16.31.03.png deleted file mode 100644 index 42ef208..0000000 Binary files a/resources/4s/iOS Simulator Screen Shot 29 Dec 2014 16.31.03.png and /dev/null differ diff --git a/resources/5s/iOS Simulator Screen Shot 10 Jan 2015 09.51.26.png b/resources/5s/iOS Simulator Screen Shot 10 Jan 2015 09.51.26.png new file mode 100644 index 0000000..5d8273c Binary files /dev/null and b/resources/5s/iOS Simulator Screen Shot 10 Jan 2015 09.51.26.png differ diff --git a/resources/5s/iOS Simulator Screen Shot 29 Dec 2014 16.39.17.png b/resources/5s/iOS Simulator Screen Shot 29 Dec 2014 16.39.17.png deleted file mode 100644 index 01012d6..0000000 Binary files a/resources/5s/iOS Simulator Screen Shot 29 Dec 2014 16.39.17.png and /dev/null differ diff --git a/resources/6+/iOS Simulator Screen Shot 10 Jan 2015 09.51.05.png b/resources/6+/iOS Simulator Screen Shot 10 Jan 2015 09.51.05.png new file mode 100644 index 0000000..1ab1f65 Binary files /dev/null and b/resources/6+/iOS Simulator Screen Shot 10 Jan 2015 09.51.05.png differ diff --git a/resources/6+/iOS Simulator Screen Shot 29 Dec 2014 16.41.03.png b/resources/6+/iOS Simulator Screen Shot 29 Dec 2014 16.41.03.png deleted file mode 100644 index 1768372..0000000 Binary files a/resources/6+/iOS Simulator Screen Shot 29 Dec 2014 16.41.03.png and /dev/null differ diff --git a/resources/6/iOS Simulator Screen Shot 10 Jan 2015 09.51.37.png b/resources/6/iOS Simulator Screen Shot 10 Jan 2015 09.51.37.png new file mode 100644 index 0000000..9e1648e Binary files /dev/null and b/resources/6/iOS Simulator Screen Shot 10 Jan 2015 09.51.37.png differ diff --git a/resources/6/iOS Simulator Screen Shot 29 Dec 2014 16.41.58.png b/resources/6/iOS Simulator Screen Shot 29 Dec 2014 16.41.58.png deleted file mode 100644 index dbd912c..0000000 Binary files a/resources/6/iOS Simulator Screen Shot 29 Dec 2014 16.41.58.png and /dev/null differ diff --git a/www/hf/5w/1.html b/www/hf/5w/1.html index 8c9bf5c..ab6cc26 100755 --- a/www/hf/5w/1.html +++ b/www/hf/5w/1.html @@ -5,7 +5,7 @@
-
+

This is the wheel that those desperate to lose weight fast always drive on first. Even though it's not the answer to helping you obtain that celebrity-perfect look by itself, aerobic exercise is still a valuable wheel.

diff --git a/www/hf/5w/2.html b/www/hf/5w/2.html index 75d4c45..8c2b340 100755 --- a/www/hf/5w/2.html +++ b/www/hf/5w/2.html @@ -5,7 +5,7 @@
-
+

Whether you're brand new to this whole exercise experience, or fitness is old hat, you probably still know what resistance training entails, or know it by one of its many other names: strength training, weight training, pumping iron, anaerobic exercise, etc.

diff --git a/www/hf/5w/3.html b/www/hf/5w/3.html index a668d53..c8e38be 100755 --- a/www/hf/5w/3.html +++ b/www/hf/5w/3.html @@ -5,7 +5,7 @@
-
+

Eating right isn't really all that complicated. It's a choice, and a conscious, daily choice at that. Making the right choice on a regular basis, and sticking with your choice over time, will get you there.

diff --git a/www/hf/5w/4.html b/www/hf/5w/4.html index 71d3d1b..0ff09e7 100755 --- a/www/hf/5w/4.html +++ b/www/hf/5w/4.html @@ -5,7 +5,7 @@
-
+

It sounds like the easiest wheel of the five to drive on, but it's actually the one that most frequently gets either too much or too little use. Give your body too much rest and it'll look like it. Give it too little and you increase your odds of not only injuring yourself, but never seeing the body-shaping results you're shooting for.

diff --git a/www/hf/5w/5.html b/www/hf/5w/5.html index 5e9811f..57fed7a 100755 --- a/www/hf/5w/5.html +++ b/www/hf/5w/5.html @@ -5,7 +5,7 @@
-
+
diff --git a/www/hf/aerobic.html b/www/hf/aerobic.html index 0e6aa98..6adc93c 100755 --- a/www/hf/aerobic.html +++ b/www/hf/aerobic.html @@ -5,7 +5,7 @@
-
+
What is Aerobic Training?
diff --git a/www/hf/at/testing.html b/www/hf/at/testing.html index 465f410..2ec494f 100755 --- a/www/hf/at/testing.html +++ b/www/hf/at/testing.html @@ -5,7 +5,7 @@
-
+
Test
diff --git a/www/hf/at/zones.html b/www/hf/at/zones.html index dae9dc0..badff1a 100755 --- a/www/hf/at/zones.html +++ b/www/hf/at/zones.html @@ -5,7 +5,7 @@
-
+
diff --git a/www/hf/cc/exercises.html b/www/hf/cc/exercises.html index 0fbdeae..14a96c4 100755 --- a/www/hf/cc/exercises.html +++ b/www/hf/cc/exercises.html @@ -5,7 +5,7 @@
-
+
The Next Steps
diff --git a/www/hf/cc/sdcore.html b/www/hf/cc/sdcore.html index 2139415..7618e9d 100755 --- a/www/hf/cc/sdcore.html +++ b/www/hf/cc/sdcore.html @@ -5,7 +5,7 @@
-
+
Static Floor Exercises
diff --git a/www/hf/cc/stability.html b/www/hf/cc/stability.html index 792df18..98921cb 100755 --- a/www/hf/cc/stability.html +++ b/www/hf/cc/stability.html @@ -5,7 +5,7 @@
-
+

The aim of core stability training is to effectively recruit the trunk musculature and then learn to control the position of the lumbar spine during dynamic movements. The information presented on this page is based on an article written by Raphael Brandon that was first published in Peak Performance.

diff --git a/www/hf/corecond.html b/www/hf/corecond.html index 2d0ddc7..3f24866 100755 --- a/www/hf/corecond.html +++ b/www/hf/corecond.html @@ -6,7 +6,7 @@
-
+
    diff --git a/www/hf/hoff5w.html b/www/hf/hoff5w.html index a5f6945..8067a02 100755 --- a/www/hf/hoff5w.html +++ b/www/hf/hoff5w.html @@ -6,7 +6,7 @@
-
+
    diff --git a/www/hf/howdoi.html b/www/hf/howdoi.html index 330df30..22e0a9e 100755 --- a/www/hf/howdoi.html +++ b/www/hf/howdoi.html @@ -5,7 +5,7 @@
-
+
I want to burn calories quickly…
diff --git a/www/hf/n/classes.html b/www/hf/n/classes.html index d86cbb8..a82eb7d 100755 --- a/www/hf/n/classes.html +++ b/www/hf/n/classes.html @@ -5,7 +5,7 @@
-
+
Carbohydrates
diff --git a/www/hf/n/intro.html b/www/hf/n/intro.html index cc5f554..743e25e 100755 --- a/www/hf/n/intro.html +++ b/www/hf/n/intro.html @@ -5,7 +5,7 @@
-
+
diff --git a/www/hf/n/labels.html b/www/hf/n/labels.html index 777fd77..655e33c 100755 --- a/www/hf/n/labels.html +++ b/www/hf/n/labels.html @@ -5,7 +5,7 @@
-
+
diff --git a/www/hf/nutrition.html b/www/hf/nutrition.html index 8033b88..23f4810 100755 --- a/www/hf/nutrition.html +++ b/www/hf/nutrition.html @@ -6,7 +6,7 @@
-
+
    diff --git a/www/hf/resistancet.html b/www/hf/resistancet.html index 676c2aa..7ebe655 100755 --- a/www/hf/resistancet.html +++ b/www/hf/resistancet.html @@ -6,7 +6,7 @@
-
+
diff --git a/www/hf/rt/1w.html b/www/hf/rt/1w.html index 9e40e80..c126749 100755 --- a/www/hf/rt/1w.html +++ b/www/hf/rt/1w.html @@ -5,7 +5,7 @@
-
+
LEGS
diff --git a/www/hf/rt/2w.html b/www/hf/rt/2w.html index 0da46f3..fbc3e40 100755 --- a/www/hf/rt/2w.html +++ b/www/hf/rt/2w.html @@ -5,7 +5,7 @@
-
+
    diff --git a/www/hf/rt/3w.html b/www/hf/rt/3w.html index 7ac81e2..96f243e 100755 --- a/www/hf/rt/3w.html +++ b/www/hf/rt/3w.html @@ -5,7 +5,7 @@
-
+
    diff --git a/www/hf/rt/marms.html b/www/hf/rt/marms.html index 144035a..f13416e 100755 --- a/www/hf/rt/marms.html +++ b/www/hf/rt/marms.html @@ -5,7 +5,7 @@
-
+
Basic arm workout
diff --git a/www/hf/rt/mback.html b/www/hf/rt/mback.html index 4495ccf..5cca2b8 100755 --- a/www/hf/rt/mback.html +++ b/www/hf/rt/mback.html @@ -5,7 +5,7 @@
-
+
Basic back workout
diff --git a/www/hf/rt/mchest.html b/www/hf/rt/mchest.html index 767406d..7254a3d 100755 --- a/www/hf/rt/mchest.html +++ b/www/hf/rt/mchest.html @@ -5,7 +5,7 @@
-
+
Basic chest workout
diff --git a/www/hf/rt/mlegs.html b/www/hf/rt/mlegs.html index 77646ff..0b838b4 100755 --- a/www/hf/rt/mlegs.html +++ b/www/hf/rt/mlegs.html @@ -5,7 +5,7 @@
-
+
Basic leg workout
diff --git a/www/hf/rt/mshoulders.html b/www/hf/rt/mshoulders.html index db5a046..a0a696d 100755 --- a/www/hf/rt/mshoulders.html +++ b/www/hf/rt/mshoulders.html @@ -5,7 +5,7 @@
-
+
Basic shoulder workout
diff --git a/www/hf/rt/y111213.html b/www/hf/rt/y111213.html index 27fff42..74d9ff4 100755 --- a/www/hf/rt/y111213.html +++ b/www/hf/rt/y111213.html @@ -5,7 +5,7 @@
-
+
Workout 1 (Monday) - Upper body
diff --git a/www/hf/rt/y78.html b/www/hf/rt/y78.html index 8d69fa8..107e230 100755 --- a/www/hf/rt/y78.html +++ b/www/hf/rt/y78.html @@ -5,7 +5,7 @@
-
+

Training for years 7 & 8 should be based around aerobic activity, however there are some exercises that can be undertaken using bodyweight as resistance.

diff --git a/www/hf/rt/y910.html b/www/hf/rt/y910.html index fa4f161..32c7b74 100755 --- a/www/hf/rt/y910.html +++ b/www/hf/rt/y910.html @@ -5,7 +5,7 @@
-
+

Whole Body Workout – Legs, Back, Chest, Shoulders, Triceps, Biceps

diff --git a/www/hf/warmcool.html b/www/hf/warmcool.html index 63f6470..ca9c5dd 100755 --- a/www/hf/warmcool.html +++ b/www/hf/warmcool.html @@ -5,7 +5,7 @@
-
+
    diff --git a/www/index.html b/www/index.html index c9edb5e..675df0e 100755 --- a/www/index.html +++ b/www/index.html @@ -27,6 +27,42 @@