Merge lp:~rockstar/ubuntuone-ios-music/swipe-download into lp:ubuntuone-ios-music

[Paul Hummer]

Add swipe gesture to the SongUITableViewCell

This branch adds the ability to swipe to the right to download or clear the cache of a song. It moves all the logic from SongUIViewCell to a SongUIView.

The one thing from the design that I did not add is the removal of the three dots as handles. I disagree with design, and would like to continue that discussion before I completed remove them.

[Zachery Bir (urbanape)]

review: Approve

=== modified file 'U1Music.xcodeproj/project.pbxproj'
--- U1Music.xcodeproj/project.pbxproj	2012-06-28 02:52:49 +0000
+++ U1Music.xcodeproj/project.pbxproj	2012-07-24 05:24:19 +0000
@@ -10,6 +10,14 @@
 		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
 		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
 		2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */; };
+		523B3CDE15B4C42F004394F4 /* SongUITableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 523B3CDD15B4C42F004394F4 /* SongUITableView.m */; };
+		523B3CE215B5D64F004394F4 /* grabber.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CE015B5D64F004394F4 /* grabber.png */; };
+		523B3CE315B5D64F004394F4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CE115B5D64F004394F4 /* [e-mail] */; };
+		523B3CE615B5D814004394F4 /* UOPullGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 523B3CE515B5D814004394F4 /* UOPullGestureRecognizer.m */; };
+		523B3CF915B73BA0004394F4 /* download-grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF515B73BA0004394F4 /* download-grey.png */; };
+		523B3CFA15B73BA0004394F4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF615B73BA0004394F4 /* [e-mail] */; };
+		523B3CFB15B73BA0004394F4 /* download.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF715B73BA0004394F4 /* download.png */; };
+		523B3CFC15B73BA0004394F4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF815B73BA0004394F4 /* [e-mail] */; };
 		5305C2061157F4F800BC78F0 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 5305C2051157F4F800BC78F0 /* Default.png */; };
 		536D620B1144495400DFCE56 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 536D620A1144495400DFCE56 /* SystemConfiguration.framework */; };
 		537DE2D9113F008C00875852 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 537DE2D8113F008C00875852 /* CoreFoundation.framework */; };
@@ -211,6 +219,16 @@
 		1D6058910D05DD3D006BFB54 /* U1 Music.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "U1 Music.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		523B3CDC15B4C42F004394F4 /* SongUITableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SongUITableView.h; sourceTree = "<group>"; };
+		523B3CDD15B4C42F004394F4 /* SongUITableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SongUITableView.m; sourceTree = "<group>"; };
+		523B3CE015B5D64F004394F4 /* grabber.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = grabber.png; sourceTree = "<group>"; };
+		523B3CE115B5D64F004394F4 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
+		523B3CE415B5D814004394F4 /* UOPullGestureRecognizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UOPullGestureRecognizer.h; sourceTree = "<group>"; };
+		523B3CE515B5D814004394F4 /* UOPullGestureRecognizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOPullGestureRecognizer.m; sourceTree = "<group>"; };
+		523B3CF515B73BA0004394F4 /* download-grey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "download-grey.png"; sourceTree = "<group>"; };
+		523B3CF615B73BA0004394F4 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
+		523B3CF715B73BA0004394F4 /* download.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = download.png; sourceTree = "<group>"; };
+		523B3CF815B73BA0004394F4 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		5305C2051157F4F800BC78F0 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
 		536D620A1144495400DFCE56 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		537DE2D8113F008C00875852 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
@@ -798,6 +816,8 @@
 				9674C2C413A7DC01004509E4 /* UORadialProgressControl.m */,
 				91BE401A138E8D3A00D44D68 /* RIButtonItem.h */,
 				91BE401B138E8D3A00D44D68 /* RIButtonItem.m */,
+				523B3CDC15B4C42F004394F4 /* SongUITableView.h */,
+				523B3CDD15B4C42F004394F4 /* SongUITableView.m */,
 				93F3345D1247FA97006C6707 /* SongUITableViewCell.h */,
 				93F3345E1247FA97006C6707 /* SongUITableViewCell.m */,
 				919376F1135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.h */,
@@ -814,6 +834,8 @@
 				91C8CCAE14B7883600A0E311 /* ArtistUITableViewCell.m */,
 				91D3A17014BE12FE003D4FC0 /* PlaylistUITableViewCell.h */,
 				91D3A17114BE12FE003D4FC0 /* PlaylistUITableViewCell.m */,
+				523B3CE415B5D814004394F4 /* UOPullGestureRecognizer.h */,
+				523B3CE515B5D814004394F4 /* UOPullGestureRecognizer.m */,
 			);
 			name = Controls;
 			path = controls;
