From cf88fe42054e48415b81e6f20abf862733e89b00 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Wed, 23 Mar 2016 17:41:14 +0100 Subject: [PATCH] Organizing, new LaunchImage set --- FMC Planner 2.xcodeproj/project.pbxproj | 78 +++++++++++++------ .../LaunchImage.launchimage/Contents.json | 66 ++++++++++++++++ .../Base.lproj/LaunchScreen.storyboard | 27 ------- FMC Planner 2/Info.plist | 4 +- 4 files changed, 121 insertions(+), 54 deletions(-) create mode 100644 FMC Planner 2/Assets.xcassets/LaunchImage.launchimage/Contents.json delete mode 100644 FMC Planner 2/Base.lproj/LaunchScreen.storyboard diff --git a/FMC Planner 2.xcodeproj/project.pbxproj b/FMC Planner 2.xcodeproj/project.pbxproj index 15b5b47..2d603ec 100644 --- a/FMC Planner 2.xcodeproj/project.pbxproj +++ b/FMC Planner 2.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ E22EE9D71C9DB7B3001F5BC0 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E22EE9D61C9DB7B3001F5BC0 /* ViewController.m */; }; E22EE9DA1C9DB7B3001F5BC0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E22EE9D81C9DB7B3001F5BC0 /* Main.storyboard */; }; E22EE9DC1C9DB7B3001F5BC0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E22EE9DB1C9DB7B3001F5BC0 /* Assets.xcassets */; }; - E22EE9DF1C9DB7B3001F5BC0 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E22EE9DD1C9DB7B3001F5BC0 /* LaunchScreen.storyboard */; }; E22EE9EA1C9DB7B4001F5BC0 /* FMC_Planner_2Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E22EE9E91C9DB7B4001F5BC0 /* FMC_Planner_2Tests.m */; }; E22EE9F51C9DB7B4001F5BC0 /* FMC_Planner_2UITests.m in Sources */ = {isa = PBXBuildFile; fileRef = E22EE9F41C9DB7B4001F5BC0 /* FMC_Planner_2UITests.m */; }; E28E106D1C9FF93D006E2C6B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E28E106C1C9FF93D006E2C6B /* QuartzCore.framework */; }; @@ -53,7 +52,6 @@ E22EE9D61C9DB7B3001F5BC0 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; E22EE9D91C9DB7B3001F5BC0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; E22EE9DB1C9DB7B3001F5BC0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - E22EE9DE1C9DB7B3001F5BC0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; E22EE9E01C9DB7B3001F5BC0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E22EE9E51C9DB7B4001F5BC0 /* FMC Planner 2Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "FMC Planner 2Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; E22EE9E91C9DB7B4001F5BC0 /* FMC_Planner_2Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FMC_Planner_2Tests.m; sourceTree = ""; }; @@ -117,14 +115,9 @@ E22EE9CE1C9DB7B3001F5BC0 /* FMC Planner 2 */ = { isa = PBXGroup; children = ( + E2A9270D1CA2FD9800606E07 /* Storyboards */, E28E106F1CA01EA1006E2C6B /* Screens */, E28E106E1CA01E34006E2C6B /* ViewControllers */, - E22EE9D21C9DB7B3001F5BC0 /* AppDelegate.h */, - E22EE9D31C9DB7B3001F5BC0 /* AppDelegate.m */, - E22EE9D81C9DB7B3001F5BC0 /* Main.storyboard */, - E22EE9DB1C9DB7B3001F5BC0 /* Assets.xcassets */, - E22EE9DD1C9DB7B3001F5BC0 /* LaunchScreen.storyboard */, - E22EE9E01C9DB7B3001F5BC0 /* Info.plist */, E22EE9CF1C9DB7B3001F5BC0 /* Supporting Files */, ); path = "FMC Planner 2"; @@ -133,7 +126,10 @@ E22EE9CF1C9DB7B3001F5BC0 /* Supporting Files */ = { isa = PBXGroup; children = ( - E22EE9D01C9DB7B3001F5BC0 /* main.m */, + E2A9270F1CA2FE5900606E07 /* Implementation */, + E2A9270E1CA2FE5200606E07 /* Header */, + E22EE9DB1C9DB7B3001F5BC0 /* Assets.xcassets */, + E22EE9E01C9DB7B3001F5BC0 /* Info.plist */, ); name = "Supporting Files"; sourceTree = ""; @@ -159,12 +155,8 @@ E28E106E1CA01E34006E2C6B /* ViewControllers */ = { isa = PBXGroup; children = ( - E22EE9D51C9DB7B3001F5BC0 /* ViewController.h */, - E22EE9D61C9DB7B3001F5BC0 /* ViewController.m */, - E227C7811C9F42AB00DE0CA4 /* ViewControllerKeyboard.h */, - E227C7821C9F42AB00DE0CA4 /* ViewControllerKeyboard.m */, - E227C7841C9F474100DE0CA4 /* ViewControllerScreen.h */, - E227C7851C9F474100DE0CA4 /* ViewControllerScreen.m */, + E2A9270C1CA2FD6D00606E07 /* Implementation */, + E2A9270B1CA2FD6000606E07 /* Header */, ); name = ViewControllers; sourceTree = ""; @@ -179,6 +171,51 @@ name = Screens; sourceTree = ""; }; + E2A9270B1CA2FD6000606E07 /* Header */ = { + isa = PBXGroup; + children = ( + E22EE9D51C9DB7B3001F5BC0 /* ViewController.h */, + E227C7811C9F42AB00DE0CA4 /* ViewControllerKeyboard.h */, + E227C7841C9F474100DE0CA4 /* ViewControllerScreen.h */, + ); + name = Header; + sourceTree = ""; + }; + E2A9270C1CA2FD6D00606E07 /* Implementation */ = { + isa = PBXGroup; + children = ( + E22EE9D61C9DB7B3001F5BC0 /* ViewController.m */, + E227C7821C9F42AB00DE0CA4 /* ViewControllerKeyboard.m */, + E227C7851C9F474100DE0CA4 /* ViewControllerScreen.m */, + ); + name = Implementation; + sourceTree = ""; + }; + E2A9270D1CA2FD9800606E07 /* Storyboards */ = { + isa = PBXGroup; + children = ( + E22EE9D81C9DB7B3001F5BC0 /* Main.storyboard */, + ); + name = Storyboards; + sourceTree = ""; + }; + E2A9270E1CA2FE5200606E07 /* Header */ = { + isa = PBXGroup; + children = ( + E22EE9D21C9DB7B3001F5BC0 /* AppDelegate.h */, + ); + name = Header; + sourceTree = ""; + }; + E2A9270F1CA2FE5900606E07 /* Implementation */ = { + isa = PBXGroup; + children = ( + E22EE9D31C9DB7B3001F5BC0 /* AppDelegate.m */, + E22EE9D01C9DB7B3001F5BC0 /* main.m */, + ); + name = Implementation; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -286,7 +323,6 @@ buildActionMask = 2147483647; files = ( E2CC73E31CA2B7C7005B786E /* PERF INIT.plist in Resources */, - E22EE9DF1C9DB7B3001F5BC0 /* LaunchScreen.storyboard in Resources */, E28E10711CA01EC9006E2C6B /* MENU.plist in Resources */, E22EE9DC1C9DB7B3001F5BC0 /* Assets.xcassets in Resources */, E28E10731CA0375F006E2C6B /* ROUTE.plist in Resources */, @@ -363,14 +399,6 @@ name = Main.storyboard; sourceTree = ""; }; - E22EE9DD1C9DB7B3001F5BC0 /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - E22EE9DE1C9DB7B3001F5BC0 /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -460,6 +488,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer"; INFOPLIST_FILE = "FMC Planner 2/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; @@ -474,6 +503,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer"; INFOPLIST_FILE = "FMC Planner 2/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; diff --git a/FMC Planner 2/Assets.xcassets/LaunchImage.launchimage/Contents.json b/FMC Planner 2/Assets.xcassets/LaunchImage.launchimage/Contents.json new file mode 100644 index 0000000..e6c8ec6 --- /dev/null +++ b/FMC Planner 2/Assets.xcassets/LaunchImage.launchimage/Contents.json @@ -0,0 +1,66 @@ +{ + "images" : [ + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "736h", + "scale" : "3x" + }, + { + "orientation" : "landscape", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "736h", + "scale" : "3x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "667h", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "subtype" : "retina4", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/FMC Planner 2/Base.lproj/LaunchScreen.storyboard b/FMC Planner 2/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index 90d6157..0000000 --- a/FMC Planner 2/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FMC Planner 2/Info.plist b/FMC Planner 2/Info.plist index 0ca4d80..3a7ff7c 100644 --- a/FMC Planner 2/Info.plist +++ b/FMC Planner 2/Info.plist @@ -15,15 +15,13 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + 1.0 DEV CFBundleSignature ???? CFBundleVersion 1 LSRequiresIPhoneOS - UILaunchStoryboardName - LaunchScreen UIMainStoryboardFile Main UIRequiredDeviceCapabilities