Changed icon to new RIT-trademark-free one

Replaced the icon with a more generic tiger pawprint so that I'm not using an RIT trademark, so that I'm prepared for the first App Store release. Also added information about where menu information is being sourced from on the about screen, and fixed a bug where vegetarian/vegan/no beef/no pork toggles would not be written to UserDefaults.

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 = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				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 = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = 5GF7GKNTK4;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;

RIT Dining/Assets.xcassets/AppIcon.appiconset/Contents.json

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

RIT Dining/Assets.xcassets/AppIconOld.appiconset/Contents.json

@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "RIT Dining Temp Logo.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "RIT Dining Temp Logo.png",
+      "filename" : "TigerDine Temp Logo-iOS-Default-1024x1024@1x.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
+                recipe.englishAlternateName.trimmingCharacters(in: .whitespaces)
             } else {
-                recipe.componentName
+                recipe.componentName.trimmingCharacters(in: .whitespaces)
             }
             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,10 +7,10 @@
 
 import SwiftUI
 
-@Observable
+class MenuDietaryRestrictionsModel: ObservableObject {
-class MenuDietaryRestrictionsModel {
-    var filteredDietaryMarkers: Set<String> = []
     var dietaryRestrictions = DietaryRestrictions()
-    var isVegetarian: Bool = false
+    @AppStorage("isVegetarian") var isVegetarian: Bool = false
-    var isVegan: Bool = false
+    @AppStorage("isVegan") var isVegan: Bool = false
+    @AppStorage("noBeef") var noBeef: Bool = false
+    @AppStorage("noPork") var noPork: Bool = false
 }

RIT Dining/Views/AboutView.swift

@@ -20,35 +20,42 @@ 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.")
+                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("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.")
-                HStack {
+                VStack(alignment: .center, spacing: 8) {
-                    Button(action: {
+                    HStack(spacing: 8) {
-                        openURL(URL(string: "https://github.com/NinjaCheetah/TigerDine")!)
+                        Button(action: {
-                    }) {
+                            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")
+                        }
                     }
-                    Text("•")
+                    HStack(spacing: 8) {
-                        .foregroundStyle(.secondary)
+                        Button(action: {
-                    Button(action: {
+                            openURL(URL(string: "https://maps.rit.edu/")!)
-                        openURL(URL(string: "https://tigercenter.rit.edu/")!)
+                        }) {
-                    }) {
+                            Label("Official RIT Map", systemImage: "map")
-                        Text("TigerCenter")
+                        }
-                    }
+                        Button(action: {
-                    Text("•")
+                            openURL(URL(string: "https://fdmealplanner.com/")!)
-                        .foregroundStyle(.secondary)
+                        }) {
-                    Button(action: {
+                            Label("FD MealPlanner", systemImage: "menucard")
-                        openURL(URL(string: "https://maps.rit.edu/")!)
+                        }
-                    }) {
-                        Text("Official RIT Map")
                     }
                 }
+                .frame(maxWidth: .infinity)
             }
             Spacer()
         }

RIT Dining/Views/Menus/MenuDietaryRestrictionsSheet.swift

@@ -15,32 +15,10 @@ struct MenuDietaryRestrictionsSheet: View {
         NavigationView {
             Form {
                 Section(header: Text("Diet")) {
-                    Toggle(isOn: Binding(
+                    Toggle(isOn: $dietaryRestrictionsModel.noBeef) {
-                        get: {
-                            dietaryRestrictionsModel.filteredDietaryMarkers.contains("Beef")
-                        },
-                        set: { isOn in
-                            if isOn {
-                                dietaryRestrictionsModel.filteredDietaryMarkers.insert("Beef")
-                            } else {
-                                dietaryRestrictionsModel.filteredDietaryMarkers.remove("Beef")
-                            }
-                        } )
-                    ) {
                         Text("No Beef")
                     }
-                    Toggle(isOn: Binding(
+                    Toggle(isOn: $dietaryRestrictionsModel.noPork) {
-                        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

@@ -65,17 +65,6 @@ 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 {
@@ -100,6 +89,17 @@ 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)