Merge lp:~rockstar/ubuntuone-ios-music/polish-list-views into lp:ubuntuone-ios-music

[Paul Hummer]

Polish the list views

I just did a bunch of tweaks that make things more presentable on the list views and such. I changed the font to be more in line with what design had envisioned in the original settings view (and the new settings view followed suit), and made things a bit more pixel lined up (using Xcode's guides).

I also fixed a bug where you'd navigate from an artist, to a various artist album and the album listing shows all the songs, rather than filtered down to only the artist's songs on that album.

[Mike McCracken (mikemc)]

Separate changes I see in here that could have been multiple branches:
- adding SSPullToRefresh
- songsForArtistID bug fix
- songlistcell art downloading

1. The license for sspulltorefresh probably needs to be included:
https://github.com/soffes/sspulltorefresh/blob/master/LICENSE

1a. Do we need the GPL on each of the source files? That's what we do
in the python apps...

2. Do we localize this app? The hard-coded english pluralization made
me wonder.

3. In SongListCell.m, should the downloader completionBlock also set
song.art? Otherwise it looks like we'll be downloading it every time
it shows up...

review: Needs Information

[lp:~rockstar/ubuntuone-ios-music/polish-list-views]

288. By Paul Hummer on 2013-02-09

Merge from previous pipe

289. By Paul Hummer on 2013-02-09

Merged replace-streaming-player into polish-list-views.

290. By Paul Hummer on 2013-02-09

Merged replace-streaming-player into polish-list-views.

291. By Paul Hummer on 2013-02-11

Reset the detailTextLabel

292. By Paul Hummer on 2013-02-11

Add SSPullToRefresh LICENSE

[Paul Hummer (rockstar)]

With small changes, I don't see any problem in putting those changes in the same branch.

(1) Added LICENSE
(1a) I'll add the GPL headers to files prior to release. I'm trying to keep the diff size down, especially with stuff that is not needed in code review.
(2) We aren't currently focused on localization in any of the Ubuntu One properties. It might be nice in the future, but not now.
(3) art is actually a method that checks the filesystem for the file itself, so it won't get downloaded again. There is a chance that it'll get downloaded and re-written, but that's super unlikely at this point, and there are bigger problems with the album art (like storing multiple copies of the default album art...) At some point, I'll make the downloader smarter, and not queue a download if it already is queued.

[Mike McCracken (mikemc)]

I won't fight you on branch size - I'll just explain my bias toward branches as small as possible.
On the desktop projects, we've tried pretty hard to make separate branches out of separate changes, and I've noticed that they're easier to review, issues with one change don't block landing other changes, and when doing bzr-blame log searching while fixing bugs, big multi-feature branches make tracing and understanding historical changes harder.

We also had a size guideline at one point: we decided to try to keep branches ~500 lines or less, even to the point of committing half of a feature in one branch and the other half in another. I thought that extreme was overkill (obviously e.g. adding a framework with headers is going to be big), and the specific number that makes sense will be different for different languages, but 500 seemed like a good rule of thumb.

Thanks for taking the time to write a detailed reply, too. I appreciate it.

review: Approve

=== added directory 'Dependencies/SSPullToRefresh'
=== added file 'Dependencies/SSPullToRefresh/LICENSE'
--- Dependencies/SSPullToRefresh/LICENSE	1970-01-01 00:00:00 +0000
+++ Dependencies/SSPullToRefresh/LICENSE	2013-02-11 04:30:25 +0000
@@ -0,0 +1,20 @@
+Copyright (c) 2012 Sam Soffes
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

=== added file 'Dependencies/SSPullToRefresh/SSPullToRefresh.h'
--- Dependencies/SSPullToRefresh/SSPullToRefresh.h	1970-01-01 00:00:00 +0000
+++ Dependencies/SSPullToRefresh/SSPullToRefresh.h	2013-02-11 04:30:25 +0000
@@ -0,0 +1,16 @@
+//
+//  SSPullToRefresh.h
+//  SSPullToRefresh
+//
+//  Created by Sam Soffes on 4/9/12.
+//  Copyright (c) 2012 Sam Soffes. All rights reserved.
+//
+
+// Main pull to refresh view. This class contains all of the pulling logic.
+#import "SSPullToRefreshView.h"
+
+// Default content view. Similar to Facebook.
+#import "SSPullToRefreshDefaultContentView.h"
+
+// Simple content view. Similar to Path.
+#import "SSPullToRefreshSimpleContentView.h"

=== added file 'Dependencies/SSPullToRefresh/SSPullToRefreshDefaultContentView.h'
--- Dependencies/SSPullToRefresh/SSPullToRefreshDefaultContentView.h	1970-01-01 00:00:00 +0000
+++ Dependencies/SSPullToRefresh/SSPullToRefreshDefaultContentView.h	2013-02-11 04:30:25 +0000
@@ -0,0 +1,17 @@
+//
+//  SSPullToRefreshDefaultContentView
+//  SSPullToRefresh
+//
+//  Created by Sam Soffes on 4/9/12.
+//  Copyright (c) 2012 Sam Soffes. All rights reserved.
+//
+
+#import "SSPullToRefreshView.h"
+
+@interface SSPullToRefreshDefaultContentView : UIView <SSPullToRefreshContentView>
+
+@property (nonatomic, strong, readonly) UILabel *statusLabel;
+@property (nonatomic, strong, readonly) UILabel *lastUpdatedAtLabel;
+@property (nonatomic, strong, readonly) UIActivityIndicatorView *activityIndicatorView;
+
+@end

=== added file 'Dependencies/SSPullToRefresh/SSPullToRefreshDefaultContentView.m'
--- Dependencies/SSPullToRefresh/SSPullToRefreshDefaultContentView.m	1970-01-01 00:00:00 +0000
+++ Dependencies/SSPullToRefresh/SSPullToRefreshDefaultContentView.m	2013-02-11 04:30:25 +0000
@@ -0,0 +1,86 @@
+//
+//  SSPullToRefreshDefaultContentView
+//  SSPullToRefresh
+//
+//  Created by Sam Soffes on 4/9/12.
+//  Copyright (c) 2012 Sam Soffes. All rights reserved.
+//
+
+#import "SSPullToRefreshDefaultContentView.h"
+
+@implementation SSPullToRefreshDefaultContentView
+
+@synthesize statusLabel = _statusLabel;
+@synthesize lastUpdatedAtLabel = _lastUpdatedAtLabel;
+@synthesize activityIndicatorView = _activityIndicatorView;
+
+#pragma mark - UIView
+
+- (id)initWithFrame:(CGRect)frame {
+	if ((self = [super initWithFrame:frame])) {
+		CGFloat width = self.bounds.size.width;
+		
+		_statusLabel = [[UILabel alloc] initWithFrame:CGRectMake(0.0f, 14.0f, width, 20.0f)];
+		_statusLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+		_statusLabel.font = [UIFont boldSystemFontOfSize:14.0f];
+		_statusLabel.textColor = [UIColor blackColor];
+		_statusLabel.backgroundColor = [UIColor clearColor];
+		_statusLabel.textAlignment = UITextAlignmentCenter;
+		[self addSubview:_statusLabel];
+		
+		_lastUpdatedAtLabel = [[UILabel alloc] initWithFrame:CGRectMake(0.0f, 34.0f, width, 20.0f)];
+		_lastUpdatedAtLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+		_lastUpdatedAtLabel.font = [UIFont systemFontOfSize:12.0f];
+		_lastUpdatedAtLabel.textColor = [UIColor lightGrayColor];
+		_lastUpdatedAtLabel.backgroundColor = [UIColor clearColor];
+		_lastUpdatedAtLabel.textAlignment = UITextAlignmentCenter;
+		[self addSubview:_lastUpdatedAtLabel];
+		
+        _activityIndicatorView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
+		_activityIndicatorView.frame = CGRectMake(30.0f, 25.0f, 20.0f, 20.0f);
+		[self addSubview:_activityIndicatorView];
+	}
+	return self;
+}
+
+
+#pragma mark - SSPullToRefreshContentView
+
+- (void)setState:(SSPullToRefreshViewState)state withPullToRefreshView:(SSPullToRefreshView *)view {	
+	switch (state) {
+		case SSPullToRefreshViewStateReady: {
+			_statusLabel.text = @"Release to refresh...";
+			[_activityIndicatorView stopAnimating];
+			break;
+		}
+			
+		case SSPullToRefreshViewStateNormal: {
+			_statusLabel.text = @"Pull down to refresh...";
+			[_activityIndicatorView stopAnimating];
+			break;
+		}
+		
+		case SSPullToRefreshViewStateLoading:
+		case SSPullToRefreshViewStateClosing: {
+			_statusLabel.text = @"Loading...";
+			[_activityIndicatorView startAnimating];
+			break;
+		}
+	}
+}
+
+
+- (void)setLastUpdatedAt:(NSDate *)date withPullToRefreshView:(SSPullToRefreshView *)view {
+	static NSDateFormatter *dateFormatter = nil;
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		dateFormatter = [[NSDateFormatter alloc] init];
+        dateFormatter.formatterBehavior = NSDateFormatterBehavior10_4;
+        dateFormatter.dateStyle = NSDateFormatterLongStyle;
+        dateFormatter.timeStyle = NSDateFormatterShortStyle;
+	});
+
+	_lastUpdatedAtLabel.text = [NSString stringWithFormat:@"Last Updated: %@", [dateFormatter stringForObjectValue:date]];
+}
+
+@end

