Stashing changes

HackIllinois · Feb 27, 2025 · 5379d7c · 5379d7c
1 parent d206868
commit 5379d7c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/HackIllinois.xcodeproj/project.pbxproj b/HackIllinois.xcodeproj/project.pbxproj
@@ -1380,7 +1380,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2025.1.2;
+				MARKETING_VERSION = 2025.1.3;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -Xfrontend -warn-long-expression-type-checking=150";
 				PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios;
@@ -1417,7 +1417,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2025.1.2;
+				MARKETING_VERSION = 2025.1.3;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/HackIllinois/ViewControllers/HIScheduleViewController.swift b/HackIllinois/ViewControllers/HIScheduleViewController.swift
@@ -117,14 +117,15 @@ extension HIScheduleViewController {
     }
 
     func currentPredicate() -> NSPredicate {
-        if onlyShifts {
-            // Return a predicate that matches no events when in shifts view
-            return NSPredicate(value: false)
-        } else if onlyFavorites {
-            let currentTabPredicate = dataStore[currentTab].predicate
-            return NSCompoundPredicate(andPredicateWithSubpredicates: [currentTabPredicate, onlyFavoritesPredicate])
+        let currentTabPredicate = dataStore[currentTab].predicate
+        if onlyFavorites {
+            let compoundPredicate = NSCompoundPredicate(andPredicateWithSubpredicates: [currentTabPredicate, onlyFavoritesPredicate])
+            return compoundPredicate
+        } else if onlyShifts {
+            let noEventsPredicate = NSPredicate(value: false)
+            return noEventsPredicate
         } else {
-            return dataStore[currentTab].predicate
+            return currentTabPredicate
         }
     }