@@ -951,6 +973,12 @@
 		93FA42A6124DC1350080DF62 /* Images */ = {
 			isa = PBXGroup;
 			children = (
+				523B3CF515B73BA0004394F4 /* download-grey.png */,
+				523B3CF615B73BA0004394F4 /* [e-mail] */,
+				523B3CF715B73BA0004394F4 /* download.png */,
+				523B3CF815B73BA0004394F4 /* [e-mail] */,
+				523B3CE015B5D64F004394F4 /* grabber.png */,
+				523B3CE115B5D64F004394F4 /* [e-mail] */,
 				9149D9C9159BEC3D009AE771 /* default-album-art-120.png */,
 				9149D9CB159BEC3D009AE771 /* [e-mail] */,
 				9149D9CA159BEC3D009AE771 /* default-album-art-200.png */,
@@ -1257,6 +1285,12 @@
 				9149D9D2159BEC3D009AE771 /* [e-mail] in Resources */,
 				9149D9D3159BEC3D009AE771 /* default-album-art-640.png in Resources */,
 				9149D9D4159BEC3D009AE771 /* [e-mail] in Resources */,
+				523B3CE215B5D64F004394F4 /* grabber.png in Resources */,
+				523B3CE315B5D64F004394F4 /* [e-mail] in Resources */,
+				523B3CF915B73BA0004394F4 /* download-grey.png in Resources */,
+				523B3CFA15B73BA0004394F4 /* [e-mail] in Resources */,
+				523B3CFB15B73BA0004394F4 /* download.png in Resources */,
+				523B3CFC15B73BA0004394F4 /* [e-mail] in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1405,6 +1439,8 @@
 				960E4B3514E58844002AAB79 /* U1CachedFile.m in Sources */,
 				960E4B3814E5884B002AAB79 /* _U1CachedFile.m in Sources */,
 				91F2653014EACFCC0027232B /* U1MigrationViewController.m in Sources */,
+				523B3CDE15B4C42F004394F4 /* SongUITableView.m in Sources */,
+				523B3CE615B5D814004394F4 /* UOPullGestureRecognizer.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

=== modified file 'categories/UIImage+RoundedCorner.m'
--- categories/UIImage+RoundedCorner.m	2011-04-14 18:53:36 +0000
+++ categories/UIImage+RoundedCorner.m	2012-07-24 05:24:19 +0000
@@ -55,6 +55,8 @@
 #pragma mark -
 #pragma mark Private helper methods
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-protocol-method-implementation"
 // Adds a rectangular path to the given context and rounds its corners by the given extents
 // Original author: Björn Sållarp. Used with permission. See: http://blog.sallarp.com/iphone-uiimage-round-corners/
 - (void)addRoundedRectToPath:(CGRect)rect context:(CGContextRef)context ovalWidth:(CGFloat)ovalWidth ovalHeight:(CGFloat)ovalHeight {
@@ -75,5 +77,6 @@
     CGContextClosePath(context);
     CGContextRestoreGState(context);
 }
+#pragma clang diagnostic pop
 
 @end
\ No newline at end of file

=== modified file 'controls/PlaylistEditSongUITableViewCell.m'
--- controls/PlaylistEditSongUITableViewCell.m	2011-04-19 01:48:10 +0000
+++ controls/PlaylistEditSongUITableViewCell.m	2012-07-24 05:24:19 +0000
@@ -25,7 +25,5 @@
 - (void)layoutSubviews
 {
     [super layoutSubviews];
-    self.durationLabel.frame = CGRectMake(252, 0, 68, self.frame.size.height);
-    self.durationLabel.textAlignment = UITextAlignmentLeft;
 }
 @end

=== added file 'controls/SongUITableView.h'
--- controls/SongUITableView.h	1970-01-01 00:00:00 +0000
+++ controls/SongUITableView.h	2012-07-24 05:24:19 +0000
@@ -0,0 +1,35 @@
+//
+//  SongUITableView.h
+//  U1Music
+//
+//  Created by Paul Hummer on 7/16/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class SongUITableView;
+
+@protocol SongUITableViewDelegate <NSObject>
+- (void)viewDidBeginTouchGesture:(SongUITableView*)view;
+- (void)viewDidEndPullRightGesture:(SongUITableView *)view;
+@end
+
+@interface SongUITableView : UIView {
+    UIImageView *actionIconView;
+    UIView *bottomView;
+    UIView *progressView;
+    UIView *topView;
+}
+@property (nonatomic) BOOL cancelled;
+@property (nonatomic) BOOL downloading;
+@property (nonatomic) BOOL downloaded;
+@property (assign) IBOutlet id <SongUITableViewDelegate> delegate;
+
+@property (nonatomic,retain) UILabel *songNameLabel;
+@property(nonatomic,retain) UIImageView *nowPlaying;
+
+-(void)setCached:(BOOL)cached;
+-(void)closeBottomView;
+
+@end

=== added file 'controls/SongUITableView.m'
--- controls/SongUITableView.m	1970-01-01 00:00:00 +0000
+++ controls/SongUITableView.m	2012-07-24 05:24:19 +0000
@@ -0,0 +1,178 @@
+//
+//  SongUITableView.m
+//  U1Music
+//
+//  Created by Paul Hummer on 7/16/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "SongUITableView.h"
+#import "UOPullGestureRecognizer.h"
+
+@implementation SongUITableView
+
+@synthesize cancelled;
+@synthesize delegate;
+@synthesize downloaded;
+@synthesize downloading;
+
+@synthesize songNameLabel;
+@synthesize nowPlaying;
+
+- (id)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        /* XXX: rockstar - This is a hack, as it seems that the subviews aren't ready by the time configureCell hits them.  I think some restructuring might help here, but until then, this works.
+         */
+        [self layoutSubviews];
+    }
+    return self;
+}
+
+- (void)closeBottomView {
+    [UIView animateWithDuration:0.333 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+		CGRect frame = UIEdgeInsetsInsetRect(bottomView.bounds, UIEdgeInsetsMake(0, 12, 0, 0));
+		topView.frame = frame;
+	} completion:^(BOOL finished) {
+	}];
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    
+    if (bottomView == nil) {
+        bottomView = [[UIView alloc] initWithFrame:self.bounds];
+        bottomView.backgroundColor = [UIColor orangeColor];
+        [self addSubview:bottomView];
+        
+        //Currently this isn't really a progress view as much as it is a cache indicator.
+        progressView = [[UIView alloc] init];
+        progressView.backgroundColor = [UIColor whiteColor];
+        [bottomView addSubview:progressView];
+        
+        actionIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"download-grey"]];
+        actionIconView.highlightedImage = [UIImage imageNamed:@"download"];
+        actionIconView.frame = CGRectMake(24, (CGRectGetHeight(self.bounds) - 28.f) / 2.f, 28, 28);
+		[bottomView addSubview:actionIconView];
+    }
+    
+    if (topView == nil) {
+        CGRect frame = UIEdgeInsetsInsetRect(bottomView.bounds, UIEdgeInsetsMake(0, 12, 0, 0));
+        topView = [[UIView alloc] initWithFrame:frame];
+        topView.backgroundColor = [UIColor whiteColor];
+        [bottomView addSubview:topView];
+        
+        
+        UIImageView *handleView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"grabber"]];
+        handleView.frame = CGRectMake(0, (CGRectGetHeight(self.bounds) - 52.f) / 2.f, 22, 52);
+        [topView addSubview:handleView];
+        
+        songNameLabel = [[UILabel alloc] initWithFrame:UIEdgeInsetsInsetRect(topView.bounds, UIEdgeInsetsMake(0, 27, 0, 0))];
+        [topView addSubview:songNameLabel];
+        
+        nowPlaying = [[UIImageView alloc] initWithFrame:CGRectMake(CGRectGetWidth(self.bounds) - 52.f, (CGRectGetHeight(self.bounds) - 48.f) / 2.f, 22, 52)];
+		nowPlaying.image = [UIImage imageNamed:@"speaker"];
+		nowPlaying.backgroundColor = [UIColor clearColor];
+		nowPlaying.contentMode = UIViewContentModeCenter;
+        nowPlaying.hidden = YES;
+		[topView addSubview:nowPlaying];
+        
+        UOPullGestureRecognizer *pullRight = [[UOPullGestureRecognizer alloc] initWithTarget:self action:@selector(pullRight:)];
+        [topView addGestureRecognizer:pullRight];
+        [pullRight setDirection:UISwipeGestureRecognizerDirectionRight];
+        [pullRight setActionThreshold:52.f];
+        [pullRight setActivationRegion:CGRectMake(0, (CGRectGetHeight(self.bounds) - 52.f) / 2.f, 64, 52)];
+        [pullRight setFiresActionOnThresholdReached:NO];
+    }
+}
+
+- (void)pullRight:(UOPullGestureRecognizer*)pan {
+    CGPoint offset = [pan translationInView:pan.view];
+    
+    switch (pan.state) {
+        case UIGestureRecognizerStateBegan:
+            [self.delegate viewDidBeginTouchGesture:self];
+            break;
+        case UIGestureRecognizerStateChanged:
+            [UIView beginAnimations:nil context:NULL];
+            [UIView setAnimationBeginsFromCurrentState:YES];
+            [UIView setAnimationsEnabled:NO];
+
+            CGRect frameRect = topView.frame;
+            CGFloat myOffset = MAX(0, MIN(offset.x, pan.actionThreshold));
+            frameRect.origin.x = myOffset + 12.f;
+            
+            if (myOffset >= pan.actionThreshold) {
+                [UIView animateWithDuration:0.333 animations:^{
+                    actionIconView.highlighted = YES;
+                }];
+            } else {
+                [UIView animateWithDuration:0.333 animations:^{
+                    actionIconView.highlighted = NO;
+                }];
+            }
+            
+            topView.frame = frameRect;
+            [UIView commitAnimations];
+            [UIView setAnimationsEnabled:YES];
+            break;
+        case UIGestureRecognizerStateEnded:
+            cancelled = downloading;
+            downloading = !downloading;
+            [self.delegate viewDidEndPullRightGesture:self];
+            [self closeBottomView];
+            break;
+        case UIGestureRecognizerStateCancelled:
+            [UIView animateWithDuration:0.333 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+				CGRect frame = UIEdgeInsetsInsetRect(bottomView.bounds, UIEdgeInsetsMake(0, 12, 0, 0));
+				topView.frame = frame;
+			} completion:^(BOOL finished) {
+				// change the icon to whatever its new state should be
+				if (downloading)
+				{
+					actionIconView.image = [UIImage imageNamed:@"cancel-grey"];
+					actionIconView.highlightedImage = [UIImage imageNamed:@"cancel"];
+				}
+				else if (downloaded)
+				{
+					actionIconView.image = [UIImage imageNamed:@"trash-grey"];
+					actionIconView.highlightedImage = [UIImage imageNamed:@"trash"];					
+				}
+				else
+				{
+					actionIconView.image = [UIImage imageNamed:@"download-grey"];
+					actionIconView.highlightedImage = [UIImage imageNamed:@"download"];
+				}
+				actionIconView.highlighted = NO;
+			}];
+            
+			[UIView animateWithDuration:0.333 animations:^{
+				bottomView.backgroundColor = [UIColor orangeColor];
+			}];
+            break;
+        default:
+            break;
+    }
+}
+
+-(void)setCached:(BOOL)cached {
+    CGRect frame;
+    if (cached) {
+        frame = CGRectMake(0, CGRectGetMaxY(self.bounds), 12, CGRectGetHeight(self.bounds));
+    } else {
+        frame = CGRectMake(0, 0, 12, CGRectGetHeight(self.bounds));
+    }
+    progressView.frame = frame;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect
+{
+    // Drawing code
+}
+*/
+
+@end

=== modified file 'controls/SongUITableViewCell.h'
--- controls/SongUITableViewCell.h	2011-05-27 18:22:51 +0000
+++ controls/SongUITableViewCell.h	2012-07-24 05:24:19 +0000
@@ -29,22 +29,11 @@
 //  DAMAGE.
 
 #import <UIKit/UIKit.h>
+#import "SongUITableView.h"
 
 @interface SongUITableViewCell : UITableViewCell {
-    UIButton *cacheButton;
-    UIActivityIndicatorView *spinner;
-	UILabel *songNameLabel;
-	BOOL evenRow;
-	UIView *coloredView;
-	UILabel *positionLabel;
-	UILabel *durationLabel;
-	UIImageView *nowPlaying;
+    SongUITableView *songUITableView;
 }
-@property(nonatomic,retain) UIButton *cacheButton;
-@property(nonatomic,retain) UIActivityIndicatorView *spinner;
-@property(nonatomic,assign) BOOL evenRow;
-@property(nonatomic,retain) UIImageView *nowPlaying;
-@property(nonatomic,retain) UILabel *songNameLabel;
-@property(nonatomic,retain) UILabel *positionLabel;
-@property(nonatomic,retain) UILabel *durationLabel;
+@property (nonatomic, retain) SongUITableView *songUITableView;
+
 @end

=== modified file 'controls/SongUITableViewCell.m'
--- controls/SongUITableViewCell.m	2011-06-07 09:20:03 +0000
+++ controls/SongUITableViewCell.m	2012-07-24 05:24:19 +0000
@@ -34,50 +34,14 @@
 
 @implementation SongUITableViewCell
 
-@synthesize cacheButton, spinner, songNameLabel, positionLabel, durationLabel, nowPlaying, evenRow;
+//@synthesize spinner, songNameLabel, positionLabel, durationLabel, nowPlaying, evenRow;
+@synthesize songUITableView;
 
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
 {
-    if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]))
-	{		
-		self.evenRow = YES;
-		
-		coloredView = [[UIView alloc] initWithFrame:self.frame];
-		coloredView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-		[self.contentView addSubview:coloredView];
-
-        // XXX: This is added first so that it sits behind the cacheButton. This isn't optimal. Something better would be to delegate taps on the spinner to the cacheButton, regardless of its front-to-back ordering in the subviews.
-        spinner = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray] retain];
-        spinner.hidesWhenStopped = YES;
-        [coloredView addSubview:spinner];
-		
-        cacheButton = [[UIButton buttonWithType:UIButtonTypeCustom] retain];
-        [cacheButton setImage:[UIImage imageNamed:@"uncached"] forState:UIControlStateNormal];
-        [coloredView addSubview:self.cacheButton];
+    if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) {
         
-        songNameLabel = [[UILabel alloc] init];
-		songNameLabel.font = [UIFont boldSystemFontOfSize:[UIFont systemFontSize]];
-		[coloredView addSubview:self.songNameLabel];
-		
-		positionLabel = [[UILabel alloc] init];
-		positionLabel.text = @"1";
-		positionLabel.textAlignment = UITextAlignmentCenter;
-		positionLabel.font = [UIFont boldSystemFontOfSize:[UIFont systemFontSize]];
-		[coloredView addSubview:positionLabel];
-		
-		durationLabel = [[UILabel alloc] init];
-		durationLabel.text = @"0:00";
-		durationLabel.textAlignment = UITextAlignmentCenter;
-		durationLabel.font = [UIFont boldSystemFontOfSize:[UIFont systemFontSize]];
-		[coloredView addSubview:durationLabel];
-		
-		nowPlaying = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 13, 12)];
-		nowPlaying.image = [UIImage imageNamed:@"speaker"];
-		nowPlaying.backgroundColor = [UIColor clearColor];
-		nowPlaying.contentMode = UIViewContentModeCenter;
-		[coloredView addSubview:nowPlaying];
-		
-		self.textLabel.hidden = YES;
+        songUITableView = [[SongUITableView alloc] initWithFrame:self.frame];
 	}
 	
 	return self;
