Merge pull request #101 from katzrkool/2020.5

Fixed Add Template Button
lkellar · Nov 5, 2020 · 4ee3d09 · 4ee3d09
2 parents e91724a + 3251f3e
commit 4ee3d09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Trips.xcodeproj/project.pbxproj b/Trips.xcodeproj/project.pbxproj
@@ -506,7 +506,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Trips/Trips.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Trips/Preview Content\"";
 				DEVELOPMENT_TEAM = 27888865CT;
@@ -517,7 +517,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2020.4;
+				MARKETING_VERSION = 2020.5;
 				PRODUCT_BUNDLE_IDENTIFIER = org.kellar.trips;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
@@ -532,7 +532,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Trips/Trips.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Trips/Preview Content\"";
 				DEVELOPMENT_TEAM = 27888865CT;
@@ -543,7 +543,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2020.4;
+				MARKETING_VERSION = 2020.5;
 				PRODUCT_BUNDLE_IDENTIFIER = org.kellar.trips;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;

diff --git a/Trips/views/TripDetail.swift b/Trips/views/TripDetail.swift
@@ -284,7 +284,7 @@ struct TripDetail: View {
                     secondaryViewSelectionType: selection.secondaryViewSelectionType == .addTemplate ? nil : .addTemplate,
                   secondaryViewSelection: nil)
                 if (showModals) {
-                    modalDisplayed = true
+                    templateModalDisplayed = true
                 }
             }
             .onDisappear(perform: {