Merge lp:~threeve/ubuntuone-ios-files/tweak-sign-out-button into lp:ubuntuone-ios-files

[Jason Foreman]

Made the sign out button more button-y.

[lp:~threeve/ubuntuone-ios-files/tweak-sign-out-button]

48. By Jason Foreman on 2011-12-14

Tweak sizing of padding on sign out button.

[Zachery Bir (urbanape)]

Works for me!

review: Approve

=== added file 'Assets/ios_files_buttonBG.png'
Binary files Assets/ios_files_buttonBG.png	1970-01-01 00:00:00 +0000 and Assets/ios_files_buttonBG.png	2011-12-14 20:36:40 +0000 differ
=== added file 'Assets/[e-mail]'
Binary files Assets/[e-mail]	1970-01-01 00:00:00 +0000 and Assets/[e-mail]	2011-12-14 20:36:40 +0000 differ
=== modified file 'Files.xcodeproj/project.pbxproj'
--- Files.xcodeproj/project.pbxproj	2011-12-13 18:36:44 +0000
+++ Files.xcodeproj/project.pbxproj	2011-12-14 20:36:40 +0000
@@ -108,6 +108,8 @@
 		96CC17E21418094800EFC1BA /* U1NodeJSONParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 96CC17E11418094800EFC1BA /* U1NodeJSONParser.m */; };
 		96CC17E514180C6000EFC1BA /* U1FilesClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 96CC17E414180C5F00EFC1BA /* U1FilesClient.m */; };
 		96D1A8E0148DB9F800B210E7 /* U1TransparentToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 96D1A8DF148DB9F800B210E7 /* U1TransparentToolbar.m */; };
+		96DCD4711499375800E18609 /* ios_files_buttonBG.png in Resources */ = {isa = PBXBuildFile; fileRef = 96DCD46F1499375800E18609 /* ios_files_buttonBG.png */; };
+		96DCD4721499375800E18609 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 96DCD4701499375800E18609 /* [e-mail] */; };
 		96E860B613F7251D0026783D /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96E860B513F7251D0026783D /* UIKit.framework */; };
 		96E860B813F7251D0026783D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96E860B713F7251D0026783D /* Foundation.framework */; };
 		96E860BA13F7251D0026783D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96E860B913F7251D0026783D /* CoreGraphics.framework */; };