@@ -86,38 +50,11 @@
 - (void)layoutSubviews 
 {
     [super layoutSubviews];
-	self.positionLabel.frame = CGRectMake(0, 0, 35, self.frame.size.height);
-	self.songNameLabel.frame = CGRectMake(37, 0, 164, self.frame.size.height);
-	self.nowPlaying.frame = CGRectMake(203, 0, 13, self.frame.size.height);
-	self.durationLabel.frame = CGRectMake(218, 0, 48, self.frame.size.height);
-    self.cacheButton.frame = CGRectMake(268, 0, 44, self.frame.size.height);
-    self.spinner.frame = CGRectMake(282, 14, 16, 16);
-    
-	if (self.evenRow)
-	{
-		coloredView.backgroundColor = [UIColor whiteColor];
-		self.backgroundColor = [UIColor whiteColor];
-		self.songNameLabel.backgroundColor = [UIColor whiteColor];
-		self.positionLabel.backgroundColor = [UIColor whiteColor];
-		self.durationLabel.backgroundColor = [UIColor whiteColor];
-	}
-	else
-	{
-		coloredView.backgroundColor = [UIColor colorWithRed:0.9529f green:0.9529f blue:0.9529f alpha:1.0f];
-		self.backgroundColor = [UIColor colorWithRed:0.9529f green:0.9529f blue:0.9529f alpha:1.0f];
-		self.songNameLabel.backgroundColor = [UIColor colorWithRed:0.9529f green:0.9529f blue:0.9529f alpha:1.0f];
-		self.positionLabel.backgroundColor = [UIColor colorWithRed:0.9529f green:0.9529f blue:0.9529f alpha:1.0f];
-		self.durationLabel.backgroundColor = [UIColor colorWithRed:0.9529f green:0.9529f blue:0.9529f alpha:1.0f];
-	}
+    [self.contentView addSubview:songUITableView];
 }
 
 - (void)dealloc
 {
-    [cacheButton release];
-    [spinner release];
-	[durationLabel release];
-	[songNameLabel release];
-	[positionLabel release];
     [super dealloc];
 }
 

