@@ -15,6 +15,14 @@ class CreateExerciseView: UIScrollView {
15
15
16
16
// MARK: View properties
17
17
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
+
18
26
// delegate which receives information after creation
19
27
public var dataDelegate : CreateExerciseViewDelegate ?
20
28
// delegate to show a view for us
@@ -73,10 +81,13 @@ class CreateExerciseView: UIScrollView {
73
81
createAndActivateSetEntryFieldConstraints ( )
74
82
createAndActivateProgressionsTableViewConstraints ( )
75
83
createAndActivateAddProgressionTrackerButtonConstraints ( )
76
- createAndActivateEditExerciseHistoryButtonConstraints ( )
77
- createAndActivateCreateExeciseButtonConstraints ( )
84
+ createAndActivateCreateExerciseButtonConstraints ( )
78
85
createAndActivateCancelButtonConstraints ( )
79
86
87
+ if isEditingExercise {
88
+ createAndActivateEditExerciseHistoryButtonConstraints ( )
89
+ }
90
+
80
91
addProgressionTrackerButton. addTarget ( self , action: #selector( buttonPress ( sender: ) ) , for: . touchUpInside)
81
92
editExerciseHistoryButton. addTarget ( self , action: #selector( buttonPress ( sender: ) ) , for: . touchUpInside)
82
93
createExerciseButton. addTarget ( self , action: #selector( buttonPress ( sender: ) ) , for: . touchUpInside)
@@ -100,7 +111,7 @@ class CreateExerciseView: UIScrollView {
100
111
101
112
// Label
102
113
createExerciseLabel. setDefaultProperties ( )
103
- createExerciseLabel. text = editingExercise == nil ? " Create New Exercise" : " Edit Exercise"
114
+ createExerciseLabel. text = isEditingExercise ? " Edit Exercise" : " Create New Exercise"
104
115
105
116
// Name Entry Field
106
117
nameEntryField. setDefaultProperties ( )
@@ -137,7 +148,7 @@ class CreateExerciseView: UIScrollView {
137
148
addProgressionTrackerButton. setTitle ( " Add Progression Tracker " , for: . normal)
138
149
139
150
// Create exercise button
140
- createExerciseButton. setTitle ( editingExercise == nil ? " Create Exercise" : " Save Exercise" ,
151
+ createExerciseButton. setTitle ( isEditingExercise ? " Save Exercise" : " Create Exercise" ,
141
152
for: . normal)
142
153
createExerciseButton. setDefaultProperties ( )
143
154
@@ -309,7 +320,7 @@ class CreateExerciseView: UIScrollView {
309
320
}
310
321
311
322
// If this is a new exercise, create it!
312
- if editingExercise == nil {
323
+ if !isEditingExercise {
313
324
let realm = try ! Realm ( )
314
325
try ! realm. write {
315
326
realm. add ( createdExercise)
@@ -459,14 +470,14 @@ class CreateExerciseView: UIScrollView {
459
470
}
460
471
461
472
// center horiz in view ; place below editexercisehistorybutton ; height 50 ; width of this view - 50
462
- private func createAndActivateCreateExeciseButtonConstraints ( ) {
473
+ private func createAndActivateCreateExerciseButtonConstraints ( ) {
463
474
createExerciseButton. translatesAutoresizingMaskIntoConstraints = false
464
475
465
476
NSLayoutConstraint . createViewAttributeCopyConstraint ( view: createExerciseButton,
466
477
withCopyView: self ,
467
478
attribute: . centerX) . isActive = true
468
479
NSLayoutConstraint . createViewBelowViewConstraint ( view: createExerciseButton,
469
- belowView: editExerciseHistoryButton,
480
+ belowView: isEditingExercise ? editExerciseHistoryButton : addProgressionTrackerButton ,
470
481
withPadding: viewPadding * 2 ) . isActive = true
471
482
NSLayoutConstraint . createHeightConstraintForView ( view: createExerciseButton,
472
483
height: PrettyButton . defaultHeight) . isActive = true
0 commit comments