=== added file 'Dependencies/SSPullToRefresh/SSPullToRefreshSimpleContentView.h'
--- Dependencies/SSPullToRefresh/SSPullToRefreshSimpleContentView.h	1970-01-01 00:00:00 +0000
+++ Dependencies/SSPullToRefresh/SSPullToRefreshSimpleContentView.h	2013-02-11 04:30:25 +0000
@@ -0,0 +1,16 @@
+//
+//  SSPullToRefreshSimpleContentView.h
+//  SSPullToRefresh
+//
+//  Created by Sam Soffes on 5/17/12.
+//  Copyright (c) 2012 Sam Soffes. All rights reserved.
+//
+
+#import "SSPullToRefreshView.h"
+
+@interface SSPullToRefreshSimpleContentView : UIView <SSPullToRefreshContentView>
+
+@property (nonatomic, strong, readonly) UILabel *statusLabel;
+@property (nonatomic, strong, readonly) UIActivityIndicatorView *activityIndicatorView;
+
+@end

=== added file 'Dependencies/SSPullToRefresh/SSPullToRefreshSimpleContentView.m'
--- Dependencies/SSPullToRefresh/SSPullToRefreshSimpleContentView.m	1970-01-01 00:00:00 +0000
+++ Dependencies/SSPullToRefresh/SSPullToRefreshSimpleContentView.m	2013-02-11 04:30:25 +0000
@@ -0,0 +1,80 @@
+//
+//  SSPullToRefreshSimpleContentView.m
+//  SSPullToRefresh
+//
+//  Created by Sam Soffes on 5/17/12.
+//  Copyright (c) 2012 Sam Soffes. All rights reserved.
+//
+
+#import "SSPullToRefreshSimpleContentView.h"
+
+@implementation SSPullToRefreshSimpleContentView
+
+@synthesize statusLabel = _statusLabel;
+@synthesize activityIndicatorView = _activityIndicatorView;
+
+
+#pragma mark - UIView
+
+- (id)initWithFrame:(CGRect)frame {
+	if ((self = [super initWithFrame:frame])) {
+		CGFloat width = self.bounds.size.width;
+		
+		_statusLabel = [[UILabel alloc] initWithFrame:CGRectMake(0.0f, 14.0f, width, 20.0f)];
+		_statusLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+		_statusLabel.font = [UIFont boldSystemFontOfSize:14.0f];
+		_statusLabel.textColor = [UIColor blackColor];
+		_statusLabel.backgroundColor = [UIColor clearColor];
+		_statusLabel.textAlignment = UITextAlignmentCenter;
+		[self addSubview:_statusLabel];
+		
+		_activityIndicatorView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
+		_activityIndicatorView.frame = CGRectMake(30.0f, 25.0f, 20.0f, 20.0f);
+		[self addSubview:_activityIndicatorView];
+	}
+	return self;
+}
+
+
+- (void)layoutSubviews {
+	CGSize size = self.bounds.size;
+	self.statusLabel.frame = CGRectMake(20.0f, roundf((size.height - 30.0f) / 2.0f), size.width - 40.0f, 30.0f);
+	self.activityIndicatorView.frame = CGRectMake(roundf((size.width - 20.0f) / 2.0f), roundf((size.height - 20.0f) / 2.0f), 20.0f, 20.0f);
+}
+
+
+#pragma mark - SSPullToRefreshContentView
+
+- (void)setState:(SSPullToRefreshViewState)state withPullToRefreshView:(SSPullToRefreshView *)view {	
+	switch (state) {
+		case SSPullToRefreshViewStateReady: {
+			self.statusLabel.text = @"Release to refresh";
+			[self.activityIndicatorView startAnimating];
+			self.activityIndicatorView.alpha = 0.0f;
+			break;
+		}
+			
+		case SSPullToRefreshViewStateNormal: {
+			self.statusLabel.text = @"Pull down to refresh";
+			self.statusLabel.alpha = 1.0f;
+			[self.activityIndicatorView stopAnimating];
+			self.activityIndicatorView.alpha = 0.0f;
+			break;
+		}
+			
+		case SSPullToRefreshViewStateLoading: {
+			self.statusLabel.alpha = 0.0f;
+			[self.activityIndicatorView startAnimating];
+			self.activityIndicatorView.alpha = 1.0f;
+			break;
+		}
+			
+		case SSPullToRefreshViewStateClosing: {
+			self.statusLabel.text = nil;
+			self.activityIndicatorView.alpha = 0.0f;
+			break;
+		}
+	}
+}
+
+@end

=== added file 'Dependencies/SSPullToRefresh/SSPullToRefreshView.h'
--- Dependencies/SSPullToRefresh/SSPullToRefreshView.h	1970-01-01 00:00:00 +0000
+++ Dependencies/SSPullToRefresh/SSPullToRefreshView.h	2013-02-11 04:30:25 +0000
@@ -0,0 +1,205 @@
+//
+//  SSPullToRefreshView.h
+//  SSPullToRefresh
+//
+//  Created by Sam Soffes on 4/9/12.
+//  Copyright (c) 2012 Sam Soffes. All rights reserved.
+//
+
+//
+// Example usage:
+// 
+// - (void)viewDidLoad {
+//    [super viewDidLoad];
+//    self.pullToRefreshView = [[SSPullToRefreshView alloc] initWithScrollView:self.tableView delegate:self];
+// }
+// 
+// - (void)viewDidUnload {
+//    [super viewDidUnload];
+//    self.pullToRefreshView = nil;
+// }
+// 
+// - (void)refresh {
+//    [self.pullToRefreshView startLoading];
+//    // Load data...
+//    [self.pullToRefreshView finishLoading];
+// }
+// 
+// - (void)pullToRefreshViewDidStartLoading:(SSPullToRefreshView *)view {
+//    [self refresh];
+// }
+//
+
+typedef enum {
+	/// Most will say "Pull to refresh" in this state
+	SSPullToRefreshViewStateNormal,
+
+	/// Most will say "Release to refresh" in this state
+	SSPullToRefreshViewStateReady,
+
+	/// The view is loading
+	SSPullToRefreshViewStateLoading,
+
+	/// The view has finished loading and is animating
+	SSPullToRefreshViewStateClosing
+} SSPullToRefreshViewState;
+
+@protocol SSPullToRefreshViewDelegate;
+@protocol SSPullToRefreshContentView;
+
+@interface SSPullToRefreshView : UIView
+
+/**
+ The content view displayed when the `scrollView` is pulled down. By default this is an instance of `SSPullToRefreshDefaultContentView`.
+ 
+ @see SSPullToRefreshContentView
+ */
+@property (nonatomic, strong) UIView<SSPullToRefreshContentView> *contentView;
+
+/**
+ If you need to update the scroll view's content inset while it contains a pull to refresh view, you should set the
+ `defaultContentInset` on the pull to refresh view and it will forward it to the scroll view taking into account the
+ pull to refresh view's position.
+ */
+@property (nonatomic, assign) UIEdgeInsets defaultContentInset;
+
+/**
+ The height of the fully expanded content view. The default is `70.0`.
+ 
+ The `contentView`'s `sizeThatFits:` will be respected when displayed but does not effect the expanded height. You can use this
+ to draw outside of the expanded area. If you don't implement `sizeThatFits:` it will automatically display at the default size.
+ 
+ @see expanded
+ */
+@property (nonatomic, assign) CGFloat expandedHeight;
+
+/**
+ A boolean indicating if the pull to refresh view is expanded.
+ 
+ @see expandedHeight
+ @see startLoadingAndExpand:
+ */
+@property (nonatomic, assign, readonly, getter = isExpanded) BOOL expanded;
+
+/**
+ The scroll view containing the pull to refresh view. This is automatically set with `initWithScrollView:delegate:`.
+ 
+ @see initWithScrollView:delegate:
+ */
+@property (nonatomic, assign, readonly) UIScrollView *scrollView;
+
+/**
+ The delegate is sent messages when the pull to refresh view starts loading. This is automatically set with `initWithScrollView:delegate:`.
+ 
+ @see initWithScrollView:delegate:
+ @see SSPullToRefreshViewDelegate
+ */
+@property (nonatomic, weak) id<SSPullToRefreshViewDelegate> delegate;
+
+/**
+ The state of the pull to refresh view.
+ 
+ @see startLoading
+ @see startLoadingAndExpand:
+ @see finishLoading
+ @see SSPullToRefreshViewState
+ */
+@property (nonatomic, assign, readonly) SSPullToRefreshViewState state;
+
+/**
+ All you need to do to add this view to your scroll view is call this method (passing in the scroll view). That's it.
+ You don't have to add it as subview or anything else. The rest is magic.
+ 
+ You should only initalize with this method and never move it to another scroll view during its lifetime.
+ */
+- (id)initWithScrollView:(UIScrollView *)scrollView delegate:(id<SSPullToRefreshViewDelegate>)delegate;
+
+/**
+ Call this method when you start loading. If you trigger loading another way besides pulling to refresh, call this
+ method so the pull to refresh view will be in sync with the loading status. By default, it will not expand the view
+ so it loads quietly out of view.
+ */
+- (void)startLoading;
+
+/**
+ Call this method when you start loading. If you trigger loading another way besides pulling to refresh, call this
+ method so the pull to refresh view will be in sync with the loading status. You may pass YES for shouldExpand to
+ animate down the pull to refresh view to show that it's loading.
+ */
+- (void)startLoadingAndExpand:(BOOL)shouldExpand;
+/**
+ Call this method if you wish to control animating the expansion.
+ */
+- (void)startLoadingAndExpand:(BOOL)shouldExpand animated:(BOOL)animated;
+
+/**
+ Call this when you finish loading.
+ */
+- (void)finishLoading;
+
+/**
+ Manually update the last updated at time. This will automatically get called when the pull to refresh view finishes laoding.
+ */
+- (void)refreshLastUpdatedAt;
+
+@end
+
+
+@protocol SSPullToRefreshViewDelegate <NSObject>
+
+@optional
+
+/**
+ Return `NO` if the pull to refresh view should no start loading.
+ */
+- (BOOL)pullToRefreshViewShouldStartLoading:(SSPullToRefreshView *)view;
+
+/**
+ The pull to refresh view started loading. You should kick off whatever you need to load when this is called.
+ */
+- (void)pullToRefreshViewDidStartLoading:(SSPullToRefreshView *)view;
+
+/**
+ The pull to refresh view finished loading. This will get called when it receives `finishLoading`.
+ */
+- (void)pullToRefreshViewDidFinishLoading:(SSPullToRefreshView *)view;
+
+/**
+ The date when data was last updated. This will get called when it finishes loading or if it receives `refreshLastUpdatedAt`.
+ Some content views may display this date.
+ */
+- (NSDate *)pullToRefreshViewLastUpdatedAt:(SSPullToRefreshView *)view;
+
+/**
+ The pull to refresh view updated its scroll view's content inset
+ */
+- (void)pullToRefreshView:(SSPullToRefreshView *)view didUpdateContentInset:(UIEdgeInsets)contentInset;
+
+@end
+
+
+@protocol SSPullToRefreshContentView <NSObject>
+
+@required
+
+/**
+ The pull to refresh view's state has changed. The content view must update itself. All content view's must implement
+ this method.
+ */
+- (void)setState:(SSPullToRefreshViewState)state withPullToRefreshView:(SSPullToRefreshView *)view;
+
+@optional
+
+/**
+ The pull to refresh view will set send values from `0.0` to `1.0` as the user pulls down. `1.0` means it is fully expanded and
+ will change to the `SSPullToRefreshViewStateReady` state. You can use this value to draw the progress of the pull
+ (i.e. Tweetbot style).
+ */
+- (void)setPullProgress:(CGFloat)pullProgress;
+
+/**
+ The pull to refresh view updated its last updated date.
+ */
+- (void)setLastUpdatedAt:(NSDate *)date withPullToRefreshView:(SSPullToRefreshView *)view;
+
+@end

