From 7834b176c29ee19914155ef65a059e6a33efa41a Mon Sep 17 00:00:00 2001 From: Yichi Zhang Date: Wed, 30 Mar 2016 17:30:54 +1100 Subject: [PATCH 1/2] Update project file to recommended settings --- .../ArrayDataSourceExample.xcodeproj/project.pbxproj | 11 ++++++----- .../ArrayDataSourceExample-Info.plist | 2 +- .../ArrayDataSourceExampleTests-Info.plist | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ArrayDataSourceExample/ArrayDataSourceExample.xcodeproj/project.pbxproj b/ArrayDataSourceExample/ArrayDataSourceExample.xcodeproj/project.pbxproj index c04f37a..21372b1 100644 --- a/ArrayDataSourceExample/ArrayDataSourceExample.xcodeproj/project.pbxproj +++ b/ArrayDataSourceExample/ArrayDataSourceExample.xcodeproj/project.pbxproj @@ -239,7 +239,7 @@ D9CEC9041800CA1000510512 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0720; ORGANIZATIONNAME = Raphael; TargetAttributes = { D9CEC92C1800CA1000510512 = { @@ -383,7 +383,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -398,6 +397,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -422,7 +422,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -459,6 +458,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "ArrayDataSourceExample/ArrayDataSourceExample-Prefix.pch"; INFOPLIST_FILE = "ArrayDataSourceExample/ArrayDataSourceExample-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "br.raphael.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -472,6 +472,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "ArrayDataSourceExample/ArrayDataSourceExample-Prefix.pch"; INFOPLIST_FILE = "ArrayDataSourceExample/ArrayDataSourceExample-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "br.raphael.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -481,7 +482,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 33DAF9A0A6AE4C3983C0EB4F /* Pods-ArrayDataSourceExampleTests.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/ArrayDataSourceExample.app/ArrayDataSourceExample"; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", @@ -495,6 +495,7 @@ "$(inherited)", ); INFOPLIST_FILE = "ArrayDataSourceExampleTests/ArrayDataSourceExampleTests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "br.raphael.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; @@ -505,7 +506,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 33DAF9A0A6AE4C3983C0EB4F /* Pods-ArrayDataSourceExampleTests.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/ArrayDataSourceExample.app/ArrayDataSourceExample"; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", @@ -515,6 +515,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "ArrayDataSourceExample/ArrayDataSourceExample-Prefix.pch"; INFOPLIST_FILE = "ArrayDataSourceExampleTests/ArrayDataSourceExampleTests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "br.raphael.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; diff --git a/ArrayDataSourceExample/ArrayDataSourceExample/ArrayDataSourceExample-Info.plist b/ArrayDataSourceExample/ArrayDataSourceExample/ArrayDataSourceExample-Info.plist index f4abea7..6667e41 100644 --- a/ArrayDataSourceExample/ArrayDataSourceExample/ArrayDataSourceExample-Info.plist +++ b/ArrayDataSourceExample/ArrayDataSourceExample/ArrayDataSourceExample-Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - br.raphael.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/ArrayDataSourceExample/ArrayDataSourceExampleTests/ArrayDataSourceExampleTests-Info.plist b/ArrayDataSourceExample/ArrayDataSourceExampleTests/ArrayDataSourceExampleTests-Info.plist index b7b21d4..169b6f7 100644 --- a/ArrayDataSourceExample/ArrayDataSourceExampleTests/ArrayDataSourceExampleTests-Info.plist +++ b/ArrayDataSourceExample/ArrayDataSourceExampleTests/ArrayDataSourceExampleTests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - br.raphael.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType From eb41ab07a7516109132d7dd614b4fff2197e2c91 Mon Sep 17 00:00:00 2001 From: Yichi Zhang Date: Wed, 30 Mar 2016 17:35:23 +1100 Subject: [PATCH 2/2] Support devices with screen width > 320 --- .../project.pbxproj | 4 ++ .../ArrayDataSourceExample-Info.plist | 2 + .../Base.lproj/Main.storyboard | 25 +++++----- .../Launch Screen.storyboard | 50 +++++++++++++++++++ 4 files changed, 69 insertions(+), 12 deletions(-) create mode 100644 ArrayDataSourceExample/ArrayDataSourceExample/Launch Screen.storyboard diff --git a/ArrayDataSourceExample/ArrayDataSourceExample.xcodeproj/project.pbxproj b/ArrayDataSourceExample/ArrayDataSourceExample.xcodeproj/project.pbxproj index 21372b1..2bf2a74 100644 --- a/ArrayDataSourceExample/ArrayDataSourceExample.xcodeproj/project.pbxproj +++ b/ArrayDataSourceExample/ArrayDataSourceExample.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 2C0495B31CABAAB00019A833 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2C0495B21CABAAB00019A833 /* Launch Screen.storyboard */; }; D9CEC9101800CA1000510512 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9CEC90F1800CA1000510512 /* Foundation.framework */; }; D9CEC9121800CA1000510512 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9CEC9111800CA1000510512 /* CoreGraphics.framework */; }; D9CEC9141800CA1000510512 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9CEC9131800CA1000510512 /* UIKit.framework */; }; @@ -37,6 +38,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 2C0495B21CABAAB00019A833 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = ""; }; 33DAF9A0A6AE4C3983C0EB4F /* Pods-ArrayDataSourceExampleTests.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ArrayDataSourceExampleTests.xcconfig"; path = "Pods/Pods-ArrayDataSourceExampleTests.xcconfig"; sourceTree = ""; }; 84B32EE746214D2DAF5704DC /* libPods-ArrayDataSourceExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ArrayDataSourceExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; D9CEC90C1800CA1000510512 /* ArrayDataSourceExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ArrayDataSourceExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -128,6 +130,7 @@ D9CEC91E1800CA1000510512 /* AppDelegate.h */, D9CEC91F1800CA1000510512 /* AppDelegate.m */, D9CEC9211800CA1000510512 /* Main.storyboard */, + 2C0495B21CABAAB00019A833 /* Launch Screen.storyboard */, D9CEC94B1800DD4700510512 /* UIViewControllers */, D9CEC94F1800DECE00510512 /* UIViews */, D9CEC9271800CA1000510512 /* Images.xcassets */, @@ -273,6 +276,7 @@ files = ( D9CEC9281800CA1000510512 /* Images.xcassets in Resources */, D9CEC91A1800CA1000510512 /* InfoPlist.strings in Resources */, + 2C0495B31CABAAB00019A833 /* Launch Screen.storyboard in Resources */, D9CEC9231800CA1000510512 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ArrayDataSourceExample/ArrayDataSourceExample/ArrayDataSourceExample-Info.plist b/ArrayDataSourceExample/ArrayDataSourceExample/ArrayDataSourceExample-Info.plist index 6667e41..9e81407 100644 --- a/ArrayDataSourceExample/ArrayDataSourceExample/ArrayDataSourceExample-Info.plist +++ b/ArrayDataSourceExample/ArrayDataSourceExample/ArrayDataSourceExample-Info.plist @@ -24,6 +24,8 @@ 1.0 LSRequiresIPhoneOS + UILaunchStoryboardName + Launch Screen UIMainStoryboardFile Main UIRequiredDeviceCapabilities diff --git a/ArrayDataSourceExample/ArrayDataSourceExample/Base.lproj/Main.storyboard b/ArrayDataSourceExample/ArrayDataSourceExample/Base.lproj/Main.storyboard index 8355d72..7d06b30 100644 --- a/ArrayDataSourceExample/ArrayDataSourceExample/Base.lproj/Main.storyboard +++ b/ArrayDataSourceExample/ArrayDataSourceExample/Base.lproj/Main.storyboard @@ -1,7 +1,9 @@ - + - + + + @@ -16,21 +18,19 @@ - + - - + @@ -48,6 +48,12 @@ + + + + + + @@ -57,9 +63,4 @@ - - - - - - \ No newline at end of file + diff --git a/ArrayDataSourceExample/ArrayDataSourceExample/Launch Screen.storyboard b/ArrayDataSourceExample/ArrayDataSourceExample/Launch Screen.storyboard new file mode 100644 index 0000000..464bf06 --- /dev/null +++ b/ArrayDataSourceExample/ArrayDataSourceExample/Launch Screen.storyboard @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +