Skip to content

Commit f3472bc

Browse files
committed
CHANGE: Edit Exercise History no longer displays on exercise creation
1 parent fd1014e commit f3472bc

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

Lifting Buddy/CreateExerciseView.swift

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ class CreateExerciseView: UIScrollView {
1515

1616
// MARK: View properties
1717

18+
// Returns whether or not we're currently editing an exercise rather than creating
19+
public var isEditingExercise: Bool {
20+
if let _ = editingExercise {
21+
return true
22+
}
23+
return false
24+
}
25+
1826
// delegate which receives information after creation
1927
public var dataDelegate: CreateExerciseViewDelegate?
2028
// delegate to show a view for us
@@ -73,10 +81,13 @@ class CreateExerciseView: UIScrollView {
7381
createAndActivateSetEntryFieldConstraints()
7482
createAndActivateProgressionsTableViewConstraints()
7583
createAndActivateAddProgressionTrackerButtonConstraints()
76-
createAndActivateEditExerciseHistoryButtonConstraints()
77-
createAndActivateCreateExeciseButtonConstraints()
84+
createAndActivateCreateExerciseButtonConstraints()
7885
createAndActivateCancelButtonConstraints()
7986

87+
if isEditingExercise {
88+
createAndActivateEditExerciseHistoryButtonConstraints()
89+
}
90+
8091
addProgressionTrackerButton.addTarget(self, action: #selector(buttonPress(sender:)), for: .touchUpInside)
8192
editExerciseHistoryButton.addTarget( self, action: #selector(buttonPress(sender:)), for: .touchUpInside)
8293
createExerciseButton.addTarget( self, action: #selector(buttonPress(sender:)), for: .touchUpInside)
@@ -100,7 +111,7 @@ class CreateExerciseView: UIScrollView {
100111

101112
// Label
102113
createExerciseLabel.setDefaultProperties()
103-
createExerciseLabel.text = editingExercise == nil ? "Create New Exercise" : "Edit Exercise"
114+
createExerciseLabel.text = isEditingExercise ? "Edit Exercise" : "Create New Exercise"
104115

105116
// Name Entry Field
106117
nameEntryField.setDefaultProperties()
@@ -137,7 +148,7 @@ class CreateExerciseView: UIScrollView {
137148
addProgressionTrackerButton.setTitle("Add Progression Tracker", for: .normal)
138149

139150
// Create exercise button
140-
createExerciseButton.setTitle(editingExercise == nil ? "Create Exercise" : "Save Exercise",
151+
createExerciseButton.setTitle(isEditingExercise ? "Save Exercise" : "Create Exercise",
141152
for: .normal)
142153
createExerciseButton.setDefaultProperties()
143154

@@ -309,7 +320,7 @@ class CreateExerciseView: UIScrollView {
309320
}
310321

311322
// If this is a new exercise, create it!
312-
if editingExercise == nil {
323+
if !isEditingExercise {
313324
let realm = try! Realm()
314325
try! realm.write {
315326
realm.add(createdExercise)
@@ -459,14 +470,14 @@ class CreateExerciseView: UIScrollView {
459470
}
460471

461472
// center horiz in view ; place below editexercisehistorybutton ; height 50 ; width of this view - 50
462-
private func createAndActivateCreateExeciseButtonConstraints() {
473+
private func createAndActivateCreateExerciseButtonConstraints() {
463474
createExerciseButton.translatesAutoresizingMaskIntoConstraints = false
464475

465476
NSLayoutConstraint.createViewAttributeCopyConstraint(view: createExerciseButton,
466477
withCopyView: self,
467478
attribute: .centerX).isActive = true
468479
NSLayoutConstraint.createViewBelowViewConstraint(view: createExerciseButton,
469-
belowView: editExerciseHistoryButton,
480+
belowView: isEditingExercise ? editExerciseHistoryButton : addProgressionTrackerButton,
470481
withPadding: viewPadding * 2).isActive = true
471482
NSLayoutConstraint.createHeightConstraintForView(view: createExerciseButton,
472483
height: PrettyButton.defaultHeight).isActive = true

0 commit comments

Comments
 (0)