=== added file 'Dependencies/SSPullToRefresh/SSPullToRefreshView.m'
--- Dependencies/SSPullToRefresh/SSPullToRefreshView.m	1970-01-01 00:00:00 +0000
+++ Dependencies/SSPullToRefresh/SSPullToRefreshView.m	2013-02-11 04:30:25 +0000
@@ -0,0 +1,349 @@
+//
+//  SSPullToRefreshView.m
+//  SSPullToRefresh
+//
+//  Created by Sam Soffes on 4/9/12.
+//  Copyright (c) 2012 Sam Soffes. All rights reserved.
+//
+
+#import "SSPullToRefreshView.h"
+#import "SSPullToRefreshDefaultContentView.h"
+
+@interface SSPullToRefreshView ()
+@property (nonatomic, assign, readwrite) SSPullToRefreshViewState state;
+@property (nonatomic, assign, readwrite) UIScrollView *scrollView;
+@property (nonatomic, assign, readwrite, getter = isExpanded) BOOL expanded;
+- (void)_setContentInsetTop:(CGFloat)topInset;
+- (void)_setState:(SSPullToRefreshViewState)state animated:(BOOL)animated expanded:(BOOL)expanded completion:(void (^)(void))completion;
+- (void)_setPullProgress:(CGFloat)pullProgress;
+@end
+
+@implementation SSPullToRefreshView {
+	dispatch_semaphore_t _animationSemaphore;
+	CGFloat _topInset;
+}
+
+@synthesize delegate = _delegate;
+@synthesize scrollView = _scrollView;
+@synthesize expandedHeight = _expandedHeight;
+@synthesize contentView = _contentView;
+@synthesize state = _state;
+@synthesize expanded = _expanded;
+@synthesize defaultContentInset = _defaultContentInset;
+
+
+#pragma mark - Accessors
+
+- (void)setState:(SSPullToRefreshViewState)state {
+	BOOL wasLoading = _state == SSPullToRefreshViewStateLoading;
+    _state = state;
+	
+	// Forward to content view
+	[self.contentView setState:_state withPullToRefreshView:self];
+	
+	// Update delegate
+	if (wasLoading && _state != SSPullToRefreshViewStateLoading) {
+		if ([_delegate respondsToSelector:@selector(pullToRefreshViewDidFinishLoading:)]) {
+			[_delegate pullToRefreshViewDidFinishLoading:self];
+		}
+	} else if (!wasLoading && _state == SSPullToRefreshViewStateLoading) {
+		[self _setPullProgress:1.0f];
+		if ([_delegate respondsToSelector:@selector(pullToRefreshViewDidStartLoading:)]) {
+			[_delegate pullToRefreshViewDidStartLoading:self];
+		}
+	}
+}
+
+
+- (void)setExpanded:(BOOL)expanded {
+	_expanded = expanded;
+	[self _setContentInsetTop:expanded ? self.expandedHeight : 0.0f];
+}
+
+
+- (void)setScrollView:(UIScrollView *)scrollView {
+	void *context = (__bridge void *)self;
+	if ([_scrollView respondsToSelector:@selector(removeObserver:forKeyPath:context:)]) {
+		[_scrollView removeObserver:self forKeyPath:@"contentOffset" context:context];
+	} else if (_scrollView) {
+		[_scrollView removeObserver:self forKeyPath:@"contentOffset"];
+	}
+	
+	_scrollView = scrollView;	
+	_defaultContentInset = _scrollView.contentInset;
+	[_scrollView addObserver:self forKeyPath:@"contentOffset" options:NSKeyValueObservingOptionNew context:context];
+}
+
+
+- (UIView<SSPullToRefreshContentView> *)contentView {
+	// Use the simple content view as the default
+	if (!_contentView) {
+		self.contentView = [[SSPullToRefreshDefaultContentView alloc] initWithFrame:CGRectZero];
+	}
+	return _contentView;
+}
+
+
+- (void)setContentView:(UIView<SSPullToRefreshContentView> *)contentView {
+	[_contentView removeFromSuperview];
+	_contentView = contentView;
+	
+	_contentView.autoresizingMask = UIViewAutoresizingNone;
+	[_contentView setState:_state withPullToRefreshView:self];
+	[self refreshLastUpdatedAt];
+	[self addSubview:_contentView];
+}
+
+
+- (void)setDefaultContentInset:(UIEdgeInsets)defaultContentInset {
+	_defaultContentInset = defaultContentInset;
+	[self _setContentInsetTop:_topInset];
+}
+
+
+#pragma mark - NSObject
+
+- (void)dealloc {
+	self.scrollView = nil;
+	self.delegate = nil;
+#if !OS_OBJECT_USE_OBJC
+	dispatch_release(_animationSemaphore);
+#endif
+}
+
+
+#pragma mark - UIView
+
+- (void)removeFromSuperview {
+	self.scrollView = nil;
+	[super removeFromSuperview];
+}
+
+
+- (void)layoutSubviews {
+	CGSize size = self.bounds.size;
+	CGSize contentSize = [self.contentView sizeThatFits:size];
+
+	if (contentSize.width < size.width) {
+		contentSize.width = size.width;
+	}
+
+	if (contentSize.height < _expandedHeight) {
+		contentSize.height = _expandedHeight;
+	}
+
+	self.contentView.frame = CGRectMake(roundf((size.width - contentSize.width) / 2.0f), size.height - contentSize.height, contentSize.width, contentSize.height);
+}
+
+
+#pragma mark - Initializer
+
+- (id)initWithScrollView:(UIScrollView *)scrollView delegate:(id<SSPullToRefreshViewDelegate>)delegate {
+	CGRect frame = CGRectMake(0.0f, 0.0f - scrollView.bounds.size.height, scrollView.bounds.size.width,
+							  scrollView.bounds.size.height);
+	if ((self = [self initWithFrame:frame])) {
+		self.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+		self.scrollView = scrollView;
+		self.delegate = delegate;
+		self.state = SSPullToRefreshViewStateNormal;
+		self.expandedHeight = 70.0f;
+
+		for (UIView *view in self.scrollView.subviews) {
+			if ([view isKindOfClass:[SSPullToRefreshView class]]) {
+				[[NSException exceptionWithName:@"SSPullToRefreshViewAlreadyAdded" reason:@"There is already a SSPullToRefreshView added to this scroll view. Unexpected things will happen. Don't do this." userInfo:nil] raise];
+			}
+		}
+
+		// Add to scroll view
+		[self.scrollView addSubview:self];
+
+		// Semaphore is used to ensure only one animation plays at a time
+		_animationSemaphore = dispatch_semaphore_create(0);
+		dispatch_semaphore_signal(_animationSemaphore);
+	}
+	return self;
+}
+
+
+#pragma mark - Loading
+
+- (void)startLoading {
+	[self startLoadingAndExpand:NO animated:NO];
+}
+
+
+- (void)startLoadingAndExpand:(BOOL)shouldExpand {
+	[self startLoadingAndExpand:shouldExpand animated:YES];
+}
+
+
+- (void)startLoadingAndExpand:(BOOL)shouldExpand animated:(BOOL)animated {
+	// If we're not loading, this method has no effect
+    if (_state == SSPullToRefreshViewStateLoading) {
+		return;
+	}
+
+	// Animate back to the loading state
+	[self _setState:SSPullToRefreshViewStateLoading animated:animated expanded:shouldExpand completion:nil];
+}
+
+
+- (void)finishLoading {
+	// If we're not loading, this method has no effect
+    if (_state != SSPullToRefreshViewStateLoading) {
+		return;
+	}
+	
+	// Animate back to the normal state
+	__weak SSPullToRefreshView *blockSelf = self;
+	[self _setState:SSPullToRefreshViewStateClosing animated:YES expanded:NO completion:^{
+		blockSelf.state = SSPullToRefreshViewStateNormal;
+	}];
+}
+
+
+- (void)refreshLastUpdatedAt {
+	NSDate *date = nil;
+	if ([_delegate respondsToSelector:@selector(pullToRefreshViewLastUpdatedAt:)]) {
+		date = [_delegate pullToRefreshViewLastUpdatedAt:self];
+	} else {
+		date = [NSDate date];
+	}
+	
+	// Forward to content view
+	if ([self.contentView respondsToSelector:@selector(setLastUpdatedAt:withPullToRefreshView:)]) {
+		[self.contentView setLastUpdatedAt:date withPullToRefreshView:self];
+	}
+}
+
+
+#pragma mark - Private
+
+- (void)_setContentInsetTop:(CGFloat)topInset {
+	_topInset = topInset;
+	
+	// Default to the scroll view's initial content inset
+	UIEdgeInsets inset = _defaultContentInset;
+	
+	// Add the top inset
+	inset.top += _topInset;
+	
+	// Don't set it if that is already the current inset
+	if (UIEdgeInsetsEqualToEdgeInsets(_scrollView.contentInset, inset)) {
+		return;
+	}
+	
+	// Update the content inset
+	_scrollView.contentInset = inset;
+
+	// If scrollView is on top, scroll again to the top (needed for scrollViews with content > scrollView).
+	if (_scrollView.contentOffset.y == 0) {
+		[_scrollView scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:YES];
+	}
+
+	// Tell the delegate
+	if ([self.delegate respondsToSelector:@selector(pullToRefreshView:didUpdateContentInset:)]) {
+		[self.delegate pullToRefreshView:self didUpdateContentInset:_scrollView.contentInset];
+	}
+}
+
+
+- (void)_setState:(SSPullToRefreshViewState)state animated:(BOOL)animated expanded:(BOOL)expanded completion:(void (^)(void))completion {
+	if (!animated) {
+		self.state = state;
+		self.expanded = expanded;
+		
+		if (completion) {
+			completion();
+		}
+		return;
+	}
+	
+	dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
+		dispatch_semaphore_wait(_animationSemaphore, DISPATCH_TIME_FOREVER);
+		dispatch_async(dispatch_get_main_queue(), ^{
+			[UIView animateWithDuration:0.3 delay:0.0 options:UIViewAnimationOptionAllowUserInteraction animations:^{
+				self.state = state;
+				self.expanded = expanded;
+			} completion:^(BOOL finished) {
+				dispatch_semaphore_signal(_animationSemaphore);
+				if (completion) {
+					completion();
+				}
+			}];
+		});
+	});
+}
+
+
+- (void)_setPullProgress:(CGFloat)pullProgress {
+	if ([self.contentView respondsToSelector:@selector(setPullProgress:)]) {
+		[self.contentView setPullProgress:pullProgress];
+	}
+}
+
+
+#pragma mark - NSKeyValueObserving
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
+	// Call super if we didn't register for this notification
+	if (context != (__bridge void *)self) {
+		[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+		return;
+	}
+	
+	// We don't care about this notificaiton
+	if (object != _scrollView || ![keyPath isEqualToString:@"contentOffset"]) {
+		return;
+	}
+	
+	// Get the offset out of the change notification
+	CGFloat y = [[change objectForKey:NSKeyValueChangeNewKey] CGPointValue].y + _defaultContentInset.top;
+
+	// Scroll view is dragging
+	if (_scrollView.isDragging) {
+		// Scroll view is ready
+		if (_state == SSPullToRefreshViewStateReady) {
+			// Dragged enough to refresh
+			if (y > -_expandedHeight && y < 0.0f) {
+				self.state = SSPullToRefreshViewStateNormal;
+			}
+		// Scroll view is normal
+		} else if (_state == SSPullToRefreshViewStateNormal) {
+			// Update the content view's pulling progressing
+			[self _setPullProgress:-y / _expandedHeight];
+			
+			// Dragged enough to be ready
+			if (y < -_expandedHeight) {
+				self.state = SSPullToRefreshViewStateReady;
+			}
+		// Scroll view is loading
+		} else if (_state == SSPullToRefreshViewStateLoading) {
+			[self _setContentInsetTop:_expandedHeight];
+		}
+		return;
+	}
+	
+	// If the scroll view isn't ready, we're not interested
+	if (_state != SSPullToRefreshViewStateReady) {
+		return;
+	}
+	
+	// We're ready, prepare to switch to loading. Be default, we should refresh.
+	SSPullToRefreshViewState newState = SSPullToRefreshViewStateLoading;
+	
+	// Ask the delegate if it's cool to start loading
+	BOOL expand = YES;
+	if ([_delegate respondsToSelector:@selector(pullToRefreshViewShouldStartLoading:)]) {
+		if (![_delegate pullToRefreshViewShouldStartLoading:self]) {
+			// Animate back to normal since the delegate said no
+			newState = SSPullToRefreshViewStateNormal;
+			expand = NO;
+		}
+	}
+	
+	// Animate to the new state
+	[self _setState:newState animated:YES expanded:expand completion:nil];
+}
+
+@end

