From 33901385de80b74d377d7dbf41652623c236257a Mon Sep 17 00:00:00 2001 From: ed Date: Thu, 28 Feb 2019 16:19:48 +0000 Subject: [PATCH] Projucer: Always add custom launch screen storyboard files to iOS projects even when a custom xcassets folder is specified --- .../Source/ProjectSaving/jucer_ProjectExport_Xcode.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h index 8ed0785be1..825ea55f2e 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h @@ -137,6 +137,7 @@ public: String getCustomResourceFoldersString() const { return customXcodeResourceFoldersValue.get().toString().replaceCharacters ("\r\n", "::"); } String getCustomXcassetsFolderString() const { return customXcassetsFolderValue.get(); } String getCustomLaunchStoryboardString() const { return customLaunchStoryboardValue.get(); } + bool shouldAddStoryboardToProject() const { return getCustomLaunchStoryboardString().isNotEmpty() || getCustomXcassetsFolderString().isEmpty(); } bool isHardenedRuntimeEnabled() const { return hardenedRuntimeValue.get(); } Array getHardenedRuntimeOptions() const { return *hardenedRuntimeOptionsValue.get().getArray(); } @@ -1438,7 +1439,7 @@ public: if (type != AudioUnitv3PlugIn) addPlistDictionaryKeyBool (dict, "UIViewControllerBasedStatusBarAppearance", false); - if (owner.getCustomXcassetsFolderString().isEmpty()) + if (owner.shouldAddStoryboardToProject()) { auto customStoryboard = owner.getCustomLaunchStoryboardString(); @@ -1912,7 +1913,7 @@ private: { addXcassets(); - if (getCustomXcassetsFolderString().isEmpty()) + if (shouldAddStoryboardToProject()) { auto customLaunchStoryboard = getCustomLaunchStoryboardString();