Forgot to merge this one in the previous change

BodyweightFitness/Date+Extensions.swift

@@ -77,4 +77,84 @@ extension Date {
         //Return Result
         return isEqualTo
     }
+
+    func timeAgo() -> String {
+        let calendar = Calendar.current
+        let now = Date()
+        let unitFlags: NSCalendar.Unit = [.second, .minute, .hour, .day, .weekOfYear, .month, .year]
+        let components = (calendar as NSCalendar).components(unitFlags, from: self, to: now, options: [])
+
+        if components.year! >= 2 {
+            return "\(components.year!) years ago"
+        }
+
+        if components.year! >= 1 {
+            return "Last year"
+        }
+
+        if components.month! >= 2 {
+            return "\(components.month!) months ago"
+        }
+
+        if components.month! >= 1 {
+            return "Last month"
+        }
+
+        if components.weekOfYear! >= 2 {
+            return "\(components.weekOfYear!) weeks ago"
+        }
+
+        if components.weekOfYear! >= 1 {
+            return "Last week"
+        }
+
+        if components.day! >= 2 {
+            return "\(components.day!) days ago"
+        }
+
+        if components.day! >= 1 {
+            return "Yesterday"
+        }
+
+        if components.hour! >= 2 {
+            return "\(components.hour!) hours ago"
+        }
+
+        if components.hour! >= 1 {
+            return "An hour ago"
+        }
+
+        if components.minute! >= 2 {
+            return "\(components.minute!) minutes ago"
+        }
+
+        if components.minute! >= 1 {
+            return "A minute ago"
+        }
+
+        if components.second! >= 3 {
+            return "\(components.second!) seconds ago"
+        }
+
+        return "Just now"
+    }
+
+    static func changeDaysBy(_ days : Int) -> Date {
+        let startOfDay = Calendar.current.startOfDay(for: Date())
+
+        var components = DateComponents()
+        components.hour = 23
+        components.minute = 59
+        components.second = 59
+
+        let currentDate = (Calendar.current as NSCalendar).date(
+            byAdding: components,
+            to: startOfDay,
+            options: NSCalendar.Options(rawValue: 0))!
+
+        var dateComponents = DateComponents()
+        dateComponents.day = days
+        return (Calendar.current as NSCalendar).date(
+            byAdding: dateComponents, to: currentDate, options: NSCalendar.Options(rawValue: 0))!
+    }
 }

BodyweightFitness/Domain/RepositoryStream.swift

@@ -1,89 +1,6 @@
 import Foundation
 import RealmSwift
 
-extension Date {
-    static func changeDaysBy(_ days : Int) -> Date {
-        let startOfDay = Calendar.current.startOfDay(for: Date())
-
-        var components = DateComponents()
-        components.hour = 23
-        components.minute = 59
-        components.second = 59
-
-        let currentDate = (Calendar.current as NSCalendar).date(
-                byAdding: components,
-                to: startOfDay,
-                options: NSCalendar.Options(rawValue: 0))!
-
-        var dateComponents = DateComponents()
-        dateComponents.day = days
-        return (Calendar.current as NSCalendar).date(
-                byAdding: dateComponents, to: currentDate, options: NSCalendar.Options(rawValue: 0))!
-    }
-
-    static func timeAgoSince(_ date: Date) -> String {
-        let calendar = Calendar.current
-        let now = Date()
-        let unitFlags: NSCalendar.Unit = [.second, .minute, .hour, .day, .weekOfYear, .month, .year]
-        let components = (calendar as NSCalendar).components(unitFlags, from: date, to: now, options: [])
-
-        if components.year! >= 2 {
-            return "\(components.year!) years ago"
-        }
-
-        if components.year! >= 1 {
-            return "Last year"
-        }
-
-        if components.month! >= 2 {
-            return "\(components.month!) months ago"
-        }
-
-        if components.month! >= 1 {
-            return "Last month"
-        }
-
-        if components.weekOfYear! >= 2 {
-            return "\(components.weekOfYear!) weeks ago"
-        }
-
-        if components.weekOfYear! >= 1 {
-            return "Last week"
-        }
-
-        if components.day! >= 2 {
-            return "\(components.day!) days ago"
-        }
-
-        if components.day! >= 1 {
-            return "Yesterday"
-        }
-
-        if components.hour! >= 2 {
-            return "\(components.hour!) hours ago"
-        }
-
-        if components.hour! >= 1 {
-            return "An hour ago"
-        }
-
-        if components.minute! >= 2 {
-            return "\(components.minute!) minutes ago"
-        }
-
-        if components.minute! >= 1 {
-            return "A minute ago"
-        }
-
-        if components.second! >= 3 {
-            return "\(components.second!) seconds ago"
-        }
-
-        return "Just now"
-
-    }
-}
-
 final class RepositoryStream {
     static let sharedInstance = RepositoryStream()
 

BodyweightFitness/Main/CalendarViewController.swift

@@ -193,7 +193,7 @@ class CalendarViewController: AbstractViewController, MFMailComposeViewControlle
         let csv = companion.csv(weightUnit: weightUnit)
         let csvName = companion.csvName()
 
-        let emailViewController = configuredMailComposeViewController(subject: subject, messageBody: body, csv: data, csvName: csvName)
+        let emailViewController = configuredMailComposeViewController(subject: subject, messageBody: body, csv: csv, csvName: csvName)
         self.present(emailViewController, animated: true, completion: nil)
     }
 