=== modified file 'Music/Models/Album.h'
--- Music/Models/Album.h	2013-01-24 19:08:51 +0000
+++ Music/Models/Album.h	2013-02-11 04:30:25 +0000
@@ -27,4 +27,6 @@
 
 @property (nonatomic, retain) NSSet *songs;
 
+- (NSSet *)songsForArtistId:(NSString *)artistId;
+
 @end

=== modified file 'Music/Models/Album.m'
--- Music/Models/Album.m	2013-01-24 19:08:51 +0000
+++ Music/Models/Album.m	2013-02-11 04:30:25 +0000
@@ -28,6 +28,11 @@
 
 @dynamic songs;
 
+- (NSSet *)songsForArtistId:(NSString *)_artistId {
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"artist.artistId == %@ OR albumArtist.artistId == %@", _artistId, _artistId];
+    return [self.songs filteredSetUsingPredicate:predicate];
+}
+
 #pragma mark - UOModel methods
 
 + (RKEntityMapping *)objectMapping {

=== modified file 'Music/Storyboard_iPhone.storyboard'
--- Music/Storyboard_iPhone.storyboard	2013-02-11 04:30:25 +0000
+++ Music/Storyboard_iPhone.storyboard	2013-02-11 04:30:25 +0000
@@ -44,17 +44,17 @@
                                     <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Wy4-11-qhh">
-                                            <rect key="frame" x="53" y="2" width="38" height="22"/>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Artist" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Wy4-11-qhh">
+                                            <rect key="frame" x="53" y="1" width="45" height="23"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
                                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                             <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         </label>
-                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="PUO-bG-eLt">
-                                            <rect key="frame" x="53" y="24" width="47" height="18"/>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="2 albums" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="PUO-bG-eLt">
+                                            <rect key="frame" x="53" y="24" width="56" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="14"/>
                                             <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
                                             <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         </label>
@@ -86,7 +86,7 @@
             </objects>
             <point key="canvasLocation" x="1047" y="-56"/>
         </scene>
-        <!--Artist View Controller-->
+        <!--Artist View Controller - Artist-->
         <scene sceneID="Y3A-G3-aF2">
             <objects>
                 <viewController storyboardIdentifier="ArtistViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="EDS-Dj-fjS" customClass="ArtistViewController" sceneMemberID="viewController">
@@ -106,17 +106,17 @@
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="G72-IX-jh9">
-                                                    <rect key="frame" x="53" y="2" width="38" height="22"/>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Album" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="G72-IX-jh9">
+                                                    <rect key="frame" x="53" y="1" width="54" height="23"/>
                                                     <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                                 </label>
-                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VIc-Rn-YXm">
-                                                    <rect key="frame" x="53" y="24" width="47" height="18"/>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="11 songs" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VIc-Rn-YXm">
+                                                    <rect key="frame" x="53" y="24" width="57" height="18"/>
                                                     <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="14"/>
                                                     <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
                                                     <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                                 </label>
@@ -133,29 +133,29 @@
                                     </tableViewCell>
                                 </prototypes>
                             </tableView>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="7CD-jP-Egt">
-                                <rect key="frame" x="0.0" y="0.0" width="120" height="120"/>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="default-album-art-200.png" id="7CD-jP-Egt">
+                                <rect key="frame" x="5" y="5" width="110" height="110"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Artist" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="00M-r3-Ezp">
-                                <rect key="frame" x="128" y="15" width="192" height="26"/>
+                                <rect key="frame" x="123" y="5" width="172" height="26"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                                 <color key="shadowColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </label>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="6 Albums" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="25K-Tf-YSQ">
-                                <rect key="frame" x="128" y="49" width="63" height="21"/>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="2 Albums" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="25K-Tf-YSQ">
+                                <rect key="frame" x="123" y="39" width="172" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="15"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <color key="highlightedColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>
-                    <navigationItem key="navigationItem" id="OM6-Kh-nGV">
+                    <navigationItem key="navigationItem" title="Artist" id="OM6-Kh-nGV">
                         <barButtonItem key="rightBarButtonItem" title="Now Playing" id="tdG-O0-4fc">
                             <connections>
                                 <segue destination="hRX-A4-gMJ" kind="modal" id="dlu-4W-myG"/>
@@ -174,7 +174,7 @@
             </objects>
             <point key="canvasLocation" x="1515" y="-56"/>
         </scene>
-        <!--Album View Controller-->
+        <!--Album View Controller - Album-->
         <scene sceneID="24B-tK-YA0">
             <objects>
                 <viewController storyboardIdentifier="AlbumViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="8Ya-S8-w02" customClass="AlbumViewController" sceneMemberID="viewController">
@@ -214,14 +214,14 @@
                                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="60:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6u8-pY-Fu0">
                                                                     <rect key="frame" x="242" y="10" width="46" height="21"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="12"/>
                                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                                     <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                                 </label>
                                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QJk-JO-Hhy">
-                                                                    <rect key="frame" x="20" y="10" width="198" height="21"/>
+                                                                    <rect key="frame" x="20" y="8" width="198" height="27"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
+                                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
                                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                                     <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                                 </label>
@@ -250,29 +250,29 @@
                                     </tableViewCell>
                                 </prototypes>
                             </tableView>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="1ZL-7v-l7S">
-                                <rect key="frame" x="0.0" y="0.0" width="120" height="120"/>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="default-album-art-200.png" id="1ZL-7v-l7S">
+                                <rect key="frame" x="5" y="5" width="110" height="110"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Album" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dwO-gw-nTE">
-                                <rect key="frame" x="128" y="15" width="192" height="26"/>
+                                <rect key="frame" x="123" y="5" width="192" height="26"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                                 <color key="shadowColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Artist" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="G01-4v-qdB">
-                                <rect key="frame" x="128" y="49" width="63" height="21"/>
+                                <rect key="frame" x="123" y="39" width="172" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="15"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <color key="highlightedColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>
-                    <navigationItem key="navigationItem" id="a61-1v-dxt">
+                    <navigationItem key="navigationItem" title="Album" id="a61-1v-dxt">
                         <barButtonItem key="rightBarButtonItem" title="Now Playing" id="wGH-uZ-TGk">
                             <connections>
                                 <segue destination="hRX-A4-gMJ" kind="modal" identifier="NowPlayingSegue" id="YJd-qV-EXm"/>
@@ -395,7 +395,7 @@
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0:00" textAlignment="right" lineBreakMode="tailTruncation" minimumFontSize="10" id="pNU-Jr-yiV">
                                         <rect key="frame" x="12" y="31" width="42" height="15"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="14"/>
+                                        <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="14"/>
                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                         <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -403,7 +403,7 @@
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="10:00" lineBreakMode="tailTruncation" minimumFontSize="10" id="fsV-6P-1Kb">
                                         <rect key="frame" x="266" y="31" width="42" height="15"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="14"/>
+                                        <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="14"/>
                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                         <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -411,7 +411,7 @@
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3 of 100" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" id="KsY-jo-7df">
                                         <rect key="frame" x="12" y="5" width="296" height="19"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="14"/>
+                                        <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="14"/>
                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                         <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -528,17 +528,17 @@
                                     <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lHq-bS-Zm9">
-                                            <rect key="frame" x="53" y="2" width="38" height="22"/>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Album" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lHq-bS-Zm9">
+                                            <rect key="frame" x="53" y="1" width="54" height="23"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
                                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                             <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         </label>
-                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="03B-YT-E7s">
-                                            <rect key="frame" x="53" y="24" width="47" height="18"/>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Artist" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="03B-YT-E7s">
+                                            <rect key="frame" x="53" y="24" width="31" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="14"/>
                                             <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
                                             <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         </label>
@@ -579,41 +579,35 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="gray" indentationWidth="10" reuseIdentifier="Cell" id="EzM-5L-53C" customClass="SongCell">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="gray" indentationWidth="10" reuseIdentifier="Cell" textLabel="FGV-Wb-IfK" detailTextLabel="i6c-1Q-zdc" imageView="eTE-GK-6eP" style="IBUITableViewCellStyleSubtitle" id="EzM-5L-53C" customClass="SongListCell">
                                 <rect key="frame" x="0.0" y="22" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                     <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="URM-e4-2yc">
-                                            <rect key="frame" x="20" y="11" width="31" height="21"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                            <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                        </label>
-                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="60:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="vws-t4-lyH">
-                                            <rect key="frame" x="254" y="11" width="46" height="21"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                            <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                        </label>
-                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cHc-6o-Le1">
-                                            <rect key="frame" x="59" y="11" width="198" height="21"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                            <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                        </label>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="FGV-Wb-IfK">
+                                            <rect key="frame" x="53" y="1" width="36" height="23"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
+                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        </label>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="i6c-1Q-zdc">
+                                            <rect key="frame" x="53" y="24" width="46" height="18"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="14"/>
+                                            <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        </label>
+                                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="default-album-art-120.png" id="eTE-GK-6eP">
+                                            <rect key="frame" x="0.0" y="0.0" width="43" height="43"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </imageView>
                                     </subviews>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </view>
                                 <connections>
-                                    <outlet property="clock" destination="vws-t4-lyH" id="Fb3-aG-7Ym"/>
-                                    <outlet property="title" destination="cHc-6o-Le1" id="XJD-HL-AWU"/>
-                                    <outlet property="track" destination="URM-e4-2yc" id="CNs-EV-tVd"/>
                                     <segue destination="hRX-A4-gMJ" kind="modal" id="ebj-wD-yft"/>
                                 </connections>
                             </tableViewCell>
@@ -960,24 +954,22 @@
         </scene>
     </scenes>
     <resources>
-        <image name="03-loopback.png" width="32" height="22"/>
-        <image name="05-shuffle.png" width="28" height="20"/>
-        <image name="albums.png" width="30" height="30"/>
-        <image name="artists.png" width="30" height="30"/>
-        <image name="default-album-art-120.png" width="60" height="60"/>
-        <image name="default-album-art-640.png" width="320" height="320"/>
-        <image name="download-grey.png" width="28" height="28"/>
-        <image name="download.png" width="28" height="28"/>
-        <image name="grabber.png" width="22" height="44"/>
-        <image name="player_overlay_bg.png" width="320" height="100"/>
-        <image name="playlists.png" width="30" height="30"/>
-        <image name="settings.png" width="30" height="30"/>
-        <image name="songs.png" width="30" height="30"/>
+        <image name="03-loopback.png" width="16" height="16"/>
+        <image name="05-shuffle.png" width="16" height="16"/>
+        <image name="albums.png" width="16" height="16"/>
+        <image name="artists.png" width="16" height="16"/>
+        <image name="default-album-art-120.png" width="16" height="16"/>
+        <image name="default-album-art-200.png" width="16" height="16"/>
+        <image name="default-album-art-640.png" width="16" height="16"/>
+        <image name="download-grey.png" width="16" height="16"/>
+        <image name="download.png" width="16" height="16"/>
+        <image name="grabber.png" width="16" height="16"/>
+        <image name="player_overlay_bg.png" width="16" height="16"/>
+        <image name="playlists.png" width="16" height="16"/>
+        <image name="settings.png" width="16" height="16"/>
+        <image name="songs.png" width="16" height="16"/>
     </resources>
     <classes>
-        <class className="AlbumCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumCell.h"/>
-        </class>
         <class className="AlbumViewController" superclassName="UIViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumViewController.h"/>
             <relationships>
@@ -988,69 +980,16 @@
                 <relationship kind="outlet" name="tableView" candidateClass="UITableView"/>
             </relationships>
         </class>
-        <class className="AlbumsViewController" superclassName="UOIndexedViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumsViewController.h"/>
-        </class>
-        <class className="ArtistCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistCell.h"/>
-        </class>
-        <class className="ArtistViewController" superclassName="UIViewController">
+        <class className="ArtistViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistViewController.h"/>
             <relationships>
                 <relationship kind="outlet" name="albumArt" candidateClass="UIImageView"/>
                 <relationship kind="outlet" name="artistDescription" candidateClass="UILabel"/>
                 <relationship kind="outlet" name="artistName" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="nowPlayingButton" candidateClass="UIBarButtonItem"/>
                 <relationship kind="outlet" name="tableView" candidateClass="UITableView"/>
             </relationships>
         </class>
-        <class className="ArtistsViewController" superclassName="UOIndexedViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistsViewController.h"/>
-        </class>
-        <class className="PlayerHeaderView" superclassName="UIView">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/PlayerHeaderView.h"/>
-            <relationships>
-                <relationship kind="outlet" name="album" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="artist" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="title" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="PlayerViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/PlayerViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="changeRepeat:"/>
-                <relationship kind="action" name="changeShuffle:"/>
-                <relationship kind="action" name="hide:"/>
-                <relationship kind="action" name="next:"/>
-                <relationship kind="action" name="pause:"/>
-                <relationship kind="action" name="play:"/>
-                <relationship kind="action" name="previous:"/>
-                <relationship kind="action" name="toggleExtendedControls:"/>
-                <relationship kind="outlet" name="albumart" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="artistLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="controlBar" candidateClass="UIToolbar"/>
-                <relationship kind="outlet" name="elapsedTime" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="extendedControlView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="nextButton" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="pauseButton" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="playButton" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="playlistInfo" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="previousButton" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="progressView" candidateClass="UISlider"/>
-                <relationship kind="outlet" name="reflectionImage" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="repeatButton" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="shuffleButton" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="totalTime" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="PlaylistCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/PlaylistCell.h"/>
-        </class>
-        <class className="PlaylistsViewController" superclassName="UOIndexedViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/PlaylistsViewController.h"/>
-        </class>
-        <class className="SettingsAuthenticationViewController" superclassName="UIViewController">
+        <class className="SettingsAuthenticationViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsAuthenticationViewController.h"/>
             <relationships>
                 <relationship kind="action" name="authenticate:"/>
@@ -1060,7 +999,7 @@
                 <relationship kind="outlet" name="usernameField" candidateClass="UITextField"/>
             </relationships>
         </class>
-        <class className="SettingsViewController" superclassName="UITableViewController">
+        <class className="SettingsViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsViewController.h"/>
             <relationships>
                 <relationship kind="action" name="deleteCaches:"/>
@@ -1071,27 +1010,6 @@
                 <relationship kind="outlet" name="versionNumber" candidateClass="UILabel"/>
             </relationships>
         </class>
-        <class className="SongCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SongCell.h"/>
-            <relationships>
-                <relationship kind="outlet" name="cacheImageIndicator" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="cacheIndicator" candidateClass="UIView"/>
-                <relationship kind="outlet" name="clock" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="handle" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="title" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="topView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="track" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="SongsViewController" superclassName="UOIndexedViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SongsViewController.h"/>
-        </class>
-        <class className="UOIndexedViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/UOIndexedViewController.h"/>
-            <relationships>
-                <relationship kind="outlet" name="nowPlayingButton" candidateClass="UIBarButtonItem"/>
-            </relationships>
-        </class>
     </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
@@ -1100,6 +1018,6 @@
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
         <segue reference="jMd-4K-zoU"/>
-        <segue reference="e8X-Xp-0ra"/>
+        <segue reference="ebj-wD-yft"/>
     </inferredMetricsTieBreakers>
 </document>
\ No newline at end of file

=== modified file 'Music/Utilities/UOPlayer.h'
--- Music/Utilities/UOPlayer.h	2013-02-11 04:30:25 +0000
+++ Music/Utilities/UOPlayer.h	2013-02-11 04:30:25 +0000
@@ -45,4 +45,6 @@
 @property (nonatomic) BOOL shuffle;
 @property (nonatomic) RepeatState repeat;
 
+- (double)streamerProgress;
+
 @end

=== modified file 'Music/Utilities/UOPlayer.m'
--- Music/Utilities/UOPlayer.m	2013-02-11 04:30:25 +0000
+++ Music/Utilities/UOPlayer.m	2013-02-11 04:30:25 +0000
@@ -106,7 +106,7 @@
 
 #pragma mark - Player state
 
-- (double)progress {
+- (double)streamerProgress {
     return streamer.progress;
 }
 

=== modified file 'Music/View Controllers/AlbumViewController.h'
--- Music/View Controllers/AlbumViewController.h	2013-01-24 15:46:16 +0000
+++ Music/View Controllers/AlbumViewController.h	2013-02-11 04:30:25 +0000
@@ -12,6 +12,7 @@
 
 @interface AlbumViewController : UIViewController
 @property (nonatomic, retain) NSString *albumId;
+@property (nonatomic, retain) NSString *artistId;
 
 @property (strong, nonatomic) IBOutlet UIBarButtonItem *nowPlayingButton;
 @end

=== modified file 'Music/View Controllers/AlbumViewController.m'
--- Music/View Controllers/AlbumViewController.m	2013-02-11 04:30:25 +0000
+++ Music/View Controllers/AlbumViewController.m	2013-02-11 04:30:25 +0000
@@ -20,6 +20,7 @@
     NSArray *tableData;
     
     Album *album;
+    Artist *artist;
 }
 @property (weak, nonatomic) IBOutlet UIImageView *albumArt;
 @property (weak, nonatomic) IBOutlet UILabel *albumTitle;
@@ -30,6 +31,7 @@
 
 @implementation AlbumViewController
 @synthesize albumId = _albumId;
+@synthesize artistId = _artistId;
 
 - (void)viewDidLoad {
     [self.tableView setDataSource:self];
@@ -58,7 +60,11 @@
     
     if ([album.songs count]) {
         NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"track" ascending:YES];
-        tableData = [album.songs sortedArrayUsingDescriptors:@[sortDescriptor]];
+        if (self.artistId) {
+            tableData = [[album songsForArtistId:self.artistId] sortedArrayUsingDescriptors:@[sortDescriptor]];
+        } else {
+            tableData = [album.songs sortedArrayUsingDescriptors:@[sortDescriptor]];
+        }
         [self.tableView reloadData];
     } else {
         [[UOWebServiceController controller] updateSongs:self];
@@ -116,7 +122,11 @@
     [managedObjectContext refreshObject:album mergeChanges:NO];
     
     NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"track" ascending:YES];
-    tableData = [album.songs sortedArrayUsingDescriptors:@[sortDescriptor]];
+    if (self.artistId) {
+        tableData = [[album songsForArtistId:self.artistId] sortedArrayUsingDescriptors:@[sortDescriptor]];
+    } else {
+        tableData = [album.songs sortedArrayUsingDescriptors:@[sortDescriptor]];
+    }
     
     [self.tableView reloadData];
 }

