Skip to content

Jiwon/capacity reminders #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Oct 3, 2025
Merged

Jiwon/capacity reminders #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3aa1966
Update Uplift.xcscheme
JiwonJeong414 Apr 23, 2025
c0f77df
Almost Done
JiwonJeong414 Apr 24, 2025
a1dfb6f
save
JiwonJeong414 Apr 24, 2025
2e41d0b
Entry Point Added
JiwonJeong414 Apr 24, 2025
64176c4
Debug --> Release
JiwonJeong414 Apr 24, 2025
2ce6dee
Test
JiwonJeong414 Apr 24, 2025
5b92819
New Design Flow
JiwonJeong414 Sep 20, 2025
c8fded8
Merge branch 'main' into jiwon/capacity-reminders
JiwonJeong414 Sep 20, 2025
108e50e
Changes before refactoring
JiwonJeong414 Sep 24, 2025
b53757f
Viewmodifiers, Sep. of concerns in viewModel
JiwonJeong414 Sep 26, 2025
8d5e38a
Modal Modifier Working!
JiwonJeong414 Oct 1, 2025
44b4fa9
Animation Working
JiwonJeong414 Oct 2, 2025
c9b6779
Loading Views
JiwonJeong414 Oct 2, 2025
83aeb4a
done
JiwonJeong414 Oct 2, 2025
4d9a3db
Made LoadingModifier General
JiwonJeong414 Oct 2, 2025
87f023f
Update Uplift/Utils/Custom/CustomLoadingView.swift
JiwonJeong414 Oct 3, 2025
42c329f
Update Uplift/Utils/Custom/CustomLoadingView.swift
JiwonJeong414 Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 32 additions & 10 deletions Uplift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,18 @@
objects = {

/* Begin PBXBuildFile section */
29055F802E7E3E6E00E9A730 /* UnsavedChangesModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29055F7F2E7E3E6500E9A730 /* UnsavedChangesModal.swift */; };
29055FC62E849E2A00E9A730 /* LoadingModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29055FC52E849E2600E9A730 /* LoadingModifier.swift */; };
291433852D87387B00F913D5 /* UserProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291433842D87387500F913D5 /* UserProfile.swift */; };
291433872D87388C00F913D5 /* WeeklyWorkoutData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291433862D87388800F913D5 /* WeeklyWorkoutData.swift */; };
291433892D8738A400F913D5 /* WorkoutHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291433882D8738A200F913D5 /* WorkoutHistory.swift */; };
293032572D7A8F64002E5484 /* WorkoutProgressArc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 293032562D7A8F64002E5484 /* WorkoutProgressArc.swift */; };
294CC21D2D7E34D300EF6487 /* WeeklyWorkoutTrackerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294CC21C2D7E34D000EF6487 /* WeeklyWorkoutTrackerView.swift */; };
296A2DAE2D7A805300EF042F /* ProfileViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 296A2DAD2D7A805300EF042F /* ProfileViewModel.swift */; };
298EBA4A2E8DD244000441BA /* ModalModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 298EBA492E8DD241000441BA /* ModalModifier.swift */; };
298EBA4E2E8E504A000441BA /* GymIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 298EBA4D2E8E5048000441BA /* GymIdentifier.swift */; };
298EBA502E8E5335000441BA /* CustomLoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 298EBA4F2E8E532C000441BA /* CustomLoadingView.swift */; };
29DC9ABA2DB96C3C0088DC24 /* CapacityReminderMutations.graphql in Resources */ = {isa = PBXBuildFile; fileRef = 29DC9AB92DB96C340088DC24 /* CapacityReminderMutations.graphql */; };
2CA97C8F2D8B852700EF48B3 /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 2CA97C8E2D8B852700EF48B3 /* UpliftAPI */; };
2E090EC52B12EF2600BAE982 /* Publishers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E090EC42B12EF2600BAE982 /* Publishers.swift */; };
2E090ECB2B12FF5900BAE982 /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 2E090ECA2B12FF5900BAE982 /* UpliftAPI */; };
Expand Down Expand Up @@ -104,14 +110,14 @@
89599A502BD4B4B600DA44DE /* FitnessClassInstance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89599A4F2BD4B4B600DA44DE /* FitnessClassInstance.swift */; };
896500DC2BB4D33500D822AB /* ClassDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 896500DB2BB4D33500D822AB /* ClassDetailView.swift */; };
897703662BA2028D00F9992F /* ClassesViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897703652BA2028D00F9992F /* ClassesViewModel.swift */; };
89C10D172CCB2F9E007E753F /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = 89C10D162CCB2F9E007E753F /* FirebaseMessaging */; };
897DF9BA2CCDC49B00246B0D /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 897DF9B92CCDC49B00246B0D /* UpliftAPI */; };
897DF9BA2CCDC49B00246B0D /* (null) in Frameworks */ = {isa = PBXBuildFile; };
8983A9A62CFEA077008E84DB /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 8983A9A52CFEA077008E84DB /* UpliftAPI */; };
89950D8A2B992E8400DFB007 /* ClassesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89950D892B992E8400DFB007 /* ClassesView.swift */; };
8996FEE02BDF351800F13C67 /* NextSessionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8996FEDF2BDF351800F13C67 /* NextSessionCell.swift */; };
899B186D2CA5FAFB00FAC061 /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 899B186C2CA5FAFB00FAC061 /* ProfileView.swift */; };
89A652F92D02B00000277A16 /* CapacityRemindersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89A652F62D02B00000277A16 /* CapacityRemindersView.swift */; };
89A652FA2D02B00000277A16 /* RemindersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89A652F72D02B00000277A16 /* RemindersView.swift */; };
89C10D172CCB2F9E007E753F /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = 89C10D162CCB2F9E007E753F /* FirebaseMessaging */; };
89C34AA12CA66E9C00C579A5 /* CapacityRemindersViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C34AA02CA66E9000C579A5 /* CapacityRemindersViewModel.swift */; };
89C8658D2BB4779C00758337 /* ClassCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C8658C2BB4779C00758337 /* ClassCell.swift */; };
89CE47422D03F3C700BCB79D /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 89CE47412D03F3C700BCB79D /* UpliftAPI */; };
Expand All @@ -130,12 +136,18 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
29055F7F2E7E3E6500E9A730 /* UnsavedChangesModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnsavedChangesModal.swift; sourceTree = "<group>"; };
29055FC52E849E2600E9A730 /* LoadingModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingModifier.swift; sourceTree = "<group>"; };
291433842D87387500F913D5 /* UserProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfile.swift; sourceTree = "<group>"; };
291433862D87388800F913D5 /* WeeklyWorkoutData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeeklyWorkoutData.swift; sourceTree = "<group>"; };
291433882D8738A200F913D5 /* WorkoutHistory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkoutHistory.swift; sourceTree = "<group>"; };
293032562D7A8F64002E5484 /* WorkoutProgressArc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkoutProgressArc.swift; sourceTree = "<group>"; };
294CC21C2D7E34D000EF6487 /* WeeklyWorkoutTrackerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeeklyWorkoutTrackerView.swift; sourceTree = "<group>"; };
296A2DAD2D7A805300EF042F /* ProfileViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewModel.swift; sourceTree = "<group>"; };
298EBA492E8DD241000441BA /* ModalModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalModifier.swift; sourceTree = "<group>"; };
298EBA4D2E8E5048000441BA /* GymIdentifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GymIdentifier.swift; sourceTree = "<group>"; };
298EBA4F2E8E532C000441BA /* CustomLoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomLoadingView.swift; sourceTree = "<group>"; };
29DC9AB92DB96C340088DC24 /* CapacityReminderMutations.graphql */ = {isa = PBXFileReference; lastKnownFileType = text; path = CapacityReminderMutations.graphql; sourceTree = "<group>"; };
2E090EC42B12EF2600BAE982 /* Publishers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Publishers.swift; sourceTree = "<group>"; };
2E090ED52B13121600BAE982 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
2E1105BE2B13B0E100119F5B /* HomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -214,10 +226,10 @@
897703652BA2028D00F9992F /* ClassesViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassesViewModel.swift; sourceTree = "<group>"; };
89950D892B992E8400DFB007 /* ClassesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassesView.swift; sourceTree = "<group>"; };
8996FEDF2BDF351800F13C67 /* NextSessionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NextSessionCell.swift; sourceTree = "<group>"; };
89C10D222CCB459F007E753F /* Uplift.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Uplift.entitlements; sourceTree = "<group>"; };
899B186C2CA5FAFB00FAC061 /* ProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = "<group>"; };
89A652F62D02B00000277A16 /* CapacityRemindersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CapacityRemindersView.swift; sourceTree = "<group>"; };
89A652F72D02B00000277A16 /* RemindersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemindersView.swift; sourceTree = "<group>"; };
89C10D222CCB459F007E753F /* Uplift.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Uplift.entitlements; sourceTree = "<group>"; };
89C34AA02CA66E9000C579A5 /* CapacityRemindersViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CapacityRemindersViewModel.swift; sourceTree = "<group>"; };
89C8658C2BB4779C00758337 /* ClassCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassCell.swift; sourceTree = "<group>"; };
89E4FAA92CEFEC3000A952B1 /* CapacitySemiCircleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CapacitySemiCircleView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -249,7 +261,7 @@
6338EC5F2CE14B54000BBFD3 /* UpliftAPI in Frameworks */,
2E39D82F2B3BCBA400AD238B /* UpliftAPI in Frameworks */,
6338EC5C2CE149AA000BBFD3 /* UpliftAPI in Frameworks */,
897DF9BA2CCDC49B00246B0D /* UpliftAPI in Frameworks */,
897DF9BA2CCDC49B00246B0D /* (null) in Frameworks */,
2E2748D22BCD4EC00023882E /* UpliftAPI in Frameworks */,
63001ADA2CC9AD980082AFFA /* GoogleSignInSwift in Frameworks */,
63A7ABCD2B86B971008D58FB /* UpliftAPI in Frameworks */,
Expand All @@ -276,6 +288,7 @@
2E090EC62B12FB9F00BAE982 /* Models */ = {
isa = PBXGroup;
children = (
298EBA4D2E8E5048000441BA /* GymIdentifier.swift */,
291433882D8738A200F913D5 /* WorkoutHistory.swift */,
291433862D87388800F913D5 /* WeeklyWorkoutData.swift */,
291433842D87387500F913D5 /* UserProfile.swift */,
Expand Down Expand Up @@ -369,6 +382,7 @@
2E090ED22B13093400BAE982 /* Networking */ = {
isa = PBXGroup;
children = (
29DC9AB92DB96C340088DC24 /* CapacityReminderMutations.graphql */,
2EE5F3C72B12E094008E0299 /* ApolloClientProtocol.swift */,
2EF1A2572B129EEB007A299F /* Network.swift */,
2E090EC42B12EF2600BAE982 /* Publishers.swift */,
Expand Down Expand Up @@ -422,6 +436,7 @@
2E15F50A2B3A0AF700414BEC /* Supporting */ = {
isa = PBXGroup;
children = (
29055F7F2E7E3E6500E9A730 /* UnsavedChangesModal.swift */,
2E15F50B2B3A0B2100414BEC /* CapacityCircleView.swift */,
89E4FAA92CEFEC3000A952B1 /* CapacitySemiCircleView.swift */,
893AD9122D59466F00C0817B /* DropDownArrow.swift */,
Expand All @@ -438,6 +453,9 @@
2E39D8192B3B5EFB00AD238B /* Custom */ = {
isa = PBXGroup;
children = (
298EBA4F2E8E532C000441BA /* CustomLoadingView.swift */,
298EBA492E8DD241000441BA /* ModalModifier.swift */,
29055FC52E849E2600E9A730 /* LoadingModifier.swift */,
2E6785BF2B3A5CA300DD3ADA /* Haptics.swift */,
2E39D8152B3B3AD600AD238B /* ScaleButtonStyle.swift */,
2E6785BD2B3A513000DD3ADA /* SemiCircleShape.swift */,
Expand Down Expand Up @@ -616,10 +634,8 @@
636E3D432BBE1F3800B6EFFC /* UpliftAPI */,
2E2748D12BCD4EC00023882E /* UpliftAPI */,
89C10D162CCB2F9E007E753F /* FirebaseMessaging */,
897DF9B92CCDC49B00246B0D /* UpliftAPI */,
63001AD72CC9AD970082AFFA /* GoogleSignIn */,
63001AD92CC9AD970082AFFA /* GoogleSignInSwift */,
897DF9B92CCDC49B00246B0D /* UpliftAPI */,
63001AD72CC9AD970082AFFA /* GoogleSignIn */,
63001AD92CC9AD970082AFFA /* GoogleSignInSwift */,
6338EC5B2CE149AA000BBFD3 /* UpliftAPI */,
Expand Down Expand Up @@ -700,6 +716,7 @@
2EB090B92B131CA80039EB3B /* Montserrat-SemiBold.ttf in Resources */,
2EB090B42B131CA40039EB3B /* BebasNeue-Regular.ttf in Resources */,
2E45B2422B4E5CE100FB83B7 /* GoogleService-Info.plist in Resources */,
29DC9ABA2DB96C3C0088DC24 /* CapacityReminderMutations.graphql in Resources */,
2E39D8312B3BEE5900AD238B /* LaunchScreen.storyboard in Resources */,
2E8FE3962B1278B900B3DC6A /* Assets.xcassets in Resources */,
);
Expand Down Expand Up @@ -775,10 +792,12 @@
2E6785C42B3A780600DD3ADA /* DayOfWeek.swift in Sources */,
2E6785BE2B3A513000DD3ADA /* SemiCircleShape.swift in Sources */,
2E15F4FB2B39573C00414BEC /* Double+Extension.swift in Sources */,
29055F802E7E3E6E00E9A730 /* UnsavedChangesModal.swift in Sources */,
2E39D8162B3B3AD600AD238B /* ScaleButtonStyle.swift in Sources */,
2E6785B92B3A425E00DD3ADA /* GymDetailView.swift in Sources */,
893AD9152D59569600C0817B /* MuscleCategoryView.swift in Sources */,
89C8658D2BB4779C00758337 /* ClassCell.swift in Sources */,
298EBA502E8E5335000441BA /* CustomLoadingView.swift in Sources */,
291433852D87387B00F913D5 /* UserProfile.swift in Sources */,
294CC21D2D7E34D300EF6487 /* WeeklyWorkoutTrackerView.swift in Sources */,
2E1105BF2B13B0E100119F5B /* HomeViewModel.swift in Sources */,
Expand All @@ -795,6 +814,7 @@
2E39D8222B3B631200AD238B /* DividerLine.swift in Sources */,
2E15F5062B39F81B00414BEC /* MainView.swift in Sources */,
893AD9132D59468000C0817B /* DropDownArrow.swift in Sources */,
298EBA4E2E8E504A000441BA /* GymIdentifier.swift in Sources */,
89E4FAAC2CF28E7500A952B1 /* HourlyAverageCapacity.swift in Sources */,
8996FEE02BDF351800F13C67 /* NextSessionCell.swift in Sources */,
6329A4482CA0F89D00D30A2F /* CreateProfileView.swift in Sources */,
Expand All @@ -812,6 +832,7 @@
2E15F4E62B391E5300414BEC /* Array+Extension.swift in Sources */,
2E45B2472B4F643500FB83B7 /* AnalyticsManager.swift in Sources */,
63A7ABCF2B8C119A008D58FB /* Equipment.swift in Sources */,
29055FC62E849E2A00E9A730 /* LoadingModifier.swift in Sources */,
2E39D8202B3B623B00AD238B /* FitnessCenterView.swift in Sources */,
897703662BA2028D00F9992F /* ClassesViewModel.swift in Sources */,
2E1105C22B13D15100119F5B /* HomeGymCell.swift in Sources */,
Expand All @@ -828,6 +849,7 @@
2E15F5042B39E54700414BEC /* LocationManager.swift in Sources */,
89A652F92D02B00000277A16 /* CapacityRemindersView.swift in Sources */,
89A652FA2D02B00000277A16 /* RemindersView.swift in Sources */,
298EBA4A2E8DD244000441BA /* ModalModifier.swift in Sources */,
2E39D81E2B3B610200AD238B /* UINavigationController+Extension.swift in Sources */,
291433892D8738A400F913D5 /* WorkoutHistory.swift in Sources */,
63001AD62CC9ACFF0082AFFA /* LoginViewModel.swift in Sources */,
Expand Down Expand Up @@ -1273,14 +1295,14 @@
isa = XCSwiftPackageProductDependency;
productName = UpliftAPI;
};
89C10D162CCB2F9E007E753F /* FirebaseMessaging */ = {
isa = XCSwiftPackageProductDependency;
productName = FirebaseMessaging;
};
8983A9A52CFEA077008E84DB /* UpliftAPI */ = {
isa = XCSwiftPackageProductDependency;
productName = UpliftAPI;
};
89C10D162CCB2F9E007E753F /* FirebaseMessaging */ = {
isa = XCSwiftPackageProductDependency;
productName = FirebaseMessaging;
};
89CE47412D03F3C700BCB79D /* UpliftAPI */ = {
isa = XCSwiftPackageProductDependency;
productName = UpliftAPI;
Expand Down
46 changes: 23 additions & 23 deletions Uplift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Uplift/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
<string>$(ANNOUNCEMENTS_SCHEME)</string>
<key>CFBundleIconName</key>
<string>AppIcon</string>
<key>FirebaseAppDelegateProxyEnabled</key>
<false/>
<key>CFBundleURLTypes</key>
<array>
<dict>
Expand All @@ -27,6 +25,8 @@
</array>
</dict>
</array>
<key>FirebaseAppDelegateProxyEnabled</key>
<false/>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>UIAppFonts</key>
Expand Down
Loading