=== added file 'controls/UOPullGestureRecognizer.h'
--- controls/UOPullGestureRecognizer.h	1970-01-01 00:00:00 +0000
+++ controls/UOPullGestureRecognizer.h	2012-07-24 05:24:19 +0000
@@ -0,0 +1,20 @@
+//
+//  UOPullGestureRecognizer.h
+//  U1Music
+//
+//  Created by Paul Hummer on 7/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UOPullGestureRecognizer : UIPanGestureRecognizer {
+    CGPoint inceptionPoint;
+}
+@property UISwipeGestureRecognizerDirection direction;
+@property BOOL firesActionOnThresholdReached;
+@property CGFloat actionThreshold;
+@property CGRect activationRegion;
+
+//@property(nonatomic,readwrite) UIGestureRecognizerState state;
+@end

=== added file 'controls/UOPullGestureRecognizer.m'
--- controls/UOPullGestureRecognizer.m	1970-01-01 00:00:00 +0000
+++ controls/UOPullGestureRecognizer.m	2012-07-24 05:24:19 +0000
@@ -0,0 +1,77 @@
+//
+//  UOPullGestureRecognizer.m
+//  U1Music
+//
+//  Created by Paul Hummer on 7/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIGestureRecognizerSubclass.h>
+#import "UOPullGestureRecognizer.h"
+
+@implementation UOPullGestureRecognizer
+@synthesize direction;
+@synthesize firesActionOnThresholdReached;
+@synthesize actionThreshold;
+@synthesize activationRegion;
+
+- (id)initWithTarget:(id)target action:(SEL)action {
+    self = [super initWithTarget:target action:action];
+    if (self != nil) {
+        actionThreshold = 64.f;
+    }
+    return self;
+}
+
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
+    NSParameterAssert([touches count] == 1);
+    
+    CGPoint touchPoint = [[touches anyObject] locationInView:self.view];
+	if (!CGRectEqualToRect(activationRegion, CGRectZero)) {
+		if (!CGRectContainsPoint(activationRegion, touchPoint))	{
+            self.state = UIGestureRecognizerStateCancelled;
+			return;
+		}
+	}
+	
+	[super touchesBegan:touches withEvent:event];
+	inceptionPoint = [[touches anyObject] locationInView:nil];
+}
+
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
+    for (UITouch *touch in touches) {
+        CGPoint currentPoint = [touch locationInView:nil];
+		CGFloat offset = currentPoint.x - inceptionPoint.x;
+		if ((offset < 0 && direction == UISwipeGestureRecognizerDirectionRight) ||
+			(offset > 0 && direction == UISwipeGestureRecognizerDirectionLeft)) {
+            /* Pull cancelled */
+			self.state = UIGestureRecognizerStateCancelled;
+			return;
+		}
+		
+		if (fabs(offset) > actionThreshold && self.firesActionOnThresholdReached) {
+            /* Pull completed */
+			self.state = UIGestureRecognizerStateEnded;
+		}
+    }
+    [super touchesMoved:touches withEvent:event];
+}
+
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
+	// still passed the activation threshold?
+	
+	CGPoint currentPoint = [[touches anyObject] locationInView:nil];
+	CGFloat offset = currentPoint.x - inceptionPoint.x;
+    
+	if (fabs(offset) > actionThreshold && !self.firesActionOnThresholdReached)	{
+		NSLog(@"DO THE THING!");
+		[super touchesEnded:touches withEvent:event];
+	}
+	else
+	{
+		self.state = UIGestureRecognizerStateCancelled;
+	}
+}
+
+
+@end