=== modified file 'Music/View Controllers/AlbumsViewController.m'
--- Music/View Controllers/AlbumsViewController.m	2013-01-24 16:37:09 +0000
+++ Music/View Controllers/AlbumsViewController.m	2013-02-11 04:30:25 +0000
@@ -46,6 +46,10 @@
     [[UOWebServiceController controller] updateAlbums:self];
 }
 
+- (void)refresh {
+    [[UOWebServiceController controller] updateAlbums:self clearCache:YES];
+}
+
 #pragma mark - Storyboard methods
 
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
@@ -55,6 +59,7 @@
     AlbumViewController *albumViewController = [segue destinationViewController];
     Album *album = ((AlbumCell *)sender).album;
     albumViewController.albumId = album.albumId;
+    albumViewController.artistId = nil;
 }
 
 @end

=== modified file 'Music/View Controllers/ArtistViewController.m'
--- Music/View Controllers/ArtistViewController.m	2013-02-11 04:30:25 +0000
+++ Music/View Controllers/ArtistViewController.m	2013-02-11 04:30:25 +0000
@@ -59,11 +59,7 @@
         self.navigationItem.rightBarButtonItem = nil;
     }
     
-    NSString *pluralizedNoun = @"albums";
-    if ([artist.albums count] == 1) {
-        pluralizedNoun = @"album";
-    }
-    [_artistDescription setText:[NSString stringWithFormat:@"%d %@", [artist.albums count], pluralizedNoun]];
+    [self setAlbumCount];
     NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"year" ascending:NO];
     tableData = [artist.albums sortedArrayUsingDescriptors:@[sortDescriptor]];
     [self.tableView reloadData];
