Starting Stretching (#21)

* Added Starting Stretching * Fix a bug where choosing a progression does not represent it in database
mazurio · Dec 28, 2016 · 8ace239 · 8ace239
1 parent a257c0d
commit 8ace239
Show file tree

Hide file tree

Showing 45 changed files with 551 additions and 514 deletions.
diff --git a/BodyweightFitness.xcodeproj/project.pbxproj b/BodyweightFitness.xcodeproj/project.pbxproj
diff --git a/BodyweightFitness/Bodyweight Fitness.plist b/BodyweightFitness/Bodyweight Fitness.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>1.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>142</string>
+	<string>149</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/BodyweightFitness/Controller/HomeViewController.swift b/BodyweightFitness/Controller/HomeViewController.swift
@@ -10,6 +10,10 @@ class HomeViewController: UIViewController {
     @IBOutlet weak var last7Days: UILabel!
     @IBOutlet weak var last31Days: UILabel!
 
+    @IBOutlet weak var routineCardView: CardView!
+    @IBOutlet weak var routineTitle: UILabel!
+    @IBOutlet weak var routineShortDescription: UITextView!
+
     init() {
         super.init(nibName: "HomeView", bundle: nil)
     }
@@ -38,6 +42,8 @@ class HomeViewController: UIViewController {
             self.renderStatisticsView()
 
             self.tabBarController?.title = it.title
+            self.routineTitle.text = it.title
+            self.routineShortDescription.text = it.shortDescription
         })
     }
 
@@ -52,7 +58,7 @@ class HomeViewController: UIViewController {
                 target: self,
                 action: #selector(routine))
 
-        self.tabBarController?.title = "Bodyweight Fitness"
+        self.tabBarController?.title = RoutineStream.sharedInstance.routine.title
     }
 
     func renderWorkoutProgressView() {
@@ -132,6 +138,10 @@ class HomeViewController: UIViewController {
             RoutineStream.sharedInstance.setRoutine("routine0")
         })
 
+        alertController.addAction(UIAlertAction(title: "Starting Stretching", style: .Default) { (action) in
+            RoutineStream.sharedInstance.setRoutine("d8a722a0-fae2-4e7e-a751-430348c659fe")
+        })
+
         alertController.addAction(UIAlertAction(title: "Molding Mobility", style: .Default) { (action) in
             RoutineStream.sharedInstance.setRoutine("e73593f4-ee17-4b9b-912a-87fa3625f63d")
         })
@@ -146,4 +156,10 @@ class HomeViewController: UIViewController {
         self.tabBarController?.navigationItem.backBarButtonItem = backItem
         self.showViewController(WorkoutViewController(), sender: nil)
     }
+
+    @IBAction func readMore(sender: AnyObject) {
+        if let requestUrl = NSURL(string: RoutineStream.sharedInstance.routine.url) {
+            UIApplication.sharedApplication().openURL(requestUrl)
+        }
+    }
 }
diff --git a/BodyweightFitness/Controller/WorkoutViewController.swift b/BodyweightFitness/Controller/WorkoutViewController.swift
@@ -286,10 +286,19 @@ class WorkoutViewController: UIViewController {
 
                                     alertController.addAction(
                                         UIAlertAction(title: title, style: .Default) { (action) in
-                                            RoutineStream.sharedInstance.routine.setProgression(exercise)
+                                            let repositoryRoutine = RepositoryStream.sharedInstance.getRepositoryRoutineForToday()
+                                            let currentExerciseId = currentSection.currentExercise?.exerciseId
+                                            let exerciseId = exercise.exerciseId
 
-                                            self.changeExercise(exercise)
+                                            let realm = RepositoryStream.sharedInstance.getRealm()
+
+                                            try! realm.write {
+                                                repositoryRoutine.exercises.filter { $0.exerciseId == currentExerciseId }.first?.visible = false
+                                                repositoryRoutine.exercises.filter { $0.exerciseId == exerciseId }.first?.visible = true
+                                            }
 
+                                            RoutineStream.sharedInstance.routine.setProgression(exercise)
+                                            self.changeExercise(exercise)
                                             PersistenceManager.storeRoutine(RoutineStream.sharedInstance.routine)
                                         }
                                     )

diff --git a/BodyweightFitness/Frameworks/AnimatableImageView.swift b/BodyweightFitness/Frameworks/AnimatableImageView.swift
diff --git a/BodyweightFitness/Frameworks/AnimatedFrame.swift b/BodyweightFitness/Frameworks/AnimatedFrame.swift
diff --git a/BodyweightFitness/Frameworks/Animator.swift b/BodyweightFitness/Frameworks/Animator.swift
diff --git a/BodyweightFitness/Frameworks/ImageSourceHelpers.swift b/BodyweightFitness/Frameworks/ImageSourceHelpers.swift