=== added file 'images/download-grey.png'
Binary files images/download-grey.png	1970-01-01 00:00:00 +0000 and images/download-grey.png	2012-07-24 05:24:19 +0000 differ
=== added file 'images/[e-mail]'
Binary files images/[e-mail]	1970-01-01 00:00:00 +0000 and images/[e-mail]	2012-07-24 05:24:19 +0000 differ
=== added file 'images/download.png'
Binary files images/download.png	1970-01-01 00:00:00 +0000 and images/download.png	2012-07-24 05:24:19 +0000 differ
=== added file 'images/[e-mail]'
Binary files images/[e-mail]	1970-01-01 00:00:00 +0000 and images/[e-mail]	2012-07-24 05:24:19 +0000 differ
=== added file 'images/grabber.png'
Binary files images/grabber.png	1970-01-01 00:00:00 +0000 and images/grabber.png	2012-07-24 05:24:19 +0000 differ
=== added file 'images/[e-mail]'
Binary files images/[e-mail]	1970-01-01 00:00:00 +0000 and images/[e-mail]	2012-07-24 05:24:19 +0000 differ
=== modified file 'view_controllers/AlbumViewController.h'
--- view_controllers/AlbumViewController.h	2011-06-07 09:20:03 +0000
+++ view_controllers/AlbumViewController.h	2012-07-24 05:24:19 +0000
@@ -18,12 +18,13 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import <UIKit/UIKit.h>
+#import "SongUITableView.h"
 #import "SubsonicTableViewController.h"
 #import "AlbumArtLoader.h"
 
 @class Artist, Album;
 