@@ -98,6 +94,7 @@
     AlbumViewController *albumViewController = [segue destinationViewController];
     Album *album = ((AlbumCell *)sender).album;
     albumViewController.albumId = album.albumId;
+    albumViewController.artistId = self.artistId;
 }
 
 #pragma mark - UOWebServiceDelegate methods
@@ -110,6 +107,7 @@
     tableData = [artist.albums sortedArrayUsingDescriptors:@[sortDescriptor]];
     
     [self.tableView reloadData];
+    [self setAlbumCount];
 }
 
 - (void)webserviceUpdateError:(NSError *)error {
@@ -139,4 +137,12 @@
     artist = [results objectAtIndex:0];
 }
 
+- (void)setAlbumCount {
+    NSString *pluralizedNoun = @"albums";
+    if ([artist.albums count] == 1) {
+        pluralizedNoun = @"album";
+    }
+    [_artistDescription setText:[NSString stringWithFormat:@"%d %@", [artist.albums count], pluralizedNoun]];
+}
+
 @end

=== modified file 'Music/View Controllers/ArtistsViewController.m'
--- Music/View Controllers/ArtistsViewController.m	2013-01-24 15:46:16 +0000
+++ Music/View Controllers/ArtistsViewController.m	2013-02-11 04:30:25 +0000
@@ -49,6 +49,10 @@
     [[UOWebServiceController controller] updateArtists:self];
 }
 
