Merge pull request #54 from Abhiek187/feature/release

Feature/release

EZ Recipes/EZ Recipes.xcodeproj/project.pbxproj

@@ -148,6 +148,7 @@
 		F17A80AA2B7966B100E811C8 /* CaseIterableExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CaseIterableExtensionTests.swift; sourceTree = "<group>"; };
 		F17A80AE2B7978FD00E811C8 /* RecipeFilterEncoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecipeFilterEncoder.swift; sourceTree = "<group>"; };
 		F19C387E2BD9B7CF0075D7F2 /* 2.0.1.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = 2.0.1.txt; sourceTree = "<group>"; };
+		F1B6B4D12C1E6DB70058DCA7 /* 2.1.0.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = 2.1.0.txt; sourceTree = "<group>"; };
 		F1BB7D332C14E28800E129AC /* EZ Recipes.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "EZ Recipes.xcdatamodel"; sourceTree = "<group>"; };
 		F1BB7D372C14F62B00E129AC /* RecentRecipe.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentRecipe.swift; sourceTree = "<group>"; };
 		F1BB7D392C14F88600E129AC /* CoreDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataManager.swift; sourceTree = "<group>"; };
@@ -225,6 +226,7 @@
 				F10BFB1129A1821800636841 /* 1.0.0.txt */,
 				F1E48B0E2B8BCA4500A40169 /* 2.0.0.txt */,
 				F19C387E2BD9B7CF0075D7F2 /* 2.0.1.txt */,
+				F1B6B4D12C1E6DB70058DCA7 /* 2.1.0.txt */,
 			);
 			path = changelogs;
 			sourceTree = "<group>";
@@ -874,7 +876,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.abhiek.EZ-Recipes";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -903,7 +905,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.abhiek.EZ-Recipes";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

EZ Recipes/EZ Recipes/Helpers/Constants.swift