-@interface AlbumViewController : SubsonicTableViewController <AlbumArtLoaderDelegate>
+@interface AlbumViewController : SubsonicTableViewController <AlbumArtLoaderDelegate,SongUITableViewDelegate>
 {
     AlbumArtLoader *loader;
 	UIView *headerView;
@@ -38,7 +39,6 @@
 @property(nonatomic,retain) NSMutableArray *songs;
 @property(nonatomic,retain) NSString *artist;
 @property(nonatomic,retain) Album *album;
-@property(nonatomic,retain) UIButton *cacheButton;
 
 extern NSString * const NOTIF_downloadComplete;
 extern NSString * const NOTIF_removeCachedContent;

=== modified file 'view_controllers/AlbumViewController.m'
--- view_controllers/AlbumViewController.m	2012-06-22 17:56:56 +0000
+++ view_controllers/AlbumViewController.m	2012-07-24 05:24:19 +0000
@@ -23,6 +23,7 @@
 #import "AlbumParser.h"
 #import "Album.h"
 #import "Song.h"
+#import "SongUITableView.h"
 #import "SongUITableViewCell.h"
 #import "NSDate+Extras.h"
 #import "StreamingPlayer.h"
@@ -41,7 +42,7 @@
 @end
 
 @implementation AlbumViewController
-@synthesize artist, album, songs, cacheButton;
+@synthesize artist, album, songs;
 
 - (id)initWithStyle:(UITableViewStyle)aStyle
 {
@@ -83,7 +84,8 @@
 	@synchronized(self.songs)
 	{
 		[self.songs removeAllObjects];
-		[PerThreadManagedObjectContext() refreshObject:self.album mergeChanges:YES]; //force the album to reload its set of songs from the persistent store.
+        //force the album to reload its set of songs from the persistent store.
+		[PerThreadManagedObjectContext() refreshObject:self.album mergeChanges:YES]; 
 		[self.songs addObjectsFromArray:[self.album.songs allObjects]];
 		[self.songs sortUsingSelector:@selector(compare:)];
 	}
@@ -135,11 +137,15 @@
 	if (nil == cell)
 	{
 		cell = [[[SongUITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:SongCellIdentifier] autorelease];
+        cell.songUITableView.delegate = self;
 	}
 	[self configureCell:cell forSongAtIndexPath:indexPath];
 	return cell;
 }
 
+- (void)viewDidBeginTouchGesture:(SongUITableView*)view {
+	// Stub for when we have a middle view.
+}
 
 #pragma mark -
 #pragma mark Table view delegate
@@ -209,82 +215,14 @@
 	}
 }
 
