Skip to content

Commit e95eef9

Browse files
JiwonJeong414caitlynjin
authored andcommitted
Jiwon/capacity reminder tutorial (#103)
* Removed Unnecessary code * Bug fixes * Bug Fixes 2 * Fix Bug 3 * commit * Finished Capacity Tutorial Modal * Debug -> Release * Addressed Peter's comments * Fixed Logic
1 parent a34a59a commit e95eef9

File tree

15 files changed

+358
-84
lines changed

15 files changed

+358
-84
lines changed

Uplift.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
291433852D87387B00F913D5 /* UserProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291433842D87387500F913D5 /* UserProfile.swift */; };
1313
291433872D87388C00F913D5 /* WeeklyWorkoutData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291433862D87388800F913D5 /* WeeklyWorkoutData.swift */; };
1414
291433892D8738A400F913D5 /* WorkoutHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291433882D8738A200F913D5 /* WorkoutHistory.swift */; };
15+
2923EF472E9836A600D3FC1D /* CapacityTutorialModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2923EF462E98369900D3FC1D /* CapacityTutorialModal.swift */; };
1516
293032572D7A8F64002E5484 /* WorkoutProgressArc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 293032562D7A8F64002E5484 /* WorkoutProgressArc.swift */; };
1617
294CC21D2D7E34D300EF6487 /* WeeklyWorkoutTrackerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294CC21C2D7E34D000EF6487 /* WeeklyWorkoutTrackerView.swift */; };
1718
296A2DAE2D7A805300EF042F /* ProfileViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 296A2DAD2D7A805300EF042F /* ProfileViewModel.swift */; };
@@ -141,6 +142,7 @@
141142
291433842D87387500F913D5 /* UserProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfile.swift; sourceTree = "<group>"; };
142143
291433862D87388800F913D5 /* WeeklyWorkoutData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeeklyWorkoutData.swift; sourceTree = "<group>"; };
143144
291433882D8738A200F913D5 /* WorkoutHistory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkoutHistory.swift; sourceTree = "<group>"; };
145+
2923EF462E98369900D3FC1D /* CapacityTutorialModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CapacityTutorialModal.swift; sourceTree = "<group>"; };
144146
293032562D7A8F64002E5484 /* WorkoutProgressArc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkoutProgressArc.swift; sourceTree = "<group>"; };
145147
294CC21C2D7E34D000EF6487 /* WeeklyWorkoutTrackerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeeklyWorkoutTrackerView.swift; sourceTree = "<group>"; };
146148
296A2DAD2D7A805300EF042F /* ProfileViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewModel.swift; sourceTree = "<group>"; };
@@ -436,6 +438,7 @@
436438
2E15F50A2B3A0AF700414BEC /* Supporting */ = {
437439
isa = PBXGroup;
438440
children = (
441+
2923EF462E98369900D3FC1D /* CapacityTutorialModal.swift */,
439442
29055F7F2E7E3E6500E9A730 /* UnsavedChangesModal.swift */,
440443
2E15F50B2B3A0B2100414BEC /* CapacityCircleView.swift */,
441444
89E4FAA92CEFEC3000A952B1 /* CapacitySemiCircleView.swift */,
@@ -784,6 +787,7 @@
784787
buildActionMask = 2147483647;
785788
files = (
786789
896500DC2BB4D33500D822AB /* ClassDetailView.swift in Sources */,
790+
2923EF472E9836A600D3FC1D /* CapacityTutorialModal.swift in Sources */,
787791
2EF1A2582B129EEB007A299F /* Network.swift in Sources */,
788792
6329A4462C964D0800D30A2F /* SignInView.swift in Sources */,
789793
2E39D81C2B3B5F3700AD238B /* NavBackButton.swift in Sources */,
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "x1.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "x2.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "x3.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}
56.8 KB
Loading
198 KB
Loading
410 KB
Loading
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "image 1.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "image 2.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "image 3.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}
6.66 KB
Loading
16.7 KB
Loading
27.2 KB
Loading

Uplift/Utils/Constants.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,12 @@ struct Constants {
106106
static let arrowLeft = Image("arrow_left")
107107
static let back = Image("back")
108108
static let backgroundEllipse = Image("background_ellipse")
109+
static let backgroundTutorial = Image("background_tutorial")
109110
static let basketball = Image("basketball")
110111
static let bowling = Image("bowling")
111112
static let calendar = Image("calendar")
112113
static let camera = Image("camera")
114+
static let capacityTutorial = Image("capacity_tutorial")
113115
static let cameraMini = Image("camera_mini")
114116
static let capacity = Image("capacity")
115117
static let chest = Image("chest")
@@ -191,10 +193,14 @@ struct Constants {
191193

192194
/// UserDefaults used in Uplift
193195
enum UserDefaultsKeys {
196+
// Capacity Reminder
194197
static let reminderId = "savedReminderId"
195198
static let selectedDays = "selectedDays"
196199
static let selectedLocations = "selectedLocations"
197200
static let capacityThreshold = "capacityThreshold"
201+
202+
// Capacity Reminder Tutorial
203+
static let capacityTutorial = "hasSeenTutorial"
198204
}
199205

200206
}

0 commit comments

Comments
 (0)