Skip to content

Pull to catch up #3

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
marceadecker wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Pull to catch up #3

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
d8b4dc9
All Works Changed Background
Apr 28, 2015
6e2730a
commit updates
May 5, 2015
6ef654a
label changed
May 5, 2015
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
41 changes: 41 additions & 0 deletions GhostChat-iOS.xcodeproj/project.xcworkspace/xcshareddata/GhostChat-iOS.xccheckout
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>0548D2A7-456A-402B-A670-64E0343DDC35</string>
<key>IDESourceControlProjectName</key>
<string>GhostChat-iOS</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>05E6542863D027D11458EB7BAE0570EF60C9599C</key>
<string>https://github.com/marceadecker/GhostChat-iOS.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>GhostChat-iOS.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>05E6542863D027D11458EB7BAE0570EF60C9599C</key>
<string>../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/marceadecker/GhostChat-iOS.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>05E6542863D027D11458EB7BAE0570EF60C9599C</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>05E6542863D027D11458EB7BAE0570EF60C9599C</string>
<key>IDESourceControlWCCName</key>
<string>GhostChat-iOS</string>
</dict>
</array>
</dict>
</plist>
Binary file added ...oj/project.xcworkspace/xcuserdata/marceadecker.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
112 changes: 112 additions & 0 deletions GhostChat-iOS.xcodeproj/xcuserdata/marceadecker.xcuserdatad/xcschemes/GhostChat-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0630"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6C78490B1AED4DD50054DBED"
BuildableName = "GhostChat-iOS.app"
BlueprintName = "GhostChat-iOS"
ReferencedContainer = "container:GhostChat-iOS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6C7849201AED4DD50054DBED"
BuildableName = "GhostChat-iOSTests.xctest"
BlueprintName = "GhostChat-iOSTests"
ReferencedContainer = "container:GhostChat-iOS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6C7849201AED4DD50054DBED"
BuildableName = "GhostChat-iOSTests.xctest"
BlueprintName = "GhostChat-iOSTests"
ReferencedContainer = "container:GhostChat-iOS.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6C78490B1AED4DD50054DBED"
BuildableName = "GhostChat-iOS.app"
BlueprintName = "GhostChat-iOS"
ReferencedContainer = "container:GhostChat-iOS.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6C78490B1AED4DD50054DBED"
BuildableName = "GhostChat-iOS.app"
BlueprintName = "GhostChat-iOS"
ReferencedContainer = "container:GhostChat-iOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6C78490B1AED4DD50054DBED"
BuildableName = "GhostChat-iOS.app"
BlueprintName = "GhostChat-iOS"
ReferencedContainer = "container:GhostChat-iOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
27 changes: 27 additions & 0 deletions ...Chat-iOS.xcodeproj/xcuserdata/marceadecker.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?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>GhostChat-iOS.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>6C78490B1AED4DD50054DBED</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>6C7849201AED4DD50054DBED</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
8 changes: 4 additions & 4 deletions GhostChat-iOS/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7531" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7520"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
<scenes>
Expand Down Expand Up @@ -63,7 +63,7 @@
<outlet property="delegate" destination="vXZ-lx-hvc" id="zwk-3b-Wg7"/>
</connections>
</tableView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Just got here." borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Lc4-8H-e3Q">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="hi." borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Lc4-8H-e3Q">
<rect key="frame" x="140" y="20" width="435" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
Expand All @@ -78,7 +78,7 @@
</textField>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DYk-CA-WuL">
<rect key="frame" x="16" y="58" width="116" height="30"/>
<state key="normal" title="ReFresh">
<state key="normal" title="Refresh">
<color key="titleColor" red="0.0" green="0.50196081400000003" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
Expand Down
15,906 changes: 15,906 additions & 0 deletions Prototypes/PrototypeLF1.ai
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added Prototypes/PrototypeLF1.pdf
View file
Open in desktop
Binary file not shown.
9,282 changes: 9,282 additions & 0 deletions Prototypes/PrototypeLF2.ai
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added Prototypes/PrototypeLF2.pdf
View file
Open in desktop
Binary file not shown.
11,232 changes: 11,232 additions & 0 deletions Prototypes/RP1.ai
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added Prototypes/RP1.pdf
View file
Open in desktop
Binary file not shown.
19,752 changes: 19,752 additions & 0 deletions Prototypes/RP2.ai
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added Prototypes/RP2.pdf
View file
Open in desktop
Binary file not shown.