+- (void)refresh {
+    [[UOWebServiceController controller] updateArtists:self clearCache:YES];
+}
+
 #pragma mark - Storyboard methods
 
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {

=== modified file 'Music/View Controllers/PlayerViewController.m'
--- Music/View Controllers/PlayerViewController.m	2013-02-11 04:30:25 +0000
+++ Music/View Controllers/PlayerViewController.m	2013-02-11 04:30:25 +0000
@@ -185,8 +185,8 @@
 }
 
 - (void)heartbeat:(NSTimer*)timer {
-    NSInteger progress = (NSInteger)[[UOPlayer player] progress];
-    self.elapsedTime.text = [NSString clockStringFromSeconds:progress];
+    double progress = [[UOPlayer player] streamerProgress];
+    self.elapsedTime.text = [NSString clockStringFromSeconds:(int)progress];
     self.progressView.value = progress;
 }
 

=== modified file 'Music/View Controllers/PlaylistsViewController.m'
--- Music/View Controllers/PlaylistsViewController.m	2013-01-22 19:50:43 +0000
+++ Music/View Controllers/PlaylistsViewController.m	2013-02-11 04:30:25 +0000
@@ -45,4 +45,8 @@
     [[UOWebServiceController controller] updatePlaylists:self];
 }
 
+- (void)refresh {
+    [[UOWebServiceController controller] updatePlaylists:self clearCache:YES];
+}
+
 @end

=== modified file 'Music/View Controllers/SongsViewController.m'
--- Music/View Controllers/SongsViewController.m	2013-02-11 04:30:25 +0000
+++ Music/View Controllers/SongsViewController.m	2013-02-11 04:30:25 +0000
@@ -9,7 +9,7 @@
 #import "SongsViewController.h"
 #import "UONetworkStatusCoordinator.h"
 #import "Song.h"
-#import "SongCell.h"
+#import "SongListCell.h"
 #import "NSString+Extras.h"
 #import "UOWebServiceController.h"
 #import "UOPlayer.h"
@@ -37,23 +37,27 @@
 }
 
 - (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath {
-    SongCell *songCell = (SongCell *)cell;
+    SongListCell *songCell = (SongListCell *)cell;
     Song *song = [self.fetchedResultsController objectAtIndexPath:indexPath];
-    songCell.showArt = YES;
     [songCell setSong:song];
 }
 
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
+- (void)update {
     [[UOWebServiceController controller] updateSongs:self];
 }
 
+- (void)refresh {
+    [[UOWebServiceController controller] updateSongs:self clearCache:YES];
+}
+
+#pragma mark - UIStoryboard methods
+
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
     NSArray *songs = [[self.fetchedResultsController fetchedObjects] copy];
     if (![sender respondsToSelector:@selector(song)]) {
         return; // Hit 'Now Playing'
     }
-    Song *song = ((SongCell *)sender).song;
+    Song *song = ((SongListCell *)sender).song;
     NSUInteger index = [songs indexOfObject:song];
     
     UOPlayer *player = [UOPlayer player];

=== modified file 'Music/View Controllers/UOIndexedViewController.h'
--- Music/View Controllers/UOIndexedViewController.h	2013-01-24 15:46:16 +0000
+++ Music/View Controllers/UOIndexedViewController.h	2013-02-11 04:30:25 +0000
@@ -23,6 +23,7 @@
 @property (readonly, nonatomic) NSString *lastUpdatedKey;
 @property (readonly, nonatomic) NSArray *sortDescriptors;
 - (void)update;
+- (void)refresh;
 - (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath;
 
 - (NSFetchedResultsController *)fetchedResultsController;

=== modified file 'Music/View Controllers/UOIndexedViewController.m'
--- Music/View Controllers/UOIndexedViewController.m	2013-02-11 04:30:25 +0000
+++ Music/View Controllers/UOIndexedViewController.m	2013-02-11 04:30:25 +0000
@@ -10,11 +10,12 @@
 #import <RestKit/RestKit.h>
 #import "UOAppDelegate.h"
 #import "UOPlayer.h"
+#import "SSPullToRefresh.h"
 
-@interface UOIndexedViewController () {
+@interface UOIndexedViewController () <SSPullToRefreshViewDelegate> {
     NSFetchedResultsController *_fetchedResultsController;
 }
-
+@property (nonatomic, strong) SSPullToRefreshView *pullToRefreshView;
 @end
 
 @implementation UOIndexedViewController
@@ -48,13 +49,24 @@
 - (void)update {
 }
 
+- (void)refresh {
+}
+
 #pragma mark - UIViewController lifecycle
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    
+    self.pullToRefreshView = [[SSPullToRefreshView alloc] initWithScrollView:self.tableView delegate:self];
+    self.pullToRefreshView.contentView = [[SSPullToRefreshSimpleContentView alloc] initWithFrame:CGRectZero];
     groupedTableData = [NSMutableDictionary dictionary];
 }
 
+- (void)viewDidUnload {
+    [super viewDidUnload];
+    self.pullToRefreshView = nil;
+}
+
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     [self update];
@@ -66,12 +78,6 @@
     }
 }
 
-- (void)didReceiveMemoryWarning
-{
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
 #pragma mark - Table view data source
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
@@ -114,25 +120,6 @@
     NSLog(@"Error: %@", [error localizedDescription]);
 }
 
-#pragma mark - RKObjectLoaderDelegate methods
-/*
-- (void)objectLoader:(RKObjectLoader *)objectLoader didFailWithError:(NSError *)error {
-    [UONetworkStatusCoordinator removeNetworkActivity];
-    if ([error code] == 2) { // Network is down.
-        return;
-    }
-    NSLog(@"Error: %@", [error localizedDescription]);
-    [[NSUserDefaults standardUserDefaults] setObject:nil forKey:[self lastUpdatedKey]];
-}
-
-- (void)objectLoader:(RKObjectLoader *)objectLoader didLoadObjects:(NSArray *)objects {
-    [UONetworkStatusCoordinator removeNetworkActivity];
-    _fetchedResultsController = nil;
-    [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:[self lastUpdatedKey]];
-    [self.tableView reloadData];
-}
- */
-
 #pragma mark - Fetched results controller
 
 - (NSFetchedResultsController *)fetchedResultsController {
@@ -166,4 +153,13 @@
     [self.tableView reloadData];
 }
 
+#pragma mark - SSPullToRefreshViewDelegate methods
+
+- (void)pullToRefreshViewDidStartLoading:(SSPullToRefreshView *)view {
+    [self.pullToRefreshView startLoading];
+    [self refresh];
+    [self.pullToRefreshView finishLoading];
+}
+
+
 @end

