Skip to content

Commit

Permalink
Started Unified storyboard
Browse files Browse the repository at this point in the history
  • Loading branch information
@bcbee
bcbee committed Sep 11, 2014
1 parent 4692f5a commit bcd91b2
Show file tree
Hide file tree
Showing 11 changed files with 693 additions and 3 deletions.
4 changes: 4 additions & 0 deletions Universal Presenter Remote/Universal Presenter Remote.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
B34E227119AD41290001127D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ED70D5FB18FF17E0007B4C18 /* Images.xcassets */; };
B34E227319AD5B4F0001127D /* Batman.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B34E227219AD5B4F0001127D /* Batman.ttf */; };
B357A5DD190453D500CCECB6 /* DBZ_InfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = B357A5DC190453D500CCECB6 /* DBZ_InfoView.m */; };
B3BD750619C2635D0095C461 /* Unified.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B3BD750519C2635D0095C461 /* Unified.storyboard */; };
B3CBFA5019B80AD100FF6837 /* DBZ_SettingsView.m in Sources */ = {isa = PBXBuildFile; fileRef = B3CBFA4F19B80AD100FF6837 /* DBZ_SettingsView.m */; };
B3EAFE2C19BE53AD002E1F29 /* Changelog.txt in Resources */ = {isa = PBXBuildFile; fileRef = B3EAFE1D19BE53AD002E1F29 /* Changelog.txt */; };
B3EAFE2D19BE53AD002E1F29 /* libAdIdAccess.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B3EAFE2919BE53AD002E1F29 /* libAdIdAccess.a */; };
Expand Down Expand Up @@ -56,6 +57,7 @@
B34E227419AD629D0001127D /* Universal Presenter Remote.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Universal Presenter Remote.entitlements"; sourceTree = "<group>"; };
B357A5DB190453D500CCECB6 /* DBZ_InfoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBZ_InfoView.h; sourceTree = "<group>"; };
B357A5DC190453D500CCECB6 /* DBZ_InfoView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBZ_InfoView.m; sourceTree = "<group>"; };
B3BD750519C2635D0095C461 /* Unified.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Unified.storyboard; sourceTree = "<group>"; };
B3CBFA4E19B80AD100FF6837 /* DBZ_SettingsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBZ_SettingsView.h; sourceTree = "<group>"; };
B3CBFA4F19B80AD100FF6837 /* DBZ_SettingsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBZ_SettingsView.m; sourceTree = "<group>"; };
B3EAFE1D19BE53AD002E1F29 /* Changelog.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Changelog.txt; sourceTree = "<group>"; };
Expand Down Expand Up @@ -261,6 +263,7 @@
children = (
ED70D61818FF180E007B4C18 /* iPhone.storyboard */,
ED70D61A18FF1826007B4C18 /* iPad.storyboard */,
B3BD750519C2635D0095C461 /* Unified.storyboard */,
);
name = Interface;
sourceTree = "<group>";
Expand Down Expand Up @@ -375,6 +378,7 @@
B34E227319AD5B4F0001127D /* Batman.ttf in Resources */,
ED70D5F418FF17E0007B4C18 /* InfoPlist.strings in Resources */,
ED70D61918FF180E007B4C18 /* iPhone.storyboard in Resources */,
B3BD750619C2635D0095C461 /* Unified.storyboard in Resources */,
B3EAFE2C19BE53AD002E1F29 /* Changelog.txt in Resources */,
B3EAFE2F19BE53AD002E1F29 /* Readme.txt in Resources */,
);
Expand Down
Binary file modified ...j/project.xcworkspace/xcuserdata/brendancboyle.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions ...rsal Presenter Remote/Universal Presenter Remote/Images.xcassets/1.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
"idiom" : "universal",
"scale" : "2x",
"filename" : "1.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
4 changes: 4 additions & 0 deletions ...rsal Presenter Remote/Universal Presenter Remote/Images.xcassets/2.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
"idiom" : "universal",
"scale" : "2x",
"filename" : "2-1.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
4 changes: 4 additions & 0 deletions ...rsal Presenter Remote/Universal Presenter Remote/Images.xcassets/3.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
"idiom" : "universal",
"scale" : "2x",
"filename" : "3.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
5 changes: 5 additions & 0 deletions ...senter Remote/Universal Presenter Remote/Images.xcassets/AppIcon.appiconset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "ipad",
Expand Down
4 changes: 4 additions & 0 deletions ...Presenter Remote/Universal Presenter Remote/Images.xcassets/Banner.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
4 changes: 4 additions & 0 deletions ... Remote/Universal Presenter Remote/Images.xcassets/SwipeBackground.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
4 changes: 4 additions & 0 deletions ...al Presenter Remote/Universal Presenter Remote/Images.xcassets/UPR.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
"idiom" : "universal",
"scale" : "2x",
"filename" : "UPR.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
658 changes: 658 additions & 0 deletions Universal Presenter Remote/Universal Presenter Remote/Unified.storyboard
View file

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions Universal Presenter Remote/Universal Presenter Remote/iPhone.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="14A343f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="hX9-3X-RoD">
<dependencies>
<deployment defaultVersion="1792" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
Expand Down Expand Up @@ -671,9 +670,9 @@
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
<segue reference="sel-dk-VFX"/>
<segue reference="LzK-FC-fvu"/>
<segue reference="uoP-ob-4sK"/>
<segue reference="jY9-kc-Fjz"/>
<segue reference="rPb-6J-sS0"/>
</inferredMetricsTieBreakers>
<color key="tintColor" red="0.70196078429999997" green="0.0078431372550000003" blue="0.59607843140000005" alpha="1" colorSpace="calibratedRGB"/>
</document>

0 comments on commit bcd91b2

Please sign in to comment.