@@ -227,7 +229,7 @@
 		960D46201409ECC500B73177 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[e-mail]"; path = "Assets/[e-mail]"; sourceTree = "<group>"; };
 		960D4623140D8AF200B73177 /* U1ByteSizeValueTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1ByteSizeValueTransformer.h; sourceTree = "<group>"; };
 		960D4624140D8AF200B73177 /* U1ByteSizeValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1ByteSizeValueTransformer.m; sourceTree = "<group>"; };
-		960D4626140D8B4400B73177 /* U1FuzzyDateTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; path = U1FuzzyDateTransformer.h; sourceTree = "<group>"; };
+		960D4626140D8B4400B73177 /* U1FuzzyDateTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1FuzzyDateTransformer.h; sourceTree = "<group>"; };
 		960D4627140D8B4400B73177 /* U1FuzzyDateTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1FuzzyDateTransformer.m; sourceTree = "<group>"; };
 		960D4629140D99DB00B73177 /* U1Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1Node.h; sourceTree = "<group>"; };
 		960D462A140D99DC00B73177 /* U1Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1Node.m; sourceTree = "<group>"; };
@@ -325,6 +327,8 @@
 		96CC17E414180C5F00EFC1BA /* U1FilesClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = U1FilesClient.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		96D1A8DE148DB9F800B210E7 /* U1TransparentToolbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1TransparentToolbar.h; sourceTree = "<group>"; };
 		96D1A8DF148DB9F800B210E7 /* U1TransparentToolbar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1TransparentToolbar.m; sourceTree = "<group>"; };
+		96DCD46F1499375800E18609 /* ios_files_buttonBG.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ios_files_buttonBG.png; path = Assets/ios_files_buttonBG.png; sourceTree = "<group>"; };
+		96DCD4701499375800E18609 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[e-mail]"; path = "Assets/[e-mail]"; sourceTree = "<group>"; };
 		96E860B113F7251D0026783D /* U1Files.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = U1Files.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		96E860B513F7251D0026783D /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		96E860B713F7251D0026783D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -511,6 +515,8 @@
 		96783E6513F8ABC70092C6A1 /* Assets */ = {
 			isa = PBXGroup;
 			children = (
+				96DCD46F1499375800E18609 /* ios_files_buttonBG.png */,
+				96DCD4701499375800E18609 /* [e-mail] */,
 				96B2B7791497042D0078D952 /* u1_folder.png */,
 				96B2B77A1497042D0078D952 /* [e-mail] */,
 				96327C041492A13100607EF3 /* navbar.png */,
@@ -949,6 +955,8 @@
 				96754B6E1496A7F3001D2A64 /* U1LoginController.xib in Resources */,
 				96B2B77B1497042D0078D952 /* u1_folder.png in Resources */,
 				96B2B77C1497042D0078D952 /* [e-mail] in Resources */,
+				96DCD4711499375800E18609 /* ios_files_buttonBG.png in Resources */,
+				96DCD4721499375800E18609 /* [e-mail] in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

=== modified file 'Files/U1SettingsViewController.m'
--- Files/U1SettingsViewController.m	2011-12-13 20:15:22 +0000
+++ Files/U1SettingsViewController.m	2011-12-14 20:36:40 +0000
@@ -15,6 +15,8 @@
 
 #import "U1SettingsViewController.h"
 
+#import <QuartzCore/QuartzCore.h>
+
 #import "U1AccountManager.h"
 #import "U1ByteSizeValueTransformer.h"
 #import "U1FilesClient.h"
@@ -100,7 +102,7 @@
 - (IBAction)signOut:(id)sender;
 {
 	// TODO: get actual copy for this from design team
-	UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:@"Logging out from this device will not affect other devices connected to Ubuntu One." delegate:self cancelButtonTitle:@"Cancel" destructiveButtonTitle:@"Log Out" otherButtonTitles:nil];
+	UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:@"Signing out on this device will not affect other devices connected to Ubuntu One." delegate:self cancelButtonTitle:@"Cancel" destructiveButtonTitle:@"Sign Out" otherButtonTitles:nil];
 	[actionSheet showFromTabBar:self.tabBarController.tabBar];
 	[actionSheet release];
 }
@@ -177,7 +179,7 @@
 	switch (section)
 	{
 		case U1SettingsViewSectionAccount:
-			return 3;
+			return 2;
 		case U1SettingsViewSectionCameraRoll:
 			return 3; // TODO const
 	}
@@ -201,15 +203,15 @@
 	{
 		case U1SettingsViewSectionAccount:
 		{
+			cell = [self.tableView dequeueReusableCellWithIdentifier:@"AccountCell"];
+			if (!cell)
+			{
+				cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:@"AccountCell"] autorelease];
+				[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+			}
 			switch (indexPath.row)
 			{
 				case 0:
-					cell = [self.tableView dequeueReusableCellWithIdentifier:@"AccountCell"];
-					if (!cell)
-					{
-						cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue2 reuseIdentifier:@"AccountCell"] autorelease];
-						[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
-					}
 					[cell.textLabel setText:NSLocalizedString(@"Name", nil)];
 					[cell.detailTextLabel setText:@"Loading..."];
 					if (self.accountInfo)
@@ -217,12 +219,6 @@
 					break;
 				case 1:
 				{
-					cell = [self.tableView dequeueReusableCellWithIdentifier:@"AccountCell"];
-					if (!cell)
-					{
-						cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue2 reuseIdentifier:@"AccountCell"] autorelease];
-						[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
-					}
 					[cell.textLabel setText:NSLocalizedString(@"Storage", nil)];
 					U1ByteSizeValueTransformer *byteSizeTransformer = [[U1ByteSizeValueTransformer alloc] init];
 					NSString *storageFormat = NSLocalizedString(@"%@ of %@ used", nil);
@@ -234,18 +230,6 @@
 					[byteSizeTransformer release];
 					break;
 				}
-				case 2:
-				{
-					cell = [self.tableView dequeueReusableCellWithIdentifier:@"LogOutCell"];
-					if (!cell)
-					{
-						cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"LogOutCell"] autorelease];
-						[cell.textLabel setTextAlignment:UITextAlignmentCenter];
-						[cell.textLabel setFont:[UIFont boldSystemFontOfSize:17.f]];
-						[cell.textLabel setText:@"Log Out of Ubuntu One"];
-					}
-					break;
-				}
 			}
 			break;
 //			return cell;
@@ -268,18 +252,35 @@
 
 - (NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath;
 {
-	if (indexPath.section == U1SettingsViewSectionAccount && indexPath.row == 2)
-		return indexPath;
 	return nil;
 }
 
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath;
-{
-	if (indexPath.section == U1SettingsViewSectionAccount && indexPath.row == 2)
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section;
+{
+	if (section == U1SettingsViewSectionAccount)
+		return 60.f;
+	return 0.f;
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section;
+{
+	if (section == U1SettingsViewSectionAccount)
 	{
-		[self signOut:nil];
-		[self.tableView deselectRowAtIndexPath:indexPath animated:YES];
+		CGRect footerBounds = CGRectMake(0, 0, 320, 60);
+		UIView *footerView = [[[UIView alloc] initWithFrame:footerBounds] autorelease];
+		
+		UIButton *signOutButton = [[[UIButton alloc] initWithFrame:CGRectMake(10, 8, 300, 38)] autorelease];
+		[footerView addSubview:signOutButton];
+		UIImage *buttonImage = [[UIImage imageNamed:@"ios_files_buttonBG"] stretchableImageWithLeftCapWidth:0 topCapHeight:0];
+		[signOutButton setBackgroundImage:buttonImage forState:UIControlStateNormal];
+		[signOutButton setTitle:@"Sign Out of Ubuntu One" forState:UIControlStateNormal];
+		[signOutButton.titleLabel setFont:[UIFont boldSystemFontOfSize:14.f]];
+		[signOutButton.layer setCornerRadius:8.f];
+		[signOutButton setClipsToBounds:YES];
+		[signOutButton addTarget:self action:@selector(signOut:) forControlEvents:UIControlEventTouchUpInside];
+		return footerView;
 	}
+	return nil;
 }
 
 - (UITableViewCell *)preparedAutoUploadCell;