From 0a4f54559cf71e81f33211be74f63963bce4b5d9 Mon Sep 17 00:00:00 2001 From: Sam Spencer Date: Sun, 24 Jan 2016 13:25:04 -0500 Subject: [PATCH] Storyboard & Project Updates All around maintenance on the project, and adds a Launch Screen --- .../SimpleLineChart.xcodeproj/project.pbxproj | 19 +- .../SimpleLineChart.xcscmblueprint | 30 + .../xcschemes/SimpleLineChart.xcscheme | 19 +- .../xcschemes/SimpleLineChartTests.xcscheme | 37 +- .../Base.lproj/Launch Screen.storyboard | 41 + .../Base.lproj/Main.storyboard | 809 ++++++++---------- .../SimpleLineChart-Info.plist | 4 +- .../SimpleLineChartTests-Info.plist | 2 +- 8 files changed, 481 insertions(+), 480 deletions(-) create mode 100644 Sample Project/SimpleLineChart.xcodeproj/project.xcworkspace/xcshareddata/SimpleLineChart.xcscmblueprint create mode 100644 Sample Project/SimpleLineChart/Base.lproj/Launch Screen.storyboard diff --git a/Sample Project/SimpleLineChart.xcodeproj/project.pbxproj b/Sample Project/SimpleLineChart.xcodeproj/project.pbxproj index 71e3533..9138ebc 100644 --- a/Sample Project/SimpleLineChart.xcodeproj/project.pbxproj +++ b/Sample Project/SimpleLineChart.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ 99B3FA3A1877898B00539A7B /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 99B3FA381877898B00539A7B /* LICENSE */; }; 99B3FA3B1877898B00539A7B /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 99B3FA391877898B00539A7B /* README.md */; }; A63990B51AD4923900B14D88 /* BEMAverageLine.m in Sources */ = {isa = PBXBuildFile; fileRef = A63990B41AD4923900B14D88 /* BEMAverageLine.m */; }; + A64594521BAB257B00D6B8FD /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A64594501BAB257B00D6B8FD /* Launch Screen.storyboard */; settings = {ASSET_TAGS = (); }; }; C3B90A5F187D15F7003E407D /* BEMCircle.m in Sources */ = {isa = PBXBuildFile; fileRef = C3B90A59187D15F7003E407D /* BEMCircle.m */; }; C3B90A60187D15F7003E407D /* BEMLine.m in Sources */ = {isa = PBXBuildFile; fileRef = C3B90A5B187D15F7003E407D /* BEMLine.m */; }; C3B90A61187D15F7003E407D /* BEMSimpleLineGraphView.m in Sources */ = {isa = PBXBuildFile; fileRef = C3B90A5D187D15F7003E407D /* BEMSimpleLineGraphView.m */; }; @@ -51,6 +52,7 @@ 99B3FA391877898B00539A7B /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = ""; }; A63990B31AD4923900B14D88 /* BEMAverageLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BEMAverageLine.h; sourceTree = ""; }; A63990B41AD4923900B14D88 /* BEMAverageLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BEMAverageLine.m; sourceTree = ""; }; + A64594511BAB257B00D6B8FD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = "Base.lproj/Launch Screen.storyboard"; sourceTree = ""; }; C3B90A58187D15F7003E407D /* BEMCircle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BEMCircle.h; sourceTree = ""; }; C3B90A59187D15F7003E407D /* BEMCircle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BEMCircle.m; sourceTree = ""; }; C3B90A5A187D15F7003E407D /* BEMLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BEMLine.h; sourceTree = ""; }; @@ -174,6 +176,7 @@ C3FD815F186DFD9A00FD8ED3 /* Supporting Files */ = { isa = PBXGroup; children = ( + A64594501BAB257B00D6B8FD /* Launch Screen.storyboard */, C3FD8160186DFD9A00FD8ED3 /* SimpleLineChart-Info.plist */, C3FD8161186DFD9A00FD8ED3 /* InfoPlist.strings */, C3FD8164186DFD9A00FD8ED3 /* main.m */, @@ -246,7 +249,7 @@ C3FD814D186DFD9A00FD8ED3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0700; ORGANIZATIONNAME = "Boris Emorine"; TargetAttributes = { C3FD8175186DFD9A00FD8ED3 = { @@ -278,6 +281,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + A64594521BAB257B00D6B8FD /* Launch Screen.storyboard in Resources */, 99B3FA3A1877898B00539A7B /* LICENSE in Resources */, C3DC80671903845D0080FF06 /* Main.storyboard in Resources */, C3FD8171186DFD9A00FD8ED3 /* Images.xcassets in Resources */, @@ -333,6 +337,14 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ + A64594501BAB257B00D6B8FD /* Launch Screen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + A64594511BAB257B00D6B8FD /* Base */, + ); + name = "Launch Screen.storyboard"; + sourceTree = ""; + }; C3FD8161186DFD9A00FD8ED3 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -378,6 +390,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; @@ -438,6 +451,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SimpleLineChart/SimpleLineChart-Prefix.pch"; INFOPLIST_FILE = "SimpleLineChart/SimpleLineChart-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "BorisEmorine.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -451,6 +465,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SimpleLineChart/SimpleLineChart-Prefix.pch"; INFOPLIST_FILE = "SimpleLineChart/SimpleLineChart-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "BorisEmorine.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -472,6 +487,7 @@ "$(inherited)", ); INFOPLIST_FILE = "SimpleLineChartTests/SimpleLineChartTests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "BorisEmorine.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; @@ -490,6 +506,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SimpleLineChart/SimpleLineChart-Prefix.pch"; INFOPLIST_FILE = "SimpleLineChartTests/SimpleLineChartTests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "BorisEmorine.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; diff --git a/Sample Project/SimpleLineChart.xcodeproj/project.xcworkspace/xcshareddata/SimpleLineChart.xcscmblueprint b/Sample Project/SimpleLineChart.xcodeproj/project.xcworkspace/xcshareddata/SimpleLineChart.xcscmblueprint new file mode 100644 index 0000000..e0440a2 --- /dev/null +++ b/Sample Project/SimpleLineChart.xcodeproj/project.xcworkspace/xcshareddata/SimpleLineChart.xcscmblueprint @@ -0,0 +1,30 @@ +{ + "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "1CA8AD815677B6FB0DD135F65EC4576AE68426CF", + "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { + + }, + "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { + "1CA8AD815677B6FB0DD135F65EC4576AE68426CF" : 0, + "3A216D26EB93D9EB79DE1E013DBEF75CF4509620" : 0 + }, + "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "F1F15B84-6620-4046-8D91-529CC20CD7C2", + "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { + "1CA8AD815677B6FB0DD135F65EC4576AE68426CF" : "BEMSimpleLineGraph", + "3A216D26EB93D9EB79DE1E013DBEF75CF4509620" : "" + }, + "DVTSourceControlWorkspaceBlueprintNameKey" : "SimpleLineChart", + "DVTSourceControlWorkspaceBlueprintVersion" : 204, + "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Sample Project\/SimpleLineChart.xcodeproj", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Boris-Em\/BEMSimpleLineGraph.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "1CA8AD815677B6FB0DD135F65EC4576AE68426CF" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.dowjones.net\/DJMobile\/ios-thesituation.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "3A216D26EB93D9EB79DE1E013DBEF75CF4509620" + } + ] +} \ No newline at end of file diff --git a/Sample Project/SimpleLineChart.xcodeproj/xcshareddata/xcschemes/SimpleLineChart.xcscheme b/Sample Project/SimpleLineChart.xcodeproj/xcshareddata/xcschemes/SimpleLineChart.xcscheme index 82ed6f5..4881ba8 100644 --- a/Sample Project/SimpleLineChart.xcodeproj/xcshareddata/xcschemes/SimpleLineChart.xcscheme +++ b/Sample Project/SimpleLineChart.xcodeproj/xcshareddata/xcschemes/SimpleLineChart.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -48,17 +48,21 @@ ReferencedContainer = "container:SimpleLineChart.xcodeproj"> + + - + - + + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -42,31 +42,52 @@ + + + + + + + + + + diff --git a/Sample Project/SimpleLineChart/Base.lproj/Launch Screen.storyboard b/Sample Project/SimpleLineChart/Base.lproj/Launch Screen.storyboard new file mode 100644 index 0000000..9523d07 --- /dev/null +++ b/Sample Project/SimpleLineChart/Base.lproj/Launch Screen.storyboard @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Sample Project/SimpleLineChart/Base.lproj/Main.storyboard b/Sample Project/SimpleLineChart/Base.lproj/Main.storyboard index cf77e96..295d0ef 100644 --- a/Sample Project/SimpleLineChart/Base.lproj/Main.storyboard +++ b/Sample Project/SimpleLineChart/Base.lproj/Main.storyboard @@ -1,8 +1,9 @@ - + - + + @@ -18,19 +19,22 @@ - + - + + + + + - + - - - + + @@ -77,20 +81,23 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -162,35 +203,35 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - - + - - - - - diff --git a/Sample Project/SimpleLineChart/SimpleLineChart-Info.plist b/Sample Project/SimpleLineChart/SimpleLineChart-Info.plist index 7d5babb..908da01 100644 --- a/Sample Project/SimpleLineChart/SimpleLineChart-Info.plist +++ b/Sample Project/SimpleLineChart/SimpleLineChart-Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - BorisEmorine.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -24,6 +24,8 @@ 1.0 LSRequiresIPhoneOS + UILaunchStoryboardName + Launch Screen UIMainStoryboardFile Main UIRequiredDeviceCapabilities diff --git a/Sample Project/SimpleLineChartTests/SimpleLineChartTests-Info.plist b/Sample Project/SimpleLineChartTests/SimpleLineChartTests-Info.plist index 82205b3..169b6f7 100644 --- a/Sample Project/SimpleLineChartTests/SimpleLineChartTests-Info.plist +++ b/Sample Project/SimpleLineChartTests/SimpleLineChartTests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - BorisEmorine.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType