PRIVACY.md

@@ -1,2 +0,0 @@
-# Privacy Policy for TigerDine
-TigerDine does not collect, store, or share any personal data.

RIT Dining.xcodeproj/project.pbxproj

@@ -265,7 +265,7 @@
 				CODE_SIGN_ENTITLEMENTS = "RIT Dining/RIT Dining.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 19;
 				DEVELOPMENT_TEAM = 5GF7GKNTK4;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -300,7 +300,7 @@
 				CODE_SIGN_ENTITLEMENTS = "RIT Dining/RIT Dining.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 19;
 				DEVELOPMENT_TEAM = 5GF7GKNTK4;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;

RIT Dining/AppIcon.icon/icon.json

@@ -1,37 +0,0 @@
-{
-  "fill" : {
-    "automatic-gradient" : "gray:0.90568,1.00000"
-  },
-  "groups" : [
-    {
-      "layers" : [
-        {
-          "glass" : false,
-          "image-name" : "TigerDine Temp Logo Emblem.png",
-          "name" : "TigerDine Temp Logo Emblem",
-          "position" : {
-            "scale" : 0.9,
-            "translation-in-points" : [
-              0,
-              0
-            ]
-          }
-        }
-      ],
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.5
-      }
-    }
-  ],
-  "supported-platforms" : {
-    "circles" : [
-      "watchOS"
-    ],
-    "squares" : "shared"
-  }
-}

RIT Dining/Assets.xcassets/Icon.imageset/Contents.json

@@ -1,17 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "TigerDine Temp Logo-iOS-Default-1024x1024@1x.png",
+      "filename" : "RIT Dining Temp Logo.png",
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "TigerDine Temp Logo-iOS-Dark-1024x1024@1x.png",
       "idiom" : "universal"
     }
   ],

RIT Dining/Components/FDMealPlannerParsers.swift

