From 1973487c2cb4dea2e2dd6513052bc9f7ff7f1e26 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Mon, 27 Feb 2017 12:33:00 +0300 Subject: [PATCH] Setting up splash screens --- .../project.pbxproj | 12 ++- .../AppIcon.appiconset/Contents.json | 93 +++++++++++++++++++ .../Images.xcassets/Contents.json | 6 ++ proj.ios/template-Info.plist | 6 +- 4 files changed, 111 insertions(+), 6 deletions(-) create mode 100644 proj.ios/Double Hit Balls/Images.xcassets/AppIcon.appiconset/Contents.json create mode 100644 proj.ios/Double Hit Balls/Images.xcassets/Contents.json diff --git a/proj.ios/Double Hit Balls.xcodeproj/project.pbxproj b/proj.ios/Double Hit Balls.xcodeproj/project.pbxproj index eda4107..143684d 100755 --- a/proj.ios/Double Hit Balls.xcodeproj/project.pbxproj +++ b/proj.ios/Double Hit Balls.xcodeproj/project.pbxproj @@ -31,6 +31,7 @@ 74C3AE4D1E2E4194003C07F2 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74C3AE4C1E2E4194003C07F2 /* LaunchScreen.storyboard */; }; 74EEBAEF1E2D13A6004C6C65 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74EEBAEE1E2D13A6004C6C65 /* AppDelegate.swift */; }; 74EEBAF11E2D1C7C004C6C65 /* CustomGLKView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74EEBAF01E2D1C7C004C6C65 /* CustomGLKView.swift */; }; + 841270C91E639C2F00776DAE /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 841270C81E639C2F00776DAE /* Images.xcassets */; }; 84D0FEBE1E274DDD00EC3FE5 /* libSalmon Engine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C902A7815C5735700FBC901 /* libSalmon Engine.a */; }; 84D0FEC91E274E4A00EC3FE5 /* libvorbis-tremor-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84D0FEC61E274E3700EC3FE5 /* libvorbis-tremor-ios.a */; }; 84D0FECC1E274EBC00EC3FE5 /* main_code.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D0FECA1E274EBC00EC3FE5 /* main_code.cpp */; }; @@ -104,6 +105,7 @@ 74C3AE4C1E2E4194003C07F2 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; 74EEBAEE1E2D13A6004C6C65 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 74EEBAF01E2D1C7C004C6C65 /* CustomGLKView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomGLKView.swift; sourceTree = ""; }; + 841270C81E639C2F00776DAE /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = "Double Hit Balls/Images.xcassets"; sourceTree = ""; }; 84D0FEC11E274E3700EC3FE5 /* vorbis-tremor-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "vorbis-tremor-ios.xcodeproj"; path = "../../libs/vorbis-tremor-ios/vorbis-tremor-ios.xcodeproj"; sourceTree = ""; }; 84D0FECA1E274EBC00EC3FE5 /* main_code.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main_code.cpp; path = ../game/main_code.cpp; sourceTree = ""; }; 84D0FECB1E274EBC00EC3FE5 /* main_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = main_code.h; path = ../game/main_code.h; sourceTree = ""; }; @@ -212,6 +214,7 @@ 4CC1FC3415B200130025C6F7 /* Resources */ = { isa = PBXGroup; children = ( + 841270C81E639C2F00776DAE /* Images.xcassets */, 4C74848315C5AD6E0056EC44 /* Icon.png */, 4C74848415C5AD6E0056EC44 /* iTunesArtwork */, 4C74848515C5AD6E0056EC44 /* Splash-landscape.png */, @@ -332,6 +335,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 841270C91E639C2F00776DAE /* Images.xcassets in Resources */, 4C49B2CC15B0991B003512CD /* InfoPlist.strings in Resources */, 74C3AE4D1E2E4194003C07F2 /* LaunchScreen.storyboard in Resources */, 4C49B2DC15B0991B003512CD /* ViewController_iPhone.xib in Resources */, @@ -494,6 +498,8 @@ 4C49B2E315B0991B003512CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-2"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -532,7 +538,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; SYMROOT = build; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "arm64 armv7 armv7s"; WRAPPER_EXTENSION = app; }; @@ -541,6 +547,8 @@ 4C49B2E415B0991B003512CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-2"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -575,7 +583,7 @@ PROVISIONING_PROFILE = ""; SWIFT_OBJC_BRIDGING_HEADER = "salmontemplate-Bridging-Header.h"; SWIFT_VERSION = 3.0; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "arm64 armv7 armv7s"; WRAPPER_EXTENSION = app; }; diff --git a/proj.ios/Double Hit Balls/Images.xcassets/AppIcon.appiconset/Contents.json b/proj.ios/Double Hit Balls/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..1d060ed --- /dev/null +++ b/proj.ios/Double Hit Balls/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,93 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/proj.ios/Double Hit Balls/Images.xcassets/Contents.json b/proj.ios/Double Hit Balls/Images.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/proj.ios/Double Hit Balls/Images.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/proj.ios/template-Info.plist b/proj.ios/template-Info.plist index 3f8a6b7..84d883c 100755 --- a/proj.ios/template-Info.plist +++ b/proj.ios/template-Info.plist @@ -8,8 +8,8 @@ 2x Hit Balls CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - Icon.png + CFBundleIcons~ipad + CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion @@ -26,8 +26,6 @@ 1.1 LSRequiresIPhoneOS - UILaunchImageFile - Splash-landscape.png UILaunchStoryboardName LaunchScreen UIPrerenderedIcon