Merged in corvino's changes

fadingred · Aug 16, 2012 · 5dc8e22 · 5dc8e22
2 parents 1ba4abd + bfef6fc
commit 5dc8e22
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 2 deletions.
diff --git a/iOS Example/Example.xcodeproj/project.pbxproj b/iOS Example/Example.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		273A5EFC15AF6CB8008EB70D /* ExamplePad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 273A5EFB15AF6CB8008EB70D /* ExamplePad.storyboard */; };
 		8B7BAF1214D2FD5000D7B32A /* Example.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8B7BAF1114D2FD5000D7B32A /* Example.storyboard */; };
 		8BAB445714D33D0500945E4E /* FRMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAB445514D33D0500945E4E /* FRMainViewController.m */; };
 		8BD5E14A14D1E4F20021848F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BD5E14914D1E4F20021848F /* UIKit.framework */; };
@@ -62,6 +63,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		273A5EFB15AF6CB8008EB70D /* ExamplePad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = ExamplePad.storyboard; sourceTree = "<group>"; };
 		8B4FC98D150C019800179136 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		8B4FC98E150C01A000179136 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		8B7BAF1114D2FD5000D7B32A /* Example.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Example.storyboard; sourceTree = "<group>"; };
@@ -102,6 +104,7 @@
 				8BAB445414D33D0500945E4E /* FRMainViewController.h */,
 				8BAB445514D33D0500945E4E /* FRMainViewController.m */,
 				8B7BAF1114D2FD5000D7B32A /* Example.storyboard */,
+				273A5EFB15AF6CB8008EB70D /* ExamplePad.storyboard */,
 				8BD5E19414D1E6E10021848F /* Other Sources */,
 				8BD5E19314D1E6C90021848F /* Resources */,
 				8BD5E14814D1E4F20021848F /* Frameworks */,
@@ -257,6 +260,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				8B7BAF1214D2FD5000D7B32A /* Example.storyboard in Resources */,
+				273A5EFC15AF6CB8008EB70D /* ExamplePad.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -352,7 +356,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -386,7 +390,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				WRAPPER_EXTENSION = app;
 			};

diff --git a/iOS Example/ExamplePad.storyboard b/iOS Example/ExamplePad.storyboard
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="1.1" toolsVersion="2182" systemVersion="11E2620" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="dwa-Q0-bHP">
+    <dependencies>
+        <deployment defaultVersion="1296" identifier="iOS"/>
+        <development defaultVersion="4200" identifier="xcode"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1181"/>
+    </dependencies>
+    <scenes>
+        <!--Main View Controller-->
+        <scene sceneID="V5d-OJ-W97">
+            <objects>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="9W4-Gr-DbO" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <viewController id="dwa-Q0-bHP" customClass="FRMainViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="ObN-AH-FuT">
+                        <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <subviews>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Design String" lineBreakMode="tailTruncation" minimumFontSize="10" id="HMY-1x-Oe5">
+                                <rect key="frame" x="20" y="20" width="728" height="21"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="" lineBreakMode="tailTruncation" minimumFontSize="10" id="s9c-Xi-ahT">
+                                <rect key="frame" x="20" y="49" width="728" height="21"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                    <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackTranslucent"/>
+                    <connections>
+                        <outlet property="codeLabel" destination="s9c-Xi-ahT" id="NNB-xY-hgL"/>
+                        <outlet property="designLabel" destination="HMY-1x-Oe5" id="9Zt-lk-oLc"/>
+                    </connections>
+                </viewController>
+            </objects>
+            <point key="canvasLocation" x="-30" y="115"/>
+        </scene>
+    </scenes>
+    <classes>
+        <class className="FRMainViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/FRMainViewController.h"/>
+            <relationships>
+                <relationship kind="outlet" name="codeLabel" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="designLabel" candidateClass="UILabel"/>
+            </relationships>
+        </class>
+    </classes>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackTranslucent"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination"/>
+    </simulatedMetricsContainer>
+</document>
diff --git a/iOS Example/FRMainViewController.m b/iOS Example/FRMainViewController.m
@@ -32,4 +32,9 @@ - (void)awakeFromLocalization {
 	[self.designLabel sizeToFit];
 }
 
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
+{
+    return UIInterfaceOrientationPortrait == toInterfaceOrientation || UIUserInterfaceIdiomPad == [[UIDevice currentDevice] userInterfaceIdiom];
+}
+
 @end
diff --git a/iOS Example/de.lproj/ExamplePad.strings b/iOS Example/de.lproj/ExamplePad.strings
diff --git a/iOS Example/en.lproj/ExamplePad.strings b/iOS Example/en.lproj/ExamplePad.strings