BodyweightFitness/Main/HomeViewController.swift

@@ -176,7 +176,7 @@ class HomeViewController: AbstractViewController, MFMailComposeViewControllerDel
         topRightLabel.textAlignment = .right
 
         if let workout = lastWorkout {
-            topRightLabel.text = String(Date.timeAgoSince(workout.startTime))
+            topRightLabel.text = workout.startTime.timeAgo()
         } else {
             topRightLabel.text = String("Never")
         }

BodyweightFitness/Workout/RestTimerViewController.swift

@@ -9,8 +9,9 @@ class RestTimerViewController: UIViewController, AVAudioPlayerDelegate {
 
     @IBOutlet var previousButton: UIButton!
     @IBOutlet var nextButton: UIButton!
-
-    var rootViewController: WorkoutViewController? = nil
+
+    var delegate: WorkoutInteractionDelegate?
+
     var current: Exercise = RoutineStream.sharedInstance.routine.getFirstExercise()
 
     var audioPlayer: AVAudioPlayer?
@@ -100,7 +101,7 @@ class RestTimerViewController: UIViewController, AVAudioPlayerDelegate {
         seconds -= 1
 
         if(seconds <= 0) {
-            self.rootViewController?.restTimerStopped()
+            self.delegate?.restTimerShouldStop()
 
             let defaults = Foundation.UserDefaults.standard
             if(defaults.object(forKey: "playAudioWhenTimerStops") != nil) {
@@ -142,14 +143,14 @@ class RestTimerViewController: UIViewController, AVAudioPlayerDelegate {
     }
 
     @IBAction func stopButtonClicked(_ sender: AnyObject) {
-        self.rootViewController?.restTimerStopped()
+        self.delegate?.restTimerShouldStop()
     }
 
     @IBAction func previousButtonClicked(_ sender: AnyObject) {
-        self.rootViewController?.previousButtonClicked(sender)
+        self.delegate?.selectPreviousExercise()
     }
 
     @IBAction func nextButtonClicked(_ sender: AnyObject) {
-        self.rootViewController?.nextButtonClicked(sender)
+        self.delegate?.selectNextExercise()
     }
 }

BodyweightFitness/Workout/TimedViewController.swift

@@ -9,6 +9,8 @@ class TimedViewController: UIViewController, AVAudioPlayerDelegate {
 
     @IBOutlet var previousButton: UIButton!
     @IBOutlet var nextButton: UIButton!
+
+    var delegate: WorkoutInteractionDelegate?
 
     var rootViewController: WorkoutViewController? = nil
     var current: Exercise = RoutineStream.sharedInstance.routine.getFirstExercise()
@@ -212,7 +214,7 @@ class TimedViewController: UIViewController, AVAudioPlayerDelegate {
     }
 
     func showRestTimer() {
-        self.rootViewController?.restTimerShouldStart()
+        self.delegate?.restTimerShouldStart()
     }
 
     func showNotification(_ seconds: Int) {
@@ -266,10 +268,10 @@ class TimedViewController: UIViewController, AVAudioPlayerDelegate {
 
 
     @IBAction func previousButtonClicked(_ sender: AnyObject) {
-        self.rootViewController?.previousButtonClicked(sender)
+        self.delegate?.selectPreviousExercise()
     }
 
     @IBAction func nextButtonClicked(_ sender: AnyObject) {
-        self.rootViewController?.nextButtonClicked(sender)
+        self.delegate?.selectNextExercise()
     }
 }

BodyweightFitness/Workout/WeightedViewController.swift

@@ -7,7 +7,9 @@ class WeightedViewController: UIViewController {
 
     @IBOutlet var sets: UILabel!
     @IBOutlet var reps: UIButton!
-
+
+    var delegate: WorkoutInteractionDelegate?
+
     var numberOfReps: Int = 5
     var rootViewController: WorkoutViewController? = nil
     var current: Exercise = RoutineStream.sharedInstance.routine.getFirstExercise()
@@ -22,7 +24,8 @@ class WeightedViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
+
+        self.numberOfReps = PersistenceManager.getNumberOfReps(self.current.exerciseId)
         self.updateLabels()
 
         _ = RoutineStream.sharedInstance.repositoryObservable().subscribe(onNext: { (it) in
@@ -66,7 +69,7 @@ class WeightedViewController: UIViewController {
     }
 
     func showRestTimer() {
-        self.rootViewController?.restTimerShouldStart()
+        self.delegate?.restTimerShouldStart()
     }
 
     func showNotification(_ set: Int, reps: Int) {
@@ -127,11 +130,11 @@ class WeightedViewController: UIViewController {
     }
 
     @IBAction func previousButtonClicked(_ sender: AnyObject) {
-        self.rootViewController?.previousButtonClicked(sender)
+        self.delegate?.selectPreviousExercise()
     }
 
     @IBAction func nextButtonClicked(_ sender: AnyObject) {
-        self.rootViewController?.nextButtonClicked(sender)
+        self.delegate?.selectNextExercise()
     }
 
     @IBAction func increaseRepsClicked(_ sender: AnyObject) {