Skip to content

Ableda/master #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ndargi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Ableda/master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39a6596
Merge remote-tracking branch 'ableda/master'
Apr 19, 2016
5a30a62
Merge remote-tracking branch 'ableda/master'
Apr 19, 2016
43b9aa2
Merge branch 'nickd' into ableda/master
Apr 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 101 additions & 0 deletions WordScramble/WordScramble.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@
objects = {

/* Begin PBXBuildFile section */
4DBFC3341CC6FD1100C749FC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DBFC3291CC6FD1100C749FC /* AppDelegate.swift */; settings = {ASSET_TAGS = (); }; };
4DBFC3351CC6FD1100C749FC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4DBFC32A1CC6FD1100C749FC /* Assets.xcassets */; settings = {ASSET_TAGS = (); }; };
4DBFC3361CC6FD1100C749FC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4DBFC32B1CC6FD1100C749FC /* LaunchScreen.storyboard */; settings = {ASSET_TAGS = (); }; };
4DBFC3371CC6FD1100C749FC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4DBFC32D1CC6FD1100C749FC /* Main.storyboard */; settings = {ASSET_TAGS = (); }; };
4DBFC3381CC6FD1100C749FC /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4DBFC32F1CC6FD1100C749FC /* Info.plist */; settings = {ASSET_TAGS = (); }; };
4DBFC3391CC6FD1100C749FC /* MasterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DBFC3301CC6FD1100C749FC /* MasterViewController.swift */; settings = {ASSET_TAGS = (); }; };
4DBFC33A1CC6FD1100C749FC /* start.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4DBFC3311CC6FD1100C749FC /* start.txt */; settings = {ASSET_TAGS = (); }; };
4DBFC33B1CC6FD1100C749FC /* WordScramble.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 4DBFC3321CC6FD1100C749FC /* WordScramble.xcdatamodeld */; settings = {ASSET_TAGS = (); }; };
4DBFC3421CC6FD1900C749FC /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4DBFC33D1CC6FD1900C749FC /* Info.plist */; settings = {ASSET_TAGS = (); }; };
4DBFC3431CC6FD1900C749FC /* WordScrambleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DBFC33E1CC6FD1900C749FC /* WordScrambleTests.swift */; settings = {ASSET_TAGS = (); }; };
4DBFC3441CC6FD1900C749FC /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4DBFC3401CC6FD1900C749FC /* Info.plist */; settings = {ASSET_TAGS = (); }; };
4DBFC3451CC6FD1900C749FC /* WordScrambleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DBFC3411CC6FD1900C749FC /* WordScrambleUITests.swift */; settings = {ASSET_TAGS = (); }; };
E5A9EF981CC00CBB00994004 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5A9EF971CC00CBB00994004 /* AppDelegate.swift */; };
E5A9EF9B1CC00CBB00994004 /* WordScramble.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = E5A9EF991CC00CBB00994004 /* WordScramble.xcdatamodeld */; };
E5A9EF9D1CC00CBB00994004 /* MasterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5A9EF9C1CC00CBB00994004 /* MasterViewController.swift */; };
Expand Down Expand Up @@ -36,6 +48,18 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
4DBFC3291CC6FD1100C749FC /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4DBFC32A1CC6FD1100C749FC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4DBFC32C1CC6FD1100C749FC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4DBFC32E1CC6FD1100C749FC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
4DBFC32F1CC6FD1100C749FC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4DBFC3301CC6FD1100C749FC /* MasterViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MasterViewController.swift; sourceTree = "<group>"; };
4DBFC3311CC6FD1100C749FC /* start.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = start.txt; sourceTree = "<group>"; };
4DBFC3331CC6FD1100C749FC /* WordScramble.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WordScramble.xcdatamodel; sourceTree = "<group>"; };
4DBFC33D1CC6FD1900C749FC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4DBFC33E1CC6FD1900C749FC /* WordScrambleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WordScrambleTests.swift; sourceTree = "<group>"; };
4DBFC3401CC6FD1900C749FC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4DBFC3411CC6FD1900C749FC /* WordScrambleUITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WordScrambleUITests.swift; sourceTree = "<group>"; };
E5A9EF941CC00CBB00994004 /* WordScramble.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WordScramble.app; sourceTree = BUILT_PRODUCTS_DIR; };
E5A9EF971CC00CBB00994004 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
E5A9EF9A1CC00CBB00994004 /* WordScramble.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WordScramble.xcdatamodel; sourceTree = "<group>"; };
Expand Down Expand Up @@ -78,9 +102,45 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
4DBFC3281CC6FD1100C749FC /* WordScramble */ = {
isa = PBXGroup;
children = (
4DBFC3291CC6FD1100C749FC /* AppDelegate.swift */,
4DBFC32A1CC6FD1100C749FC /* Assets.xcassets */,
4DBFC32B1CC6FD1100C749FC /* LaunchScreen.storyboard */,
4DBFC32D1CC6FD1100C749FC /* Main.storyboard */,
4DBFC32F1CC6FD1100C749FC /* Info.plist */,
4DBFC3301CC6FD1100C749FC /* MasterViewController.swift */,
4DBFC3311CC6FD1100C749FC /* start.txt */,
4DBFC3321CC6FD1100C749FC /* WordScramble.xcdatamodeld */,
);
path = WordScramble;
sourceTree = "<group>";
};
4DBFC33C1CC6FD1900C749FC /* WordScrambleTests */ = {
isa = PBXGroup;
children = (
4DBFC33D1CC6FD1900C749FC /* Info.plist */,
4DBFC33E1CC6FD1900C749FC /* WordScrambleTests.swift */,
);
path = WordScrambleTests;
sourceTree = "<group>";
};
4DBFC33F1CC6FD1900C749FC /* WordScrambleUITests */ = {
isa = PBXGroup;
children = (
4DBFC3401CC6FD1900C749FC /* Info.plist */,
4DBFC3411CC6FD1900C749FC /* WordScrambleUITests.swift */,
);
path = WordScrambleUITests;
sourceTree = "<group>";
};
E5A9EF8B1CC00CBB00994004 = {
isa = PBXGroup;
children = (
4DBFC33C1CC6FD1900C749FC /* WordScrambleTests */,
4DBFC33F1CC6FD1900C749FC /* WordScrambleUITests */,
4DBFC3281CC6FD1100C749FC /* WordScramble */,
E5A9EF961CC00CBB00994004 /* WordScramble */,
E5A9EFB01CC00CBB00994004 /* WordScrambleTests */,
E5A9EFBB1CC00CBB00994004 /* WordScrambleUITests */,
Expand Down Expand Up @@ -235,10 +295,17 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4DBFC3381CC6FD1100C749FC /* Info.plist in Resources */,
4DBFC33A1CC6FD1100C749FC /* start.txt in Resources */,
4DBFC3371CC6FD1100C749FC /* Main.storyboard in Resources */,
E5A9EFA71CC00CBB00994004 /* LaunchScreen.storyboard in Resources */,
E5A9EFCB1CC00EE900994004 /* start.txt in Resources */,
E5A9EFA41CC00CBB00994004 /* Assets.xcassets in Resources */,
4DBFC3361CC6FD1100C749FC /* LaunchScreen.storyboard in Resources */,
E5A9EFA21CC00CBB00994004 /* Main.storyboard in Resources */,
4DBFC3441CC6FD1900C749FC /* Info.plist in Resources */,
4DBFC3421CC6FD1900C749FC /* Info.plist in Resources */,
4DBFC3351CC6FD1100C749FC /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -263,8 +330,13 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4DBFC3391CC6FD1100C749FC /* MasterViewController.swift in Sources */,
4DBFC3341CC6FD1100C749FC /* AppDelegate.swift in Sources */,
4DBFC3451CC6FD1900C749FC /* WordScrambleUITests.swift in Sources */,
4DBFC3431CC6FD1900C749FC /* WordScrambleTests.swift in Sources */,
E5A9EF9B1CC00CBB00994004 /* WordScramble.xcdatamodeld in Sources */,
E5A9EF981CC00CBB00994004 /* AppDelegate.swift in Sources */,
4DBFC33B1CC6FD1100C749FC /* WordScramble.xcdatamodeld in Sources */,
E5A9EF9D1CC00CBB00994004 /* MasterViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -301,6 +373,22 @@
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
4DBFC32B1CC6FD1100C749FC /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
4DBFC32C1CC6FD1100C749FC /* Base */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
};
4DBFC32D1CC6FD1100C749FC /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
4DBFC32E1CC6FD1100C749FC /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
E5A9EFA01CC00CBB00994004 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
Expand Down Expand Up @@ -490,6 +578,7 @@
E5A9EFC31CC00CBB00994004 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
E5A9EFC41CC00CBB00994004 /* Build configuration list for PBXNativeTarget "WordScrambleTests" */ = {
isa = XCConfigurationList;
Expand All @@ -498,6 +587,7 @@
E5A9EFC61CC00CBB00994004 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
E5A9EFC71CC00CBB00994004 /* Build configuration list for PBXNativeTarget "WordScrambleUITests" */ = {
isa = XCConfigurationList;
Expand All @@ -506,10 +596,21 @@
E5A9EFC91CC00CBB00994004 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCVersionGroup section */
4DBFC3321CC6FD1100C749FC /* WordScramble.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
4DBFC3331CC6FD1100C749FC /* WordScramble.xcdatamodel */,
);
currentVersion = 4DBFC3331CC6FD1100C749FC /* WordScramble.xcdatamodel */;
path = WordScramble.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
};
E5A9EF991CC00CBB00994004 /* WordScramble.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
Expand Down
Binary file added ...eproj/project.xcworkspace/xcuserdata/NickDargi.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
111 changes: 111 additions & 0 deletions ...e/WordScramble.xcodeproj/xcuserdata/NickDargi.xcuserdatad/xcschemes/WordScramble.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E5A9EF931CC00CBB00994004"
BuildableName = "WordScramble.app"
BlueprintName = "WordScramble"
ReferencedContainer = "container:WordScramble.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E5A9EFAC1CC00CBB00994004"
BuildableName = "WordScrambleTests.xctest"
BlueprintName = "WordScrambleTests"
ReferencedContainer = "container:WordScramble.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E5A9EFB71CC00CBB00994004"
BuildableName = "WordScrambleUITests.xctest"
BlueprintName = "WordScrambleUITests"
ReferencedContainer = "container:WordScramble.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E5A9EF931CC00CBB00994004"
BuildableName = "WordScramble.app"
BlueprintName = "WordScramble"
ReferencedContainer = "container:WordScramble.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E5A9EF931CC00CBB00994004"
BuildableName = "WordScramble.app"
BlueprintName = "WordScramble"
ReferencedContainer = "container:WordScramble.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E5A9EF931CC00CBB00994004"
BuildableName = "WordScramble.app"
BlueprintName = "WordScramble"
ReferencedContainer = "container:WordScramble.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
32 changes: 32 additions & 0 deletions ...ordScramble.xcodeproj/xcuserdata/NickDargi.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>WordScramble.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>E5A9EF931CC00CBB00994004</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>E5A9EFAC1CC00CBB00994004</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>E5A9EFB71CC00CBB00994004</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
14 changes: 11 additions & 3 deletions WordScramble/WordScramble/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="RMx-3f-FxP">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="RMx-3f-FxP">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<scenes>
<!--Master-->
Expand All @@ -11,6 +10,7 @@
<navigationController title="Master" id="RMx-3f-FxP" sceneMemberID="viewController">
<navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="Pmd-2v-anx">
<autoresizingMask key="autoresizingMask"/>
<animations/>
</navigationBar>
<connections>
<segue destination="7bK-jq-Zjz" kind="relationship" relationship="rootViewController" id="tsl-Nk-0bq"/>
Expand All @@ -27,10 +27,15 @@
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="r7i-6Z-zg0">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<toolbar key="tableFooterView" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="x2u-Oo-Mph">
<rect key="frame" x="0.0" y="130" width="600" height="44"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<<<<<<< HEAD
<animations/>
=======
>>>>>>> ableda/master
<items>
<barButtonItem title="Score: 0" id="K5B-Gp-BPu"/>
</items>
Expand All @@ -46,12 +51,15 @@
<label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Arm-wq-HPj">
<rect key="frame" x="15" y="0.0" width="570" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
</label>
</subviews>
<animations/>
</tableViewCellContentView>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</tableViewCell>
</prototypes>
Expand Down