-@end
-
-@implementation AlbumViewController (Private)
-
-- (void)configureCell:(SongUITableViewCell*)cell forSongAtIndexPath:(NSIndexPath*)indexPath
-{
-	Song *song = [self.songs objectAtIndex:indexPath.row];
-	
-    // explicitly re-set the default state of the button/spinner
-    [cell.cacheButton setImage:(canCache ? [UIImage imageNamed:@"uncached"] : [UIImage imageNamed:@"uncached-disabled"]) forState:UIControlStateNormal];
-    [cell.spinner stopAnimating];
-    
-    cell.cacheButton.tag = indexPath.row;
-    [cell.cacheButton addTarget:self action:@selector(toggleCacheForSong:) forControlEvents:UIControlEventTouchUpInside];
-    
-	U1CacheFileManager *cacheFileManager = [U1CacheFileManager sharedCacheFileManager];
-	BOOL offline = NO;
-	NSString *cachedPath = [cacheFileManager cachedPathForFileId:song.idPath offline:&offline];
-
-    if ([[Downloader sharedDownloader] isDownloading:song.idPath] && offline)
-    {
-        [cell.spinner startAnimating];
-    }
-    else if (offline)
-    {
-        [cell.cacheButton setImage:[UIImage imageNamed:@"cached"] forState:UIControlStateNormal];
-    }
-    
-	cell.songNameLabel.text = song.title;
-	
-	cell.positionLabel.text = [NSString stringWithFormat:@"%@", [song.track intValue] > 0 ? [song.track stringValue] : @""];
-	
-	if (song.duration && [song.duration intValue] > 0)
-	{
-		cell.durationLabel.text = [NSDate stringFromDuration:song.duration];
-	}
-	else
-	{
-		cell.durationLabel.text = @"";
-	}
-	
-	if ([StreamingPlayer sharedStreamingPlayer].currentSong && [song.songId isEqual:[StreamingPlayer sharedStreamingPlayer].currentSong.songId])
-	{
-		cell.nowPlaying.hidden = NO;
-	}
-	else
-	{
-		cell.nowPlaying.hidden = YES;
-	}
-
-	[cell.cacheButton setHidden:!canStream];
-
-	cell.evenRow = (0 == indexPath.row % 2);
-	if (cachedPath == nil && !canStream)
-	{
-		cell.songNameLabel.textColor = [UIColor lightGrayColor];
-		cell.positionLabel.textColor = [UIColor lightGrayColor];
-		cell.durationLabel.textColor = [UIColor lightGrayColor];
-	}
-	else
-	{
-		cell.songNameLabel.textColor = [UIColor blackColor];
-		cell.positionLabel.textColor = [UIColor blackColor];
-		cell.durationLabel.textColor = [UIColor blackColor];
-	}
-}
-
-- (void)toggleCacheForSong:(id)sender
-{
+-(void)viewDidEndPullRightGesture:(SongUITableView *)view {
     // This is a binary toggle, and right now, we don't bother trying to cancel a download in progress.
-    int row = [(UIButton *)sender tag];
-
+    int row = [(UIButton *)view tag];
+    
 	NSIndexPath *songPath = [NSIndexPath indexPathForRow:row inSection:0];
     SongUITableViewCell *cell = (SongUITableViewCell *)[self.tableView cellForRowAtIndexPath:songPath];
     Song *song = [self.songs objectAtIndex:row];
-
+    
     if (![[Downloader sharedDownloader] isDownloading:song.idPath])
         // If we're downloading at all, don't do anything.
     {
@@ -295,26 +233,22 @@
         {
 			[cacheFileManager toggleOfflineStatusForFileId:song.idPath];
 			
-            [cell.spinner stopAnimating];
             [[NSNotificationCenter defaultCenter] postNotificationName:NOTIF_removeCachedContent object:nil];
-            [cell.cacheButton setImage:[UIImage imageNamed:@"uncached"] forState:UIControlStateNormal];
+            [cell.songUITableView setCached:NO];
         }
         else if (cachedPath && !offline)
 		{
 			[cacheFileManager toggleOfflineStatusForFileId:song.idPath];
-			[cell.spinner stopAnimating];
-			[cell.cacheButton setImage:[UIImage imageNamed:@"cached"] forState:UIControlStateNormal];
+            [cell.songUITableView setCached:YES];
 		}
 		else
         {
 			if (canCache)
 			{
-				[cell.spinner startAnimating];
 				[[Downloader sharedDownloader] downloadFile:[[Subsonic sharedSubsonic] getStreamingURLForSongId:song.songId] withName:song.idPath forOffline:YES completionBlock:^(NSString *path) {
 					dispatch_async(dispatch_get_main_queue(), ^(void) {
 						SongUITableViewCell *cell = (SongUITableViewCell *)[self.tableView cellForRowAtIndexPath:songPath];
-						[cell.spinner stopAnimating];
-						[cell.cacheButton setImage:[UIImage imageNamed:@"cached"] forState:UIControlStateNormal];
+                        [cell.songUITableView setCached:YES];
 					});
 				}];
 			}
@@ -325,14 +259,14 @@
 				{
 					RIButtonItem *cancelButton = [RIButtonItem item];
 					cancelButton.label = NSLocalizedString(@"Remind Me", @"");
-
+                    
 					RIButtonItem *dismissButton = [RIButtonItem item];
 					dismissButton.label = NSLocalizedString(@"Dismiss", @"");
 					dismissButton.action = ^
 					{
 						[defaults setBool:YES forKey:@"acknowledged-no-cache-on-3g"];
 					};
-
+                    
 					UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Downloading Disabled", @"")
 																		message:NSLocalizedString(@"Downloading songs for offline use can only be done on WiFi networks.", @"")
 															   cancelButtonItem:cancelButton otherButtonItems:dismissButton, nil];
@@ -344,6 +278,49 @@
     }
 }
 
+@end
+
+@implementation AlbumViewController (Private)
+
+-(void)toggleCacheForSong:(id)sender {
+    
+}
+
+- (void)configureCell:(SongUITableViewCell*)cell forSongAtIndexPath:(NSIndexPath*)indexPath
+{
+	Song *song = [self.songs objectAtIndex:indexPath.row];
+    
+    [cell.songUITableView setCached:NO];
+    cell.songUITableView.nowPlaying.hidden = YES;
+    cell.songUITableView.songNameLabel.text = @"";
+    
+    cell.songUITableView.tag = indexPath.row;
+    
+	U1CacheFileManager *cacheFileManager = [U1CacheFileManager sharedCacheFileManager];
+	BOOL offline = NO;
+	NSString *cachedPath = [cacheFileManager cachedPathForFileId:song.idPath offline:&offline];
+
+    if ([[Downloader sharedDownloader] isDownloading:song.idPath] && offline) {
+        /* TODO: We need to implement the progress bar */
+    } else if (offline) {
+        [cell.songUITableView setCached:YES];
+    }
+    
+    cell.songUITableView.songNameLabel.text = song.title;
+	
+	if ([StreamingPlayer sharedStreamingPlayer].currentSong && [song.songId isEqual:[StreamingPlayer sharedStreamingPlayer].currentSong.songId]) {
+        cell.songUITableView.nowPlaying.hidden = NO;
+	} else {
+        cell.songUITableView.nowPlaying.hidden = YES;
+	}
+
+	if (cachedPath == nil && !canStream) {
+		cell.songUITableView.songNameLabel.textColor = [UIColor lightGrayColor];
+	} else {
+		cell.songUITableView.songNameLabel.textColor = [UIColor blackColor];
+	}
+}
+
 - (void)toggleCacheForAlbum:(id)sender
 {
     
@@ -393,16 +370,6 @@
 	[headerView addSubview:albumLabel];
 	
 	albumLabel.text = self.album.title;
-	
-    /* Not yet
-    cacheButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    cacheButton.frame = CGRectMake(268, 76, 44, 44);
-    // If none of the songs are cached, it should use uncached.png
-    // If some of the songs are cached, it should use partiallycached.png
-    // If all of the songs are cachced, it should use cached.png
-    [cacheButton setImage:[UIImage imageNamed:@"uncached"] forState:UIControlStateNormal];
-    [headerView addSubview:cacheButton];
-     */
     
 	self.tableView.tableHeaderView = headerView;
 	
@@ -415,5 +382,4 @@
 	[self.tableView.tableFooterView addSubview:bigFooterView];
 	[bigFooterView release];
 }
-
 @end

=== modified file 'view_controllers/PlaylistEditAlbumViewController.m'
--- view_controllers/PlaylistEditAlbumViewController.m	2011-06-23 13:54:49 +0000
+++ view_controllers/PlaylistEditAlbumViewController.m	2012-07-24 05:24:19 +0000
@@ -67,28 +67,15 @@
 
 	Song *song = [self.songs objectAtIndex:indexPath.row];
 	
-	cell.songNameLabel.text = song.title;
+	cell.songUITableView.songNameLabel.text = song.title;
 	
-	cell.positionLabel.text = [NSString stringWithFormat:@"%@", [song.track intValue] > 0 ? [song.track stringValue] : @""];
-
-	if (song.duration && [song.duration intValue] > 0)
-	{
-		cell.durationLabel.text = [NSDate stringFromDuration:song.duration];
-	}
-	else
-	{
-		cell.durationLabel.text = @"";
-	}
-
-    cell.nowPlaying.hidden = YES;
+    cell.songUITableView.nowPlaying.hidden = YES;
 	
     if ([self.originator.playlist.songs containsObject:song])
     {
         cell.accessoryType = UITableViewCellAccessoryCheckmark;
     }
 	
-    cell.evenRow = (0 == indexPath.row % 2);
-	
 	return cell;
 }