Permalink
Browse files

added regular font and swapped up the font styles on the log in wizard

  • Loading branch information...
1 parent 6655c7e commit 8c0e058c6874eb89c8460c7136e8852110d8723d @maddox maddox committed Apr 19, 2012
View
Binary file not shown.
@@ -83,6 +83,8 @@
E05AEC001533DAD00094566C /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E05AEBFF1533DAD00094566C /* AVFoundation.framework */; };
E05AEC0E1534B6BE0094566C /* PLALogInViewControllerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E05AEC0C1534B6BE0094566C /* PLALogInViewControllerViewController.m */; };
E05AEC0F1534B6BE0094566C /* PLALogInViewControllerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E05AEC0D1534B6BE0094566C /* PLALogInViewControllerViewController.xib */; };
+ E06844A0153F9C1E009C6B3F /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E068449F153F9C1E009C6B3F /* OpenSans-Regular.ttf */; };
+ E06844A1153F9C1E009C6B3F /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E068449F153F9C1E009C6B3F /* OpenSans-Regular.ttf */; };
E0761BB6153F928600CB3E2F /* OpenSans-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E0761BB4153F928600CB3E2F /* OpenSans-LightItalic.ttf */; };
E0761BB7153F928600CB3E2F /* OpenSans-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E0761BB4153F928600CB3E2F /* OpenSans-LightItalic.ttf */; };
E0761BB8153F928600CB3E2F /* OpenSans-Semibold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E0761BB5153F928600CB3E2F /* OpenSans-Semibold.ttf */; };
@@ -291,6 +293,7 @@
E05AEC0B1534B6BE0094566C /* PLALogInViewControllerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLALogInViewControllerViewController.h; sourceTree = "<group>"; };
E05AEC0C1534B6BE0094566C /* PLALogInViewControllerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLALogInViewControllerViewController.m; sourceTree = "<group>"; };
E05AEC0D1534B6BE0094566C /* PLALogInViewControllerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PLALogInViewControllerViewController.xib; sourceTree = "<group>"; };
+ E068449F153F9C1E009C6B3F /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Regular.ttf"; sourceTree = "<group>"; };
E0761BB4153F928600CB3E2F /* OpenSans-LightItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-LightItalic.ttf"; sourceTree = "<group>"; };
E0761BB5153F928600CB3E2F /* OpenSans-Semibold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Semibold.ttf"; sourceTree = "<group>"; };
E0761BBC153F977500CB3E2F /* OpenSans-Italic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Italic.ttf"; sourceTree = "<group>"; };
@@ -627,9 +630,17 @@
path = Reachability;
sourceTree = "<group>";
};
+ E068449D153F9A9F009C6B3F /* Views */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ path = Views;
+ sourceTree = "<group>";
+ };
E0761BB3153F928600CB3E2F /* Fonts */ = {
isa = PBXGroup;
children = (
+ E068449F153F9C1E009C6B3F /* OpenSans-Regular.ttf */,
E0761BBC153F977500CB3E2F /* OpenSans-Italic.ttf */,
E0761BB4153F928600CB3E2F /* OpenSans-LightItalic.ttf */,
E0761BB5153F928600CB3E2F /* OpenSans-Semibold.ttf */,
@@ -837,6 +848,7 @@
E0C965CA153327A6001D52BF /* Classes */ = {
isa = PBXGroup;
children = (
+ E068449D153F9A9F009C6B3F /* Views */,
E0C965CB153327A6001D52BF /* Controllers */,
);
path = Classes;
@@ -1001,6 +1013,7 @@
E0761BB7153F928600CB3E2F /* OpenSans-LightItalic.ttf in Resources */,
E0761BB9153F928600CB3E2F /* OpenSans-Semibold.ttf in Resources */,
E0761BBE153F977500CB3E2F /* OpenSans-Italic.ttf in Resources */,
+ E06844A1153F9C1E009C6B3F /* OpenSans-Regular.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1046,6 +1059,7 @@
E0761BB6153F928600CB3E2F /* OpenSans-LightItalic.ttf in Resources */,
E0761BB8153F928600CB3E2F /* OpenSans-Semibold.ttf in Resources */,
E0761BBD153F977500CB3E2F /* OpenSans-Italic.ttf in Resources */,
+ E06844A0153F9C1E009C6B3F /* OpenSans-Regular.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -15,6 +15,9 @@
UIView *urlView;
UIView *tokenView;
UIButton *urlButton;
+ UILabel *welcomeLabel;
+ UILabel *urlInstructionLabel;
+ UILabel *tokenInstructionLabel;
UITextField *playUrlTextField;
UITextField *playTokenTextField;
@@ -27,6 +30,9 @@
@property (retain, nonatomic) IBOutlet UIView *urlView;
@property (retain, nonatomic) IBOutlet UIView *tokenView;
@property (retain, nonatomic) IBOutlet UIButton *urlButton;
+@property (retain, nonatomic) IBOutlet UILabel *welcomeLabel;
+@property (retain, nonatomic) IBOutlet UILabel *urlInstructionLabel;
+@property (retain, nonatomic) IBOutlet UILabel *tokenInstructionLabel;
@property (retain, nonatomic) IBOutlet UITextField *playUrlTextField;
@property (retain, nonatomic) IBOutlet UITextField *playTokenTextField;
@@ -11,7 +11,7 @@
#import "PLAPlayerViewController.h"
@implementation PLALogInViewControllerViewController
-@synthesize pagingScrollView, pageControl, urlView, tokenView, playUrlTextField, playTokenTextField, urlButton;
+@synthesize pagingScrollView, pageControl, urlView, tokenView, welcomeLabel, urlInstructionLabel, tokenInstructionLabel, playUrlTextField, playTokenTextField, urlButton;
- (void)dealloc {
[playUrlTextField release];
@@ -21,6 +21,9 @@ - (void)dealloc {
[tokenView release];
[urlView release];
[urlButton release];
+ [welcomeLabel release];
+ [tokenInstructionLabel release];
+ [urlInstructionLabel release];
[super dealloc];
}
@@ -29,6 +32,11 @@ - (void)viewDidLoad{
[super viewDidLoad];
pageControlBeingUsed = NO;
+ NSLog(@"font names: %@", [UIFont fontNamesForFamilyName:@"Open Sans"]);
+
+ [welcomeLabel setFont:[UIFont fontWithName:@"OpenSans-Semibold" size:24.0]];
+ [urlInstructionLabel setFont:[UIFont fontWithName:@"OpenSans" size:18.0]];
+ [tokenInstructionLabel setFont:[UIFont fontWithName:@"OpenSans" size:18.0]];
if ([[PLAController sharedController] playUrl]) {
[playUrlTextField setText:[[PLAController sharedController] playUrl]];
@@ -74,6 +82,9 @@ - (void)viewDidUnload{
self.urlView = nil;
self.tokenView = nil;
self.urlButton = nil;
+ self.welcomeLabel = nil;
+ self.urlInstructionLabel = nil;
+ self.tokenInstructionLabel = nil;
[super viewDidUnload];
}
@@ -44,7 +44,6 @@
<int key="NSvFlags">290</int>
<string key="NSFrameSize">{320, 200}</string>
<reference key="NSSuperview" ref="191373211"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="92021109"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -60,8 +59,6 @@
<object class="NSPSMatrix" key="NSFrameMatrix"/>
<string key="NSFrame">{{141, 212}, {38, 36}}</string>
<reference key="NSSuperview" ref="191373211"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -72,7 +69,6 @@
</array>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="113467508"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">2</int>
@@ -88,7 +84,7 @@
<object class="IBUITextField" id="513605791">
<reference key="NSNextResponder" ref="851532750"/>
<int key="NSvFlags">295</int>
- <string key="NSFrame">{{60, 149}, {200, 31}}</string>
+ <string key="NSFrame">{{60, 169}, {200, 31}}</string>
<reference key="NSSuperview" ref="851532750"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
@@ -128,7 +124,7 @@
<object class="IBUILabel" id="84055326">
<reference key="NSNextResponder" ref="851532750"/>
<int key="NSvFlags">290</int>
- <string key="NSFrame">{{20, 20}, {280, 51}}</string>
+ <string key="NSFrame">{{20, 57}, {280, 62}}</string>
<reference key="NSSuperview" ref="851532750"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="637749286"/>
@@ -167,7 +163,7 @@
<object class="IBUIButton" id="637749286">
<reference key="NSNextResponder" ref="851532750"/>
<int key="NSvFlags">290</int>
- <string key="NSFrame">{{20, 85}, {280, 29}}</string>
+ <string key="NSFrame">{{20, 121}, {280, 29}}</string>
<reference key="NSSuperview" ref="851532750"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="513605791"/>
@@ -208,22 +204,24 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="850627116">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">290</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUILabel" id="1035969997">
<reference key="NSNextResponder" ref="850627116"/>
<int key="NSvFlags">290</int>
- <string key="NSFrame">{{20, 20}, {280, 99}}</string>
+ <string key="NSFrame">{{20, 48}, {280, 54}}</string>
<reference key="NSSuperview" ref="850627116"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1028673755"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
+ <reference key="IBUIBackgroundColor" ref="906928392"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string type="base64-UTF8" key="IBUIText">V2VsY29tZSB0byBQbGF5LgoKRmlyc3QsIGVudGVyIHRoZSBVUkwgdG8geW91ciBQbGF5Lg</string>
+ <string key="IBUIText">First, enter the URL to your Play.</string>
<reference key="IBUITextColor" ref="231710336"/>
<nil key="IBUIHighlightedColor"/>
<reference key="IBUIShadowColor" ref="646187197"/>
@@ -239,8 +237,10 @@
<object class="IBUITextField" id="1028673755">
<reference key="NSNextResponder" ref="850627116"/>
<int key="NSvFlags">295</int>
- <string key="NSFrame">{{60, 149}, {200, 31}}</string>
+ <string key="NSFrame">{{60, 169}, {200, 31}}</string>
<reference key="NSSuperview" ref="850627116"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -265,9 +265,38 @@
<reference key="IBUIFontDescription" ref="133415968"/>
<reference key="IBUIFont" ref="238021930"/>
</object>
+ <object class="IBUILabel" id="14758401">
+ <reference key="NSNextResponder" ref="850627116"/>
+ <int key="NSvFlags">290</int>
+ <string key="NSFrame">{{20, 6}, {280, 45}}</string>
+ <reference key="NSSuperview" ref="850627116"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="1035969997"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <reference key="IBUIBackgroundColor" ref="906928392"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Welcome to Play.</string>
+ <reference key="IBUITextColor" ref="231710336"/>
+ <nil key="IBUIHighlightedColor"/>
+ <reference key="IBUIShadowColor" ref="646187197"/>
+ <string key="IBUIShadowOffset">{0, 1}</string>
+ <int key="IBUIBaselineAdjustment">0</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">6</int>
+ <int key="IBUITextAlignment">1</int>
+ <int key="IBUILineBreakMode">0</int>
+ <reference key="IBUIFontDescription" ref="797332089"/>
+ <reference key="IBUIFont" ref="588840599"/>
+ </object>
</array>
<string key="NSFrameSize">{320, 200}</string>
- <reference key="NSNextKeyView" ref="1035969997"/>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="14758401"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="906928392"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -341,6 +370,30 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">tokenInstructionLabel</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="84055326"/>
+ </object>
+ <int key="connectionID">31</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">urlInstructionLabel</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="1035969997"/>
+ </object>
+ <int key="connectionID">32</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">welcomeLabel</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="14758401"/>
+ </object>
+ <int key="connectionID">34</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="1028673755"/>
<reference key="destination" ref="372490531"/>
@@ -424,8 +477,9 @@
<int key="objectID">11</int>
<reference key="object" ref="850627116"/>
<array class="NSMutableArray" key="children">
- <reference ref="1028673755"/>
<reference ref="1035969997"/>
+ <reference ref="14758401"/>
+ <reference ref="1028673755"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">URL View</string>
@@ -440,8 +494,8 @@
<reference key="object" ref="851532750"/>
<array class="NSMutableArray" key="children">
<reference ref="84055326"/>
- <reference ref="513605791"/>
<reference ref="637749286"/>
+ <reference ref="513605791"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">Token View</string>
@@ -466,6 +520,11 @@
<reference key="object" ref="637749286"/>
<reference key="parent" ref="851532750"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">33</int>
+ <reference key="object" ref="14758401"/>
+ <reference key="parent" ref="850627116"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -481,14 +540,15 @@
<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">30</int>
+ <int key="maxID">34</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -500,9 +560,12 @@
<string key="pagingScrollView">UIScrollView</string>
<string key="playTokenTextField">UITextField</string>
<string key="playUrlTextField">UITextField</string>
+ <string key="tokenInstructionLabel">UILabel</string>
<string key="tokenView">UIView</string>
<string key="urlButton">UIButton</string>
+ <string key="urlInstructionLabel">UILabel</string>
<string key="urlView">UIView</string>
+ <string key="welcomeLabel">UILabel</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="pageControl">
@@ -521,6 +584,10 @@
<string key="name">playUrlTextField</string>
<string key="candidateClassName">UITextField</string>
</object>
+ <object class="IBToOneOutletInfo" key="tokenInstructionLabel">
+ <string key="name">tokenInstructionLabel</string>
+ <string key="candidateClassName">UILabel</string>
+ </object>
<object class="IBToOneOutletInfo" key="tokenView">
<string key="name">tokenView</string>
<string key="candidateClassName">UIView</string>
@@ -529,10 +596,18 @@
<string key="name">urlButton</string>
<string key="candidateClassName">UIButton</string>
</object>
+ <object class="IBToOneOutletInfo" key="urlInstructionLabel">
+ <string key="name">urlInstructionLabel</string>
+ <string key="candidateClassName">UILabel</string>
+ </object>
<object class="IBToOneOutletInfo" key="urlView">
<string key="name">urlView</string>
<string key="candidateClassName">UIView</string>
</object>
+ <object class="IBToOneOutletInfo" key="welcomeLabel">
+ <string key="name">welcomeLabel</string>
+ <string key="candidateClassName">UILabel</string>
+ </object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@@ -81,6 +81,7 @@
<string>OpenSans-LightItalic.ttf</string>
<string>OpenSans-Semibold.ttf</string>
<string>OpenSans-Italic.ttf</string>
+ <string>OpenSans-Regular.ttf</string>
</array>
</dict>
</plist>

0 comments on commit 8c0e058

Please sign in to comment.