@@ -10,7 +10,7 @@ import SwiftUI
 
 struct Constants {
     static let recipesToPresentReview = 5
-    static let isUITest = "isUITest"
+    static let isUITest = ProcessInfo.processInfo.arguments.contains("isUITest")
 
     // Common strings
     static let appName = "EZ Recipes"

EZ Recipes/EZ Recipes/Helpers/CoreDataManager.swift

@@ -11,7 +11,7 @@ import OSLog
 /// Helper methods for Core Data
 ///
 /// - Note: Core Data stored at ~/Library/Developer/CoreSimulator/Devices/_Device-UUID_/data/Containers/Data/Application/_App-UUID_/Library/Application Support
-/// (/var/mobile/Containers/... on real devices) (Device-UUID and App-UUID gotten from `xcrun simctl get_app_container booted BUNDLE-ID data`)
+/// (/var/mobile/Containers/... on real devices) (~/Library/Developer/Xcode/UserData/Previews/Simulator Devices/... in previews) (Device-UUID and App-UUID gotten from `xcrun simctl get_app_container booted BUNDLE-ID data`)
 struct CoreDataManager {
     static let shared = CoreDataManager()
     private static let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? Constants.appName, category: "CoreDataManager")

EZ Recipes/EZ Recipes/Helpers/UserDefaultsManager.swift

@@ -11,7 +11,7 @@ import OSLog
 /// Helper methods for UserDefaults
 ///
 /// - Note: UserDefaults stored at ~/Library/Developer/CoreSimulator/Devices/_Device-UUID_/data/Containers/Data/Application/_App-UUID_/Library/Preferences
-/// (/var/mobile/Containers/... on real devices) (Device-UUID and App-UUID gotten from `xcrun simctl get_app_container booted BUNDLE-ID data`) (view plist file by running `/usr/libexec/PlistBuddy -c print PLIST-FILE`)
+/// (/var/mobile/Containers/... on real devices) (~/Library/Developer/Xcode/UserData/Previews/Simulator Devices/... in previews) (Device-UUID and App-UUID gotten from `xcrun simctl get_app_container booted BUNDLE-ID data`) (view plist file by running `/usr/libexec/PlistBuddy -c print PLIST-FILE`)
 struct UserDefaultsManager {
     private static let userDefaults = UserDefaults.standard
     private static let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? Constants.appName, category: "UserDefaultsManager")

EZ Recipes/EZ Recipes/Views/Home/HomeView.swift

@@ -34,7 +34,7 @@ struct HomeView: View {
 
     private func presentReview() {
         // Don't show the alert in a UI test
-        if !ProcessInfo.processInfo.arguments.contains(Constants.isUITest) {
+        if !Constants.isUITest {
             Task {
                 // Delay for two seconds to avoid interrupting the person using the app
                 try await Task.sleep(for: .seconds(2))

EZ Recipes/EZ RecipesUITests/EZ_RecipesUITests.swift

@@ -335,4 +335,11 @@ class EZ_RecipesUITests: XCTestCase {
         snapshot("search-view-\(shotNum)")
         shotNum += 1
     }
+
+    @MainActor
+    func testGlossaryScreen() throws {
+        // Take a screenshot of the glossary tab (no assertions)
+        app.tabBars["Tab Bar"].buttons["Glossary"].tap()
+        snapshot("glossary-view")
+    }
 }

EZ Recipes/fastlane/Fastfile

@@ -17,6 +17,9 @@ default_platform(:ios)
 
 platform :ios do
   APP_SCHEME = "EZ Recipes"
+  KEY_ID = "D383SF739"
+  ISSUER_ID = "6053b7fe-68a8-4acb-89be-165aa6465141"
+  KEY_FILE_PATH = "../../AuthKey_D383SF739.p8"
 
   before_all do
     # Only run in GitHub Actions
@@ -71,9 +74,9 @@ platform :ios do
   lane :beta do
     # Generate an App Store Connect API token (valid for 500 seconds by default)
     # Other actions automatically retrieve this key from SharedValues::APP_STORE_CONNECT_API_KEY
-    app_store_connect_api_key(key_id: "D383SF739",
-                              issuer_id: "6053b7fe-68a8-4acb-89be-165aa6465141",
-                              key_filepath: "../../AuthKey_D383SF739.p8",
+    app_store_connect_api_key(key_id: KEY_ID,
+                              issuer_id: ISSUER_ID,
+                              key_filepath: KEY_FILE_PATH,
                               in_house: false) # optional but may be required if using match/sigh
 
     # If the current version and the App Store version are the same, increment the current version (and reset the build number to 1)
@@ -123,9 +126,9 @@ platform :ios do
   desc "Upload a new build to the App Store"
   lane :release do
     # Promote the latest TestFlight build to production
-    app_store_connect_api_key(key_id: "D383SF739",
-                              issuer_id: "6053b7fe-68a8-4acb-89be-165aa6465141",
-                              key_filepath: "../../AuthKey_D383SF739.p8",
+    app_store_connect_api_key(key_id: KEY_ID,
+                              issuer_id: ISSUER_ID,
+                              key_filepath: KEY_FILE_PATH,
                               in_house: false)
     app_store_build_number(live: false)
 

EZ Recipes/fastlane/changelogs/2.1.0.txt

@@ -0,0 +1,7 @@
+- Your 10 most recently viewed recipes will now appear on the home screen and can be viewed offline
+- Added a glossary screen to learn about various cooking terms
+- Added Central American as a cuisine
+- Improved search performance when there are many matching recipes
+- Fixed cases where a recipe didn't have a URL
+- Adjusted navigation triggers on the search screen
+- The app will now prompt you for a review after browsing enough recipes (we won't be pushy 😊)

README.md

@@ -8,9 +8,10 @@
   <img src="screenshots/6.5-inch/iPhone 14 Pro Max-recipe-view-1_framed.png" alt="recipe header and nutrition label" width="300">
   <img src="screenshots/6.5-inch/iPhone 14 Pro Max-recipe-view-2_framed.png" alt="summary box" width="300">
   <img src="screenshots/6.5-inch/iPhone 14 Pro Max-recipe-view-3_framed.png" alt="ingredients list" width="300">
-  <img src="screenshots/6.5-inch/iPhone 14 Pro Max-recipe-view-6_framed.png" alt="step cards" width="300">
+  <img src="screenshots/6.5-inch/iPhone 14 Pro Max-recipe-view-4_framed.png" alt="step cards" width="300">
   <img src="screenshots/6.5-inch/iPhone 14 Pro Max-search-view-2_framed.png" alt="filter form" width="300">
   <img src="screenshots/6.5-inch/iPhone 14 Pro Max-search-view-3_framed.png" alt="search results" width="300">
+  <img src="screenshots/6.5-inch/iPhone 14 Pro Max-glossary-view_framed.png" alt="glossary screen" width="300">
 </div>
 
 ## Overview