Skip to content
Browse files

Update build and version numbers

Update defaults images for phone idiom
Update title position for landscape orientation
Update lines icon
  • Loading branch information...
1 parent dc7c281 commit 2b11e50d0c0f80df8619362b1271af02a5178453 @vtourraine vtourraine committed Jan 19, 2013
View
BIN client-ios/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN client-ios/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN client-ios/Default@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
11 client-ios/MyTee/Classes/MTESettingsViewController.m
@@ -37,7 +37,7 @@ - (void)viewDidLoad
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
{
UIBarButtonItem *spaceBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:[[UIView alloc] initWithFrame:CGRectMake(0, 0, 128, 1)]];
- self.navigationItem.leftBarButtonItems = @[spaceBarButtonItem];
+ self.navigationItem.leftBarButtonItem = spaceBarButtonItem;
[self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"linen-darker-bar"] forBarMetrics:UIBarMetricsDefault];
[self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"linen-darker-bar-landscape"] forBarMetrics:UIBarMetricsLandscapePhone];
@@ -97,6 +97,15 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface
return (interfaceOrientation == UIInterfaceOrientationPortrait);
}
+- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+{
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
+ {
+ UIBarButtonItem *spaceBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:[[UIView alloc] initWithFrame:CGRectMake(0, 0, UIInterfaceOrientationIsPortrait(toInterfaceOrientation) ? 128 : 380, 1)]];
+ self.navigationItem.leftBarButtonItem = spaceBarButtonItem;
+ }
+}
+
#pragma mark - Table view data source
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
View
17 client-ios/MyTee/Classes/MTETShirtsFilterViewController.m
@@ -25,11 +25,11 @@ - (void)viewDidLoad
{
[super viewDidLoad];
- UIBarButtonItem *spaceBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:[[UIView alloc] initWithFrame:CGRectMake(0, 0, 110, 1)]];
- self.navigationItem.rightBarButtonItems = @[spaceBarButtonItem];
-
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
{
+ UIBarButtonItem *spaceBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:[[UIView alloc] initWithFrame:CGRectMake(0, 0, 110, 1)]];
+ self.navigationItem.rightBarButtonItem = spaceBarButtonItem;
+
[self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"linen-darker-bar"] forBarMetrics:UIBarMetricsDefault];
[self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"linen-darker-bar-landscape"] forBarMetrics:UIBarMetricsLandscapePhone];
}
@@ -41,6 +41,15 @@ - (void)viewDidLoad
[self.tableView selectRowAtIndexPath:[NSIndexPath indexPathForItem:self.filterType inSection:0] animated:NO scrollPosition:UITableViewScrollPositionNone];
}
+- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+{
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
+ {
+ UIBarButtonItem *spaceBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:[[UIView alloc] initWithFrame:CGRectMake(0, 0, UIInterfaceOrientationIsPortrait(toInterfaceOrientation) ? 110 : 380, 1)]];
+ self.navigationItem.rightBarButtonItem = spaceBarButtonItem;
+ }
+}
+
#pragma mark - Table data source
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
@@ -93,6 +102,4 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
[self.slidingViewController resetTopView];
}
-#pragma mark - Actions
-
@end
View
BIN client-ios/MyTee/Resources/Images/lines-w.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN client-ios/MyTee/Resources/Images/lines-w@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
118 client-ios/MyTee/Resources/Storyboards/Storyboard_iPad.storyboard
@@ -208,7 +208,7 @@
</objects>
<point key="canvasLocation" x="-2209" y="-382"/>
</scene>
- <!--Shirts View Controller-->
+ <!--Shirts View Controller - MyTee-->
<scene sceneID="hz2-Ik-mgj">
<objects>
<collectionViewController autoresizesArchivedViewToFullSize="NO" id="s18-h6-Ei2" customClass="MTETShirtsViewController" sceneMemberID="viewController">
@@ -240,7 +240,7 @@
<outlet property="delegate" destination="s18-h6-Ei2" id="AKO-io-sHg"/>
</connections>
</collectionView>
- <navigationItem key="navigationItem" id="dIC-Ku-7CH">
+ <navigationItem key="navigationItem" title="MyTee" id="dIC-Ku-7CH">
<barButtonItem key="leftBarButtonItem" title="Item" style="plain" id="iHK-76-Rge">
<button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="RWl-vI-B41">
<rect key="frame" x="7" y="5" width="44" height="33"/>
@@ -1013,121 +1013,9 @@
<image name="72-pin.png" width="10" height="20"/>
<image name="80-shopping-cart-b.png" width="26" height="19"/>
<image name="83-calendar.png" width="23" height="25"/>
- <image name="lines-w.png" width="18" height="14"/>
+ <image name="lines-w.png" width="22" height="16"/>
<image name="wash-b.png" width="26" height="26"/>
</resources>
- <classes>
- <class className="MTELoginViewController" superclassName="UITableViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/MTELoginViewController.h"/>
- <relationships>
- <relationship kind="outlet" name="emailTextField" candidateClass="UITextField"/>
- <relationship kind="outlet" name="passwordTextField" candidateClass="UITextField"/>
- </relationships>
- </class>
- <class className="MTESettingCell" superclassName="UITableViewCell">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/MTESettingCell.h"/>
- <relationships>
- <relationship kind="outlet" name="label" candidateClass="UILabel"/>
- </relationships>
- </class>
- <class className="MTESettingSwitchCell" superclassName="MTESettingCell">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/MTESettingSwitchCell.h"/>
- <relationships>
- <relationship kind="outlet" name="switchControl" candidateClass="UISwitch"/>
- </relationships>
- </class>
- <class className="MTESettingsViewController" superclassName="UIViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/MTESettingsViewController.h"/>
- <relationships>
- <relationship kind="action" name="didPressCancel:"/>
- <relationship kind="action" name="didPressDone:"/>
- <relationship kind="action" name="remindersSwitchValueDidChange:" candidateClass="UISwitch"/>
- <relationship kind="outlet" name="emailLabel" candidateClass="UILabel"/>
- <relationship kind="outlet" name="lastSyncLabel" candidateClass="UILabel"/>
- <relationship kind="outlet" name="syncActivityIndicator" candidateClass="UIActivityIndicatorView"/>
- <relationship kind="outlet" name="tableView" candidateClass="UITableView"/>
- </relationships>
- </class>
- <class className="MTEStoreOnlineViewController" superclassName="MTEStoreViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/MTEStoreOnlineViewController.h"/>
- <relationships>
- <relationship kind="outlet" name="webView" candidateClass="UIWebView"/>
- </relationships>
- </class>
- <class className="MTEStoreRetailViewController" superclassName="MTEStoreViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/MTEStoreRetailViewController.h"/>
- <relationships>
- <relationship kind="outlet" name="mapView" candidateClass="MKMapView"/>
- </relationships>
- </class>
- <class className="MTEStoreViewController" superclassName="UIViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/MTEStoreViewController.h"/>
- <relationships>
- <relationship kind="action" name="presentActionSheet:"/>
- <relationship kind="outlet" name="addressIconImageView" candidateClass="UIImageView"/>
- <relationship kind="outlet" name="addressLabel" candidateClass="UILabel"/>
- <relationship kind="outlet" name="nameLabel" candidateClass="UILabel"/>
- <relationship kind="outlet" name="typeLabel" candidateClass="UILabel"/>
- </relationships>
- </class>
- <class className="MTETShirtCell" superclassName="UITableViewCell">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/MTETShirtCell.h"/>
- </class>
- <class className="MTETShirtViewController" superclassName="MTEUpdatableViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/MTETShirtViewController.h"/>
- <relationships>
- <relationship kind="action" name="didPressAction:"/>
- <relationship kind="action" name="dismissViewController:"/>
- <relationship kind="action" name="presentStoreController:"/>
- <relationship kind="outlet" name="mainScrollView" candidateClass="UIScrollView"/>
- <relationship kind="outlet" name="noteIconImageView" candidateClass="UIImageView"/>
- <relationship kind="outlet" name="noteLabel" candidateClass="UILabel"/>
- <relationship kind="outlet" name="ratingLabel" candidateClass="UILabel"/>
- <relationship kind="outlet" name="sizeLabel" candidateClass="UILabel"/>
- <relationship kind="outlet" name="storeButton" candidateClass="UIButton"/>
- <relationship kind="outlet" name="tagsLabel" candidateClass="UILabel"/>
- <relationship kind="outlet" name="tshirtImageView" candidateClass="UIImageView"/>
- <relationship kind="outlet" name="washButton" candidateClass="UIButton"/>
- <relationship kind="outlet" name="wearButton" candidateClass="UIButton"/>
- </relationships>
- </class>
- <class className="MTETShirtsFilterViewController" superclassName="UIViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/MTETShirtsFilterViewController.h"/>
- <relationships>
- <relationship kind="outlet" name="tableView" candidateClass="UITableView"/>
- </relationships>
- </class>
- <class className="MTETShirtsViewController" superclassName="UICollectionViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/MTETShirtsViewController.h"/>
- <relationships>
- <relationship kind="action" name="didPressSettingsBarButtonItem:"/>
- <relationship kind="action" name="showFilterViewController:"/>
- <relationship kind="action" name="showSettingsViewController:"/>
- <relationship kind="outlet" name="settingsBarButtonItem" candidateClass="UIBarButtonItem"/>
- </relationships>
- </class>
- <class className="MTEUpdatableViewController" superclassName="UIViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/MTEUpdatableViewController.h"/>
- </class>
- <class className="MTEWearWashViewController" superclassName="UITableViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/MTEWearWashViewController.h"/>
- </class>
- <class className="ShadowedTableView" superclassName="UITableView">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/ShadowedTableView.h"/>
- </class>
- <class className="UICollectionReusableView" superclassName="UIView">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/UICollectionReusableView.h"/>
- </class>
- <class className="UICollectionViewCell" superclassName="UICollectionReusableView">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/UICollectionViewCell.h"/>
- </class>
- <class className="UICollectionViewController" superclassName="UIViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/UICollectionViewController.h"/>
- </class>
- <class className="UICollectionViewFlowLayout" superclassName="UICollectionViewLayout">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/UICollectionViewFlowLayout.h"/>
- </class>
- </classes>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackTranslucent"/>
<simulatedOrientationMetrics key="orientation"/>
View
4 client-ios/MyTee/mytee-Info.plist
@@ -51,11 +51,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.8</string>
+ <string>0.9</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>8</string>
+ <string>9</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIMainStoryboardFile</key>

0 comments on commit 2b11e50

Please sign in to comment.
Something went wrong with that request. Please try again.