@@ -24,9 +24,9 @@ func parseFDMealPlannerMenu(menu: FDMealsParser) -> [FDMenuItem] {
             // englishAlternateName holds the proper name of the item, but it's blank for some items for some reason. If that's the
             // case, then we should fall back on componentName, which is less user-friendly but works as a backup.
             let realName = if recipe.englishAlternateName != "" {
-                recipe.englishAlternateName.trimmingCharacters(in: .whitespaces)
+                recipe.englishAlternateName
             } else {
-                recipe.componentName.trimmingCharacters(in: .whitespaces)
+                recipe.componentName
             }
             let allergens = recipe.allergenName != "" ? recipe.allergenName.components(separatedBy: ",") : []
             // Get the list of dietary markers (Vegan, Vegetarian, Pork, Beef), and drop "Vegetarian" if "Vegan" is also included since

RIT Dining/Data/MenuDietaryRestrictionsModel.swift

@@ -7,31 +7,10 @@
 
 import SwiftUI
 
-class MenuDietaryRestrictionsModel: ObservableObject {
+@Observable
+class MenuDietaryRestrictionsModel {
+    var filteredDietaryMarkers: Set<String> = []
     var dietaryRestrictions = DietaryRestrictions()
-    
+    var isVegetarian: Bool = false
-    // I thought these could be @AppStorage keys but apparently not, because SwiftUI would subscribe to updates from those if
+    var isVegan: Bool = false
-    // they aren't being used directly inside the view.
-    @Published var isVegetarian: Bool {
-        didSet { UserDefaults.standard.set(isVegetarian, forKey: "isVegetarian") }
-    }
-
-    @Published var isVegan: Bool {
-        didSet { UserDefaults.standard.set(isVegan, forKey: "isVegan") }
-    }
-
-    @Published var noBeef: Bool {
-        didSet { UserDefaults.standard.set(noBeef, forKey: "noBeef") }
-    }
-
-    @Published var noPork: Bool {
-        didSet { UserDefaults.standard.set(noPork, forKey: "noPork") }
-    }
-
-    init() {
-        self.isVegetarian = UserDefaults.standard.bool(forKey: "isVegetarian")
-        self.isVegan = UserDefaults.standard.bool(forKey: "isVegan")
-        self.noBeef = UserDefaults.standard.bool(forKey: "noBeef")
-        self.noPork = UserDefaults.standard.bool(forKey: "noPork")
-    }
 }

RIT Dining/Views/AboutView.swift

@@ -20,42 +20,35 @@ struct AboutView: View {
                 .clipShape(RoundedRectangle(cornerRadius: 20))
             Text("TigerDine")
                 .font(.title)
-                .fontWeight(.bold)
             Text("An unofficial RIT Dining app")
                 .font(.subheadline)
             Text("Version \(appVersionString) (\(buildNumber))")
                 .foregroundStyle(.secondary)
                 .padding(.bottom, 2)
             VStack(alignment: .leading, spacing: 10) {
-                Text("Dining locations, their descriptions, and their opening hours are sourced from the RIT student-run TigerCenter API. Building occupancy information is sourced from the official RIT maps API. Menu and nutritional information is sourced from the data provided to FD MealPlanner by RIT Dining through the FD MealPlanner API.")
+                Text("Dining locations, their descriptions, and their opening hours are sourced from the RIT student-run TigerCenter API. Building occupancy information is sourced from the official RIT maps API.")
                 Text("This app is not affiliated, associated, authorized, endorsed by, or in any way officially connected with the Rochester Institute of Technology. This app is student created and maintained.")
-                VStack(alignment: .center, spacing: 8) {
+                HStack {
-                    HStack(spacing: 8) {
+                    Button(action: {
-                        Button(action: {
+                        openURL(URL(string: "https://github.com/NinjaCheetah/TigerDine")!)
-                            openURL(URL(string: "https://github.com/NinjaCheetah/TigerDine")!)
+                    }) {
-                        }) {
+                        Text("Source Code")
-                            Label("Source Code", systemImage: "network")
-                        }
-                        Button(action: {
-                            openURL(URL(string: "https://tigercenter.rit.edu/")!)
-                        }) {
-                            Label("TigerCenter", systemImage: "fork.knife.circle")
-                        }
                     }
-                    HStack(spacing: 8) {
+                    Text("•")
-                        Button(action: {
+                        .foregroundStyle(.secondary)
-                            openURL(URL(string: "https://maps.rit.edu/")!)
+                    Button(action: {
-                        }) {
+                        openURL(URL(string: "https://tigercenter.rit.edu/")!)
-                            Label("Official RIT Map", systemImage: "map")
+                    }) {
-                        }
+                        Text("TigerCenter")
-                        Button(action: {
+                    }
-                            openURL(URL(string: "https://fdmealplanner.com/")!)
+                    Text("•")
-                        }) {
+                        .foregroundStyle(.secondary)
-                            Label("FD MealPlanner", systemImage: "menucard")
+                    Button(action: {
-                        }
+                        openURL(URL(string: "https://maps.rit.edu/")!)
+                    }) {
+                        Text("Official RIT Map")
                     }
                 }
-                .frame(maxWidth: .infinity)
             }
             Spacer()
         }

RIT Dining/Views/Menus/MenuDietaryRestrictionsSheet.swift

@@ -9,16 +9,38 @@ import SwiftUI
 
 struct MenuDietaryRestrictionsSheet: View {
     @Environment(\.dismiss) var dismiss
-    @ObservedObject var dietaryRestrictionsModel: MenuDietaryRestrictionsModel
+    @Binding var dietaryRestrictionsModel: MenuDietaryRestrictionsModel
     
     var body: some View {
         NavigationView {
             Form {
                 Section(header: Text("Diet")) {
-                    Toggle(isOn: $dietaryRestrictionsModel.noBeef) {
+                    Toggle(isOn: Binding(
+                        get: {
+                            dietaryRestrictionsModel.filteredDietaryMarkers.contains("Beef")
+                        },
+                        set: { isOn in
+                            if isOn {
+                                dietaryRestrictionsModel.filteredDietaryMarkers.insert("Beef")
+                            } else {
+                                dietaryRestrictionsModel.filteredDietaryMarkers.remove("Beef")
+                            }
+                        } )
+                    ) {
                         Text("No Beef")
                     }
-                    Toggle(isOn: $dietaryRestrictionsModel.noPork) {
+                    Toggle(isOn: Binding(
+                        get: {
+                            dietaryRestrictionsModel.filteredDietaryMarkers.contains("Pork")
+                        },
+                        set: { isOn in
+                            if isOn {
+                                dietaryRestrictionsModel.filteredDietaryMarkers.insert("Pork")
+                            } else {
+                                dietaryRestrictionsModel.filteredDietaryMarkers.remove("Pork")
+                            }
+                        } )
+                    ) {
                         Text("No Pork")
                     }
                     Toggle(isOn: $dietaryRestrictionsModel.isVegetarian) {

RIT Dining/Views/Menus/MenuView.swift

@@ -17,7 +17,7 @@ struct MenuView: View {
     @State private var rotationDegrees: Double = 0
     @State private var selectedMealPeriod: Int = 0
     @State private var openPeriods: [Int] = []
-    @StateObject private var dietaryRestrictionsModel = MenuDietaryRestrictionsModel()
+    @State private var dietaryRestrictionsModel = MenuDietaryRestrictionsModel()
     @State private var showingDietaryRestrictionsSheet: Bool = false
     
     private var animation: Animation {
@@ -65,6 +65,17 @@ struct MenuView: View {
     
     private var filteredMenuItems: [FDMenuItem] {
         var newItems = menuItems
+        // Filter out dietary restrictions, starting with pork/beef since those are tagged.
+        if !dietaryRestrictionsModel.filteredDietaryMarkers.isEmpty {
+            newItems = newItems.filter { item in
+                for marker in dietaryRestrictionsModel.filteredDietaryMarkers {
+                    if item.dietaryMarkers.contains(marker) {
+                        return false
+                    }
+                }
+                return true
+            }
+        }
         // Filter out allergens.
         newItems = newItems.filter { item in
             if !item.allergens.isEmpty {
@@ -89,17 +100,6 @@ struct MenuView: View {
                 return false
             }
         }
-        // Filter out pork/beef.
-        if dietaryRestrictionsModel.noBeef {
-            newItems = newItems.filter { item in
-                item.dietaryMarkers.contains("Beef") == false
-            }
-        }
-        if dietaryRestrictionsModel.noPork {
-            newItems = newItems.filter { item in
-                item.dietaryMarkers.contains("Pork") == false
-            }
-        }
         // Filter down to search contents.
         newItems = newItems.filter { item in
             let searchedLocations = searchText.isEmpty || item.name.localizedCaseInsensitiveContains(searchText)
@@ -225,7 +225,7 @@ struct MenuView: View {
                 }
             }
             .sheet(isPresented: $showingDietaryRestrictionsSheet) {
-                MenuDietaryRestrictionsSheet(dietaryRestrictionsModel: dietaryRestrictionsModel)
+                MenuDietaryRestrictionsSheet(dietaryRestrictionsModel: $dietaryRestrictionsModel)
             }
         }
     }