Skip to content

Commit

Permalink
Merge pull request #3 from brendancboyle/UnifiedAndNative
Browse files Browse the repository at this point in the history 
Unified Layout and iPhone 6 Support
  • Loading branch information
@bcbee
bcbee committed Sep 30, 2014
2 parents bcd91b2 + c3f7ddc commit 785a938
Show file tree
Hide file tree
Showing 7 changed files with 298 additions and 94 deletions.
8 changes: 6 additions & 2 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 */; };
B3A99A2A19D203E9002BBBA5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B3A99A2919D203E9002BBBA5 /* LaunchScreen.storyboard */; };
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 */; };
Expand Down Expand Up @@ -57,6 +58,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>"; };
B3A99A2919D203E9002BBBA5 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; 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>"; };
Expand Down Expand Up @@ -264,6 +266,7 @@
ED70D61818FF180E007B4C18 /* iPhone.storyboard */,
ED70D61A18FF1826007B4C18 /* iPad.storyboard */,
B3BD750519C2635D0095C461 /* Unified.storyboard */,
B3A99A2919D203E9002BBBA5 /* LaunchScreen.storyboard */,
);
name = Interface;
sourceTree = "<group>";
Expand Down Expand Up @@ -373,6 +376,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B3A99A2A19D203E9002BBBA5 /* LaunchScreen.storyboard in Resources */,
ED70D61B18FF1826007B4C18 /* iPad.storyboard in Resources */,
B34E227119AD41290001127D /* Images.xcassets in Resources */,
B34E227319AD5B4F0001127D /* Batman.ttf in Resources */,
Expand Down Expand Up @@ -536,7 +540,7 @@
"$(PROJECT_DIR)/GoogleAnalytics",
);
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "11ad21e0-0724-493f-909f-455058310b53";
PROVISIONING_PROFILE = "73d8d28a-859e-4f2e-a08f-d14747763ad8";
WRAPPER_EXTENSION = app;
};
name = Debug;
Expand All @@ -558,7 +562,7 @@
"$(PROJECT_DIR)/GoogleAnalytics",
);
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "9c71e109-dbe9-4621-9060-1f1ab128a1bd";
PROVISIONING_PROFILE = "45a3943d-0387-475a-b97b-6f32290be43a";
WRAPPER_EXTENSION = app;
};
name = Release;
Expand Down
Binary file modified ...j/project.xcworkspace/xcuserdata/brendancboyle.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
147 changes: 147 additions & 0 deletions Universal Presenter Remote/Universal Presenter Remote/LaunchScreen.storyboard
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="14A361c" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="6dU-GU-ENs">
<dependencies>
<deployment defaultVersion="1792" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
</dependencies>
<customFonts key="customFonts">
<mutableArray key="Batman.ttf">
<string>BatmanForeverAlternate</string>
</mutableArray>
</customFonts>
<scenes>
<!--UPR-->
<scene sceneID="711-ny-H5F">
<objects>
<viewController id="Lxo-5F-gul" customClass="DBZ_LoginView" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="HLX-hU-gvF"/>
<viewControllerLayoutGuide type="bottom" id="hod-Xx-DM1"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="GBA-8E-iIh">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter token on presenting device" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YfS-85-INT">
<rect key="frame" x="174" y="526" width="253" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="253" id="5fg-HH-6Jr"/>
<constraint firstAttribute="height" constant="21" id="PZV-O3-LRV"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="UPR" translatesAutoresizingMaskIntoConstraints="NO" id="IeB-Vj-yad">
<rect key="frame" x="202" y="66" width="197" height="197"/>
<constraints>
<constraint firstAttribute="height" constant="197" id="MVp-ES-mI6">
<variation key="widthClass=regular" constant="314"/>
<variation key="heightClass=regular-widthClass=regular" constant="375"/>
</constraint>
<constraint firstAttribute="width" constant="197" id="fB8-yI-AdQ">
<variation key="widthClass=regular" constant="314"/>
<variation key="heightClass=regular-widthClass=regular" constant="375"/>
</constraint>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fv5-Xv-7Wm">
<rect key="frame" x="174" y="545" width="253" height="38"/>
<constraints>
<constraint firstAttribute="height" constant="38" id="7ZX-db-pre"/>
<constraint firstAttribute="width" constant="253" id="qIF-Oc-oFy"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="25"/>
<state key="normal" title="Connecting...">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="..." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Se4-bs-Ncr">
<rect key="frame" x="169" y="479" width="263" height="48"/>
<constraints>
<constraint firstAttribute="height" constant="48" id="MYh-If-Mid"/>
<constraint firstAttribute="width" constant="263" id="eKQ-TW-xiE"/>
</constraints>
<fontDescription key="fontDescription" name="BatmanForeverAlternate" family="BatmanForeverAlternate" pointSize="40"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Banner" translatesAutoresizingMaskIntoConstraints="NO" id="ZP4-Lf-GBK">
<rect key="frame" x="106" y="257" width="389" height="47"/>
<constraints>
<constraint firstAttribute="height" constant="47" id="6aE-ug-lbo">
<variation key="widthClass=regular" constant="72"/>
</constraint>
<constraint firstAttribute="width" constant="389" id="MEE-hw-Cf0">
<variation key="widthClass=regular" constant="595"/>
</constraint>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="hod-Xx-DM1" firstAttribute="top" secondItem="YfS-85-INT" secondAttribute="bottom" constant="53" id="6Qr-GO-1jo"/>
<constraint firstItem="ZP4-Lf-GBK" firstAttribute="top" secondItem="HLX-hU-gvF" secondAttribute="bottom" constant="193" id="CCb-Kl-U1c">
<variation key="widthClass=regular" constant="327"/>
<variation key="heightClass=regular-widthClass=regular" constant="377"/>
</constraint>
<constraint firstAttribute="centerX" secondItem="Se4-bs-Ncr" secondAttribute="centerX" id="E9D-jo-ool"/>
<constraint firstItem="IeB-Vj-yad" firstAttribute="top" secondItem="HLX-hU-gvF" secondAttribute="bottom" constant="2" id="Kg8-L8-GSm">
<variation key="widthClass=regular" constant="0.0"/>
</constraint>
<constraint firstItem="hod-Xx-DM1" firstAttribute="top" secondItem="fv5-Xv-7Wm" secondAttribute="bottom" constant="17" id="N9A-gs-49x"/>
<constraint firstItem="fv5-Xv-7Wm" firstAttribute="top" secondItem="Se4-bs-Ncr" secondAttribute="bottom" constant="18" id="Te0-vp-3cq"/>
<constraint firstAttribute="centerX" secondItem="ZP4-Lf-GBK" secondAttribute="centerX" id="XLh-OI-Rrs"/>
<constraint firstAttribute="centerX" secondItem="IeB-Vj-yad" secondAttribute="centerX" id="fQk-g8-f25"/>
<constraint firstAttribute="centerX" secondItem="fv5-Xv-7Wm" secondAttribute="centerX" id="lNX-od-por"/>
<constraint firstAttribute="centerX" secondItem="YfS-85-INT" secondAttribute="centerX" id="rFl-Oe-SMP"/>
</constraints>
</view>
<navigationItem key="navigationItem" title="UPR" id="3b8-Aa-PbR">
<barButtonItem key="backBarButtonItem" title="Back" id="eva-LR-1Z6"/>
<barButtonItem key="leftBarButtonItem" style="plain" systemItem="refresh" id="yZ2-5w-TtD"/>
<barButtonItem key="rightBarButtonItem" style="plain" id="uRi-Al-tzj">
<button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="infoLight" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="48i-17-HPH">
<rect key="frame" x="282" y="11" width="22" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<state key="normal">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
</barButtonItem>
</navigationItem>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="FA6-lF-CHU" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="867.75" y="67.5"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="qjA-Du-a8a">
<objects>
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="6dU-GU-ENs" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="wlb-YH-9SV">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="barTintColor" red="0.20392156859999999" green="0.023529411760000001" blue="0.21176470589999999" alpha="1" colorSpace="calibratedRGB"/>
<textAttributes key="titleTextAttributes">
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</textAttributes>
</navigationBar>
<nil name="viewControllers"/>
<connections>
<segue destination="Lxo-5F-gul" kind="relationship" relationship="rootViewController" id="ZAg-Rr-RTC"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="5rB-4E-hZ4" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="112" y="68"/>
</scene>
</scenes>
<resources>
<image name="Banner" width="2048" height="273"/>
<image name="UPR" width="2000" height="2000"/>
</resources>
<color key="tintColor" red="0.70196078429999997" green="0.0078431372550000003" blue="0.59607843140000005" alpha="1" colorSpace="calibratedRGB"/>
</document>
Loading

0 comments on commit 785a938

Please sign in to comment.