=== modified file 'Music/Views/Table Cells/ArtistCell.m'
--- Music/Views/Table Cells/ArtistCell.m	2013-01-28 00:40:22 +0000
+++ Music/Views/Table Cells/ArtistCell.m	2013-02-11 04:30:25 +0000
@@ -32,6 +32,8 @@
             pluralizedNoun = @"album";
         }
         [self.detailTextLabel setText:[NSString stringWithFormat:@"%d %@", [artist.albums count], pluralizedNoun]];
+    } else {
+        [self.detailTextLabel setText:@" "];
     }
 }
 

=== added file 'Music/Views/Table Cells/SongListCell.h'
--- Music/Views/Table Cells/SongListCell.h	1970-01-01 00:00:00 +0000
+++ Music/Views/Table Cells/SongListCell.h	2013-02-11 04:30:25 +0000
@@ -0,0 +1,15 @@
+//
+//  SongListCell.h
+//  U1Music
+//
+//  Created by Paul Hummer on 2/6/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class Song;
+
+@interface SongListCell : UITableViewCell
+@property (nonatomic, retain) Song *song;
+@end

=== added file 'Music/Views/Table Cells/SongListCell.m'
--- Music/Views/Table Cells/SongListCell.m	1970-01-01 00:00:00 +0000
+++ Music/Views/Table Cells/SongListCell.m	2013-02-11 04:30:25 +0000
@@ -0,0 +1,34 @@
+//
+//  SongListCell.m
+//  U1Music
+//
+//  Created by Paul Hummer on 2/6/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+
+#import "SongListCell.h"
+#import "UODownloader.h"
+#import "Song.h"
+#import "Artist.h"
+
+@implementation SongListCell
+@synthesize song;
+
+- (void)setSong:(Song *)_song {
+    song = _song;
+
+    if (!song.art) {
+        [self.imageView setImage:[UIImage imageNamed:@"default-album-art-120.png"]];
+        [[UODownloader downloader] downloadArt:song.artUrl toPath:song.artPath completionBlock:^(UIImage *image){
+            [self.imageView setImage:image];
+            [self setNeedsDisplay];
+        }];
+    } else {
+        [self.imageView setImage:song.art];
+    }
+    
+    [self.textLabel setText:song.title];
+    [self.detailTextLabel setText:song.artist.name];
+}
+
+@end

=== modified file 'U1Music.xcodeproj/project.pbxproj'
--- U1Music.xcodeproj/project.pbxproj	2013-02-11 04:30:25 +0000
+++ U1Music.xcodeproj/project.pbxproj	2013-02-11 04:30:25 +0000
@@ -28,6 +28,10 @@
 		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] */; };
+		5257414B16C37A0A00530CCC /* SongListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 5257414A16C37A0A00530CCC /* SongListCell.m */; };
+		5257415416C37E1A00530CCC /* SSPullToRefreshDefaultContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5257414F16C37E1A00530CCC /* SSPullToRefreshDefaultContentView.m */; };
+		5257415516C37E1A00530CCC /* SSPullToRefreshSimpleContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5257415116C37E1A00530CCC /* SSPullToRefreshSimpleContentView.m */; };
+		5257415616C37E1A00530CCC /* SSPullToRefreshView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5257415316C37E1A00530CCC /* SSPullToRefreshView.m */; };
 		5257417716C5CC5D00530CCC /* NSString+UbuntuOne.m in Sources */ = {isa = PBXBuildFile; fileRef = 5257417616C5CC5D00530CCC /* NSString+UbuntuOne.m */; };
 		5257417A16C5CDA900530CCC /* UIImageView+UbuntuOne.m in Sources */ = {isa = PBXBuildFile; fileRef = 5257417916C5CDA900530CCC /* UIImageView+UbuntuOne.m */; };
 		5257416D16C5653100530CCC /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5257416C16C5653100530CCC /* Crashlytics.framework */; };
@@ -274,6 +278,15 @@
 		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>"; };
+		5257414916C37A0A00530CCC /* SongListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SongListCell.h; sourceTree = "<group>"; };
+		5257414A16C37A0A00530CCC /* SongListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SongListCell.m; sourceTree = "<group>"; };
+		5257414D16C37E1A00530CCC /* SSPullToRefresh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSPullToRefresh.h; sourceTree = "<group>"; };
+		5257414E16C37E1A00530CCC /* SSPullToRefreshDefaultContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSPullToRefreshDefaultContentView.h; sourceTree = "<group>"; };
+		5257414F16C37E1A00530CCC /* SSPullToRefreshDefaultContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSPullToRefreshDefaultContentView.m; sourceTree = "<group>"; };
+		5257415016C37E1A00530CCC /* SSPullToRefreshSimpleContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSPullToRefreshSimpleContentView.h; sourceTree = "<group>"; };
+		5257415116C37E1A00530CCC /* SSPullToRefreshSimpleContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSPullToRefreshSimpleContentView.m; sourceTree = "<group>"; };
+		5257415216C37E1A00530CCC /* SSPullToRefreshView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSPullToRefreshView.h; sourceTree = "<group>"; };
+		5257415316C37E1A00530CCC /* SSPullToRefreshView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSPullToRefreshView.m; sourceTree = "<group>"; };
 		5257417516C5CC5D00530CCC /* NSString+UbuntuOne.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+UbuntuOne.h"; path = "Categories/NSString+UbuntuOne.h"; sourceTree = "<group>"; };
 		5257417616C5CC5D00530CCC /* NSString+UbuntuOne.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+UbuntuOne.m"; path = "Categories/NSString+UbuntuOne.m"; sourceTree = "<group>"; };
 		5257417816C5CDA900530CCC /* UIImageView+UbuntuOne.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImageView+UbuntuOne.h"; path = "Categories/UIImageView+UbuntuOne.h"; sourceTree = "<group>"; };
@@ -659,6 +672,7 @@
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				964FA39013CA5BE60018A65B /* Dependencies */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
+				5279764815F00B2600F8435F /* libz.dylib */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
 			);
 			name = CustomTemplate;
@@ -713,6 +727,21 @@
 			name = Categories;
 			sourceTree = "<group>";
 		};
+		5257414C16C37E1A00530CCC /* SSPullToRefresh */ = {
+			isa = PBXGroup;
+			children = (
+				5257414D16C37E1A00530CCC /* SSPullToRefresh.h */,
+				5257414E16C37E1A00530CCC /* SSPullToRefreshDefaultContentView.h */,
+				5257414F16C37E1A00530CCC /* SSPullToRefreshDefaultContentView.m */,
+				5257415016C37E1A00530CCC /* SSPullToRefreshSimpleContentView.h */,
+				5257415116C37E1A00530CCC /* SSPullToRefreshSimpleContentView.m */,
+				5257415216C37E1A00530CCC /* SSPullToRefreshView.h */,
+				5257415316C37E1A00530CCC /* SSPullToRefreshView.m */,
+			);
+			name = SSPullToRefresh;
+			path = Dependencies/SSPullToRefresh;
+			sourceTree = "<group>";
+		};
 		5268508616AE516B001F65A6 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -801,6 +830,8 @@
 				526850DB16AEFA7D001F65A6 /* PlaylistCell.m */,
 				526850DC16AEFA7D001F65A6 /* SongCell.h */,
 				526850DD16AEFA7D001F65A6 /* SongCell.m */,
+				5257414916C37A0A00530CCC /* SongListCell.h */,
+				5257414A16C37A0A00530CCC /* SongListCell.m */,
 			);
 			path = "Table Cells";
 			sourceTree = "<group>";
@@ -1268,8 +1299,8 @@
 		964FA39013CA5BE60018A65B /* Dependencies */ = {
 			isa = PBXGroup;
 			children = (
+				5257414C16C37E1A00530CCC /* SSPullToRefresh */,
 				93BC520A124C187700B7587C /* SynthesizeSingleton.h */,
-				5279764815F00B2600F8435F /* libz.dylib */,
 				91328278144E07EA00395F40 /* TestFlight SDK */,
 			);
 			name = Dependencies;
@@ -1631,6 +1662,10 @@
 				522B24EA16B4BC1E0084B023 /* UODownloadPanGestureRecognizer.m in Sources */,
 				520BBF2416B51F2A00307F32 /* UODownloader.m in Sources */,
 				5295FD2416B7559F00A07440 /* UOPlayer.m in Sources */,
+				5257414B16C37A0A00530CCC /* SongListCell.m in Sources */,
+				5257415416C37E1A00530CCC /* SSPullToRefreshDefaultContentView.m in Sources */,
+				5257415516C37E1A00530CCC /* SSPullToRefreshSimpleContentView.m in Sources */,
+				5257415616C37E1A00530CCC /* SSPullToRefreshView.m in Sources */,
 				5257417716C5CC5D00530CCC /* NSString+UbuntuOne.m in Sources */,
 				5257417A16C5CDA900530CCC /* UIImageView+UbuntuOne.m in Sources */,
 			);