Commit 125480e3 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Rework iOS 7 library view based upon Damien's design

parent 4462b347
......@@ -18,7 +18,7 @@
@property (nonatomic, strong) IBOutlet UIImageView *thumbnailView;
@property (nonatomic, strong) IBOutlet VLCLinearProgressIndicator *progressView;
@property (nonatomic, strong) IBOutlet UIButton *removeMediaButton;
@property (nonatomic, strong) IBOutlet UIImageView *mediaIsUnreadView;
@property (nonatomic, strong) IBOutlet UIView *mediaIsUnreadView;
@property (nonatomic, strong) IBOutlet UILabel *seriesNameLabel;
@property (nonatomic, strong) IBOutlet UILabel *artistNameLabel;
@property (nonatomic, strong) IBOutlet UILabel *albumNameLabel;
......
......@@ -123,65 +123,91 @@
- (void)_configureForShow:(MLShow *)show
{
self.titleLabel.text = show.name;
self.artistNameLabel.text = @"";
self.albumNameLabel.text = show.releaseYear;
NSUInteger count = show.episodes.count;
self.subtitleLabel.text = [NSString stringWithFormat:(count > 1) ? NSLocalizedString(@"LIBRARY_EPISODES", @"") : NSLocalizedString(@"LIBRARY_SINGLE_EPISODE", @""), count, show.unreadEpisodes.count];
if (SYSTEM_RUNS_IOS7_OR_LATER) {
NSString *string = @"";
if (show.releaseYear)
string = [NSString stringWithFormat:@"%@ — ", show.releaseYear];
self.subtitleLabel.text = [string stringByAppendingString:[NSString stringWithFormat:(count > 1) ? NSLocalizedString(@"LIBRARY_EPISODES", @"") : NSLocalizedString(@"LIBRARY_SINGLE_EPISODE", @""), count, show.unreadEpisodes.count]];
} else {
self.artistNameLabel.text = @"";
self.albumNameLabel.text = show.releaseYear;
self.subtitleLabel.text = [NSString stringWithFormat:(count > 1) ? NSLocalizedString(@"LIBRARY_EPISODES", @"") : NSLocalizedString(@"LIBRARY_SINGLE_EPISODE", @""), count, show.unreadEpisodes.count];
}
self.mediaIsUnreadView.hidden = YES;
self.progressView.hidden = YES;
}
- (void)_configureForAlbumTrack:(MLAlbumTrack *)albumTrack
{
self.artistNameLabel.text = albumTrack.artist;
self.albumNameLabel.text = [NSString stringWithFormat:NSLocalizedString(@"LIBRARY_SINGLE_TRACK", @""), albumTrack.trackNumber.intValue];
self.titleLabel.text = albumTrack.title;
self.thumbnailView.image = nil;
MLFile *anyFileFromTrack = albumTrack.files.anyObject;
self.subtitleLabel.text = [NSString stringWithFormat:@"%@", [VLCTime timeWithNumber:[anyFileFromTrack duration]]];
[self _showPositionOfItem:anyFileFromTrack];
}
- (void)_configureForAlbum:(MLAlbum *)album
{
self.titleLabel.text = album.name;
MLAlbumTrack *anyTrack = [album.tracks anyObject];
self.artistNameLabel.text = anyTrack? anyTrack.artist: @"";
self.albumNameLabel.text = album.releaseYear;
if (SYSTEM_RUNS_IOS7_OR_LATER)
self.subtitleLabel.text = [NSString stringWithFormat:@"%@ — %@ — %@", albumTrack.artist, [NSString stringWithFormat:NSLocalizedString(@"LIBRARY_TRACK_N", @""), albumTrack.trackNumber.intValue], [VLCTime timeWithNumber:[anyFileFromTrack duration]]];
else {
self.artistNameLabel.text = albumTrack.artist;
self.albumNameLabel.text = [NSString stringWithFormat:NSLocalizedString(@"LIBRARY_TRACK_N", @""), albumTrack.trackNumber.intValue];
self.subtitleLabel.text = [NSString stringWithFormat:@"%@", [VLCTime timeWithNumber:[anyFileFromTrack duration]]];
}
self.titleLabel.text = albumTrack.title;
self.thumbnailView.image = nil;
NSUInteger count = album.tracks.count;
self.subtitleLabel.text = [NSString stringWithFormat:(count > 1) ? NSLocalizedString(@"LIBRARY_TRACKS", @"") : NSLocalizedString(@"LIBRARY_SINGLE_TRACK", @""), count];
self.mediaIsUnreadView.hidden = YES;
self.progressView.hidden = YES;
[self _showPositionOfItem:anyFileFromTrack];
}
- (void)_configureForShowEpisode:(MLShowEpisode *)showEpisode
{
MLFile *anyFileFromEpisode = showEpisode.files.anyObject;
self.titleLabel.text = showEpisode.name;
MLFile *anyFileFromEpisode = showEpisode.files.anyObject;
if (self.titleLabel.text.length < 1) {
self.titleLabel.text = [NSString stringWithFormat:@"S%02dE%02d", showEpisode.episodeNumber.intValue, showEpisode.seasonNumber.intValue];
self.titleLabel.text = [NSString stringWithFormat:@"S%02dE%02d", showEpisode.seasonNumber.intValue, showEpisode.episodeNumber.intValue];
self.subtitleLabel.text = [NSString stringWithFormat:@"%@", [VLCTime timeWithNumber:[anyFileFromEpisode duration]]];
} else
self.subtitleLabel.text = [NSString stringWithFormat:@"S%02dE%02d — %@", showEpisode.episodeNumber.intValue, showEpisode.seasonNumber.intValue, [VLCTime timeWithNumber:[anyFileFromEpisode duration]]];
self.subtitleLabel.text = [NSString stringWithFormat:@"S%02dE%02d — %@", showEpisode.seasonNumber.intValue, showEpisode.episodeNumber.intValue, [VLCTime timeWithNumber:[anyFileFromEpisode duration]]];
[self _showPositionOfItem:anyFileFromEpisode];
}
- (void)_configureForAlbum:(MLAlbum *)album
{
self.titleLabel.text = album.name;
MLAlbumTrack *anyTrack = [album.tracks anyObject];
NSUInteger count = album.tracks.count;
if (SYSTEM_RUNS_IOS7_OR_LATER) {
NSMutableString *string = [[NSMutableString alloc] init];
if (anyTrack) {
[string appendString:anyTrack.artist];
[string appendString:@" — "];
}
[string appendFormat:@"%@ — %@", [NSString stringWithFormat:(count > 1) ? NSLocalizedString(@"LIBRARY_TRACKS", @"") : NSLocalizedString(@"LIBRARY_SINGLE_TRACK", @""), count], album.releaseYear];
self.subtitleLabel.text = string;
} else {
self.artistNameLabel.text = anyTrack? anyTrack.artist: @"";
self.albumNameLabel.text = album.releaseYear;
self.subtitleLabel.text = [NSString stringWithFormat:(count > 1) ? NSLocalizedString(@"LIBRARY_TRACKS", @"") : NSLocalizedString(@"LIBRARY_SINGLE_TRACK", @""), count];
}
self.thumbnailView.image = nil;
self.mediaIsUnreadView.hidden = YES;
self.progressView.hidden = YES;
}
- (void)_configureForMLFile:(MLFile *)mediaFile
{
if ([mediaFile isAlbumTrack]) {
self.artistNameLabel.text = mediaFile.albumTrack.artist;
self.albumNameLabel.text = mediaFile.albumTrack.album.name;
self.titleLabel.text = (mediaFile.albumTrack.title.length > 0) ? mediaFile.albumTrack.title : mediaFile.title;
if (mediaFile.isAlbumTrack) {
if (SYSTEM_RUNS_IOS7_OR_LATER) {
NSString *string = @"";
if (mediaFile.albumTrack.artist)
string = [NSString stringWithFormat:@"%@ — ", mediaFile.albumTrack.artist];
else if (mediaFile.albumTrack.album.name)
string = [NSString stringWithFormat:@"%@ — ", mediaFile.albumTrack.artist];
self.titleLabel.text = [string stringByAppendingString:(mediaFile.albumTrack.title.length > 1) ? mediaFile.albumTrack.title : mediaFile.title];
} else {
self.artistNameLabel.text = mediaFile.albumTrack.artist;
self.albumNameLabel.text = mediaFile.albumTrack.album.name;
self.titleLabel.text = (mediaFile.albumTrack.title.length > 1) ? mediaFile.albumTrack.title : mediaFile.title;
}
self.thumbnailView.image = nil;
} else if ([mediaFile isShowEpisode]) {
MLShowEpisode *episode = mediaFile.showEpisode;
self.seriesNameLabel.text = episode.show.name;
self.titleLabel.text = (episode.name.length > 0) ? [NSString stringWithFormat:@"%@ - S%02dE%02d", episode.name, mediaFile.showEpisode.seasonNumber.intValue, episode.episodeNumber.intValue] : [NSString stringWithFormat:@"S%02dE%02d", episode.seasonNumber.intValue, episode.episodeNumber.intValue];
} else
self.titleLabel.text = mediaFile.title;
......@@ -205,10 +231,23 @@
- (void)_showPositionOfItem:(MLFile *)mediaItem
{
CGFloat position = mediaItem.lastPosition.floatValue;
self.progressView.progress = position;
self.progressView.hidden = ((position < .1f) || (position > .95f)) ? YES : NO;
[self.progressView setNeedsDisplay];
self.mediaIsUnreadView.hidden = !mediaItem.unread.intValue;
if (SYSTEM_RUNS_IOS7_OR_LATER) {
CGFloat duration = mediaItem.duration.floatValue;
if (position > .1f && position < .95f) {
[(UITextView*)self.mediaIsUnreadView setText:[NSString stringWithFormat:NSLocalizedString(@"LIBRARY_MINUTES_LEFT", @""), [[VLCTime timeWithInt:(duration * position - duration)] minuteStringValue]]];
self.mediaIsUnreadView.hidden = NO;
} else if (mediaItem.unread.intValue) {
[(UILabel *)self.mediaIsUnreadView setText:[NSLocalizedString(@"NEW", @"") capitalizedStringWithLocale:[NSLocale currentLocale]]];
self.mediaIsUnreadView.hidden = NO;
} else
self.mediaIsUnreadView.hidden = YES;
} else {
self.progressView.progress = position;
self.progressView.hidden = ((position < .1f) || (position > .95f)) ? YES : NO;
[self.progressView setNeedsDisplay];
self.mediaIsUnreadView.hidden = !mediaItem.unread.intValue;
}
}
@end
......@@ -3,12 +3,12 @@
<data>
<int key="IBDocument.SystemTarget">1536</int>
<string key="IBDocument.SystemVersion">12F45</string>
<string key="IBDocument.InterfaceBuilderVersion">4511</string>
<string key="IBDocument.InterfaceBuilderVersion">4514</string>
<string key="IBDocument.AppKitVersion">1187.40</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">3745</string>
<string key="NS.object.0">3746</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
......@@ -501,7 +501,7 @@
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1296" key="NS.object.0"/>
<real value="1552" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
......@@ -514,6 +514,6 @@
<string key="badgeUnread.png">{44, 44}</string>
<string key="thumbOverlay.png">{266, 154}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">3745</string>
<string key="IBCocoaTouchPluginVersion">3746</string>
</data>
</archive>
......@@ -86,9 +86,8 @@
MLFile *mediaObject = (MLFile*)self.mediaObject;
[self _configureForMLFile:mediaObject];
if (([keyPath isEqualToString:@"computedThumbnail"] || !keyPath) && !mediaObject.isAlbumTrack) {
if (([keyPath isEqualToString:@"computedThumbnail"] || !keyPath) && !mediaObject.isAlbumTrack)
self.thumbnailView.image = [VLCThumbnailsCache thumbnailForMediaFile:mediaObject];
}
} else if ([self.mediaObject isKindOfClass:[MLAlbum class]]) {
MLAlbum *mediaObject = (MLAlbum *)self.mediaObject;
......
......@@ -63,13 +63,13 @@
_collectionView.dataSource = self;
self.view = _collectionView;
if (SYSTEM_RUNS_IOS7_OR_LATER)
if (SYSTEM_RUNS_IOS7_OR_LATER) {
[_collectionView registerNib:[UINib nibWithNibName:@"VLCFuturePlaylistCollectionViewCell" bundle:nil] forCellWithReuseIdentifier:@"PlaylistCell"];
else
self.view.backgroundColor = [UIColor colorWithWhite:.125 alpha:1.];
} else {
[_collectionView registerNib:[UINib nibWithNibName:@"VLCPlaylistCollectionViewCell" bundle:nil] forCellWithReuseIdentifier:@"PlaylistCell"];
self.view.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"libraryBackground"]];
self.view.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"libraryBackground"]];
}
}
_libraryMode = VLCLibraryModeAllFiles;
......@@ -372,29 +372,23 @@
- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
{
if (SYSTEM_RUNS_IOS7_OR_LATER)
return CGSizeMake(334.0, 191.0);
return CGSizeMake(308.0, 174.0);
return CGSizeMake(298.0, 220.0);
}
- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section
{
if (SYSTEM_RUNS_IOS7_OR_LATER)
return UIEdgeInsetsMake(0.0, 0.0, 0.0, 0.0);
return UIEdgeInsetsMake(0.0, 34.0, 0.0, 34.0);
}
- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section
{
if (SYSTEM_RUNS_IOS7_OR_LATER)
return 0.0;
return 10.0;
}
- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section
{
if (SYSTEM_RUNS_IOS7_OR_LATER)
return 0.0;
return 10.0;
}
......
......@@ -3,12 +3,12 @@
<data>
<int key="IBDocument.SystemTarget">1536</int>
<string key="IBDocument.SystemVersion">12F45</string>
<string key="IBDocument.InterfaceBuilderVersion">4511</string>
<string key="IBDocument.InterfaceBuilderVersion">4514</string>
<string key="IBDocument.AppKitVersion">1187.40</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">3745</string>
<string key="NS.object.0">3746</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
......@@ -16,7 +16,6 @@
<string>IBUICollectionViewCell</string>
<string>IBUIImageView</string>
<string>IBUILabel</string>
<string>IBUIView</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
......@@ -42,144 +41,35 @@
<reference key="NSNextResponder" ref="541525164"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUILabel" id="457142782">
<reference key="NSNextResponder" ref="343928585"/>
<int key="NSvFlags">264</int>
<string key="NSFrame">{{-2, 62}, {300, 20}}</string>
<reference key="NSSuperview" ref="343928585"/>
<reference key="NSNextKeyView" ref="405891686"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">1</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">Artist Name</string>
<object class="NSColor" key="IBUITextColor" id="429073164">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<nil key="IBUIHighlightedColor"/>
<object class="NSColor" key="IBUIShadowColor" id="453573140">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDAAA</bytes>
<string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
</object>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">12</float>
<bool key="IBUIAdjustsLetterSpacingToFitWidth">YES</bool>
<int key="IBUITextAlignment">1</int>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">1</int>
<double key="pointSize">18</double>
</object>
<object class="NSFont" key="IBUIFont">
<string key="NSName">HelveticaNeue</string>
<double key="NSSize">18</double>
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUILabel" id="405891686">
<reference key="NSNextResponder" ref="343928585"/>
<int key="NSvFlags">264</int>
<string key="NSFrame">{{-1, 82}, {299, 28}}</string>
<reference key="NSSuperview" ref="343928585"/>
<reference key="NSNextKeyView" ref="99927648"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">Album Name</string>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC43MgA</bytes>
</object>
<nil key="IBUIHighlightedColor"/>
<reference key="IBUIShadowColor" ref="453573140"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<bool key="IBUIAdjustsLetterSpacingToFitWidth">YES</bool>
<int key="IBUITextAlignment">1</int>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="106500751">
<int key="type">1</int>
<double key="pointSize">14</double>
</object>
<object class="NSFont" key="IBUIFont" id="64307109">
<string key="NSName">HelveticaNeue</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUIImageView" id="99927648">
<reference key="NSNextResponder" ref="343928585"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{298, 167}</string>
<string key="NSFrameSize">{308, 174}</string>
<reference key="NSSuperview" ref="343928585"/>
<reference key="NSNextKeyView" ref="501792178"/>
<reference key="NSNextKeyView" ref="501713305"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<object class="IBUILabel" id="22663525">
<reference key="NSNextResponder" ref="343928585"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{6, -2}, {230, 28}}</string>
<reference key="NSSuperview" ref="343928585"/>
<reference key="NSNextKeyView" ref="699596644"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">Series Name</string>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC43MgA</bytes>
</object>
<nil key="IBUIHighlightedColor"/>
<reference key="IBUIShadowColor" ref="453573140"/>
<string key="IBUIShadowOffset">{0, 1}</string>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">9</float>
<bool key="IBUIAdjustsLetterSpacingToFitWidth">YES</bool>
<reference key="IBUIFontDescription" ref="106500751"/>
<reference key="IBUIFont" ref="64307109"/>
</object>
<object class="IBUIView" id="501792178">
<reference key="NSNextResponder" ref="343928585"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{21, 146}, {256, 12}}</string>
<reference key="NSSuperview" ref="343928585"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor" id="476951524">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<object class="IBUIImageView" id="130196590">
<object class="IBUIImageView" id="501713305">
<reference key="NSNextResponder" ref="343928585"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{-5, -6}, {308, 178}}</string>
<string key="NSFrameSize">{308, 174}</string>
<reference key="NSSuperview" ref="343928585"/>
<reference key="NSNextKeyView" ref="22663525"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="NSNextKeyView" ref="657061410"/>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">thumbOverlay.png</string>
<string key="NSResourceName">gradient-cell-ios7-ipad.png</string>
</object>
</object>
<object class="IBUIButton" id="657061410">
<reference key="NSNextResponder" ref="343928585"/>
<int key="NSvFlags">-2147483356</int>
<string key="NSFrame">{{260, 2}, {33, 29}}</string>
<int key="NSvFlags">-2147483359</int>
<string key="NSFrame">{{274, 4}, {33, 29}}</string>
<reference key="NSSuperview" ref="343928585"/>
<reference key="NSNextKeyView" ref="457142782"/>
<reference key="NSNextKeyView" ref="277463878"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
......@@ -189,7 +79,10 @@
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
</object>
<reference key="IBUIHighlightedTitleColor" ref="429073164"/>
<object class="NSColor" key="IBUIHighlightedTitleColor" id="429073164">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
......@@ -208,96 +101,100 @@
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUIImageView" id="699596644">
<object class="IBUILabel" id="277463878">
<reference key="NSNextResponder" ref="343928585"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{255, 0}, {44, 44}}</string>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{10, 125}, {288, 21}}</string>
<reference key="NSSuperview" ref="343928585"/>
<reference key="NSNextKeyView" ref="657061410"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="NSNextKeyView" ref="272776560"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">badgeUnread.png</string>
<string key="IBUIText">Title</string>
<reference key="IBUITextColor" ref="429073164"/>
<reference key="IBUIHighlightedColor" ref="429073164"/>
<string key="IBUIShadowOffset">{0, 0}</string>
<float key="IBUIMinimumFontSize">9</float>
<bool key="IBUIAdjustsLetterSpacingToFitWidth">YES</bool>
<int key="IBUILineBreakMode">0</int>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">1</int>
<double key="pointSize">15</double>
</object>
<object class="NSFont" key="IBUIFont">
<string key="NSName">HelveticaNeue</string>
<double key="NSSize">15</double>
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUIView" id="935481728">
<object class="IBUILabel" id="596496639">
<reference key="NSNextResponder" ref="343928585"/>
<int key="NSvFlags">1290</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUILabel" id="239863963">
<reference key="NSNextResponder" ref="935481728"/>
<int key="NSvFlags">1290</int>
<object class="NSPSMatrix" key="NSFrameMatrix"/>
<string key="NSFrame">{{7, 0}, {291, 26}}</string>
<reference key="NSSuperview" ref="935481728"/>
<reference key="NSNextKeyView" ref="641495548"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">Title</string>
<reference key="IBUITextColor" ref="429073164"/>
<reference key="IBUIHighlightedColor" ref="429073164"/>
<float key="IBUIMinimumFontSize">9</float>
<bool key="IBUIAdjustsLetterSpacingToFitWidth">YES</bool>
<int key="IBUILineBreakMode">0</int>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">1</int>
<double key="pointSize">17</double>
</object>
<object class="NSFont" key="IBUIFont">
<string key="NSName">HelveticaNeue</string>
<double key="NSSize">17</double>
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUILabel" id="641495548">
<reference key="NSNextResponder" ref="935481728"/>
<int key="NSvFlags">1290</int>
<object class="NSPSMatrix" key="NSFrameMatrix"/>
<string key="NSFrame">{{7, 22}, {291, 15}}</string>
<reference key="NSSuperview" ref="935481728"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">Subtitle — Subtitle</string>
<reference key="IBUITextColor" ref="429073164"/>
<reference key="IBUIHighlightedColor" ref="429073164"/>
<int key="IBUIBaselineAdjustment">0</int>
<int key="IBUILineBreakMode">0</int>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">1</int>
<double key="pointSize">12</double>
</object>
<object class="NSFont" key="IBUIFont">
<string key="NSName">HelveticaNeue</string>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
</object>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
</array>
<object class="NSPSMatrix" key="NSFrameMatrix"/>
<string key="NSFrame">{{0, 124}, {298, 43}}</string>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{228, 150}, {70, 15}}</string>
<reference key="NSSuperview" ref="343928585"/>
<reference key="NSNextKeyView" ref="239863963"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC43NDY1OTE5OTYyIDAuNzQ2NTkxOTk2MiAwLjc0NjU5MTk5NjIAA</bytes>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">New</string>
<reference key="IBUITextColor" ref="429073164"/>
<reference key="IBUIHighlightedColor" ref="429073164"/>
<string key="IBUIShadowOffset">{0, 0}</string>
<float key="IBUIMinimumFontSize">9</float>
<bool key="IBUIAdjustsLetterSpacingToFitWidth">YES</bool>
<int key="IBUITextAlignment">2</int>
<int key="IBUILineBreakMode">0</int>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">1</int>
<double key="pointSize">12</double>
</object>
<float key="IBUIAlpha">0.80000001192092896</float>
<object class="NSFont" key="IBUIFont">
<string key="NSName">HelveticaNeue</string>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUILabel" id="272776560">
<reference key="NSNextResponder" ref="343928585"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{10, 150}, {260, 15}}</string>
<reference key="NSSuperview" ref="343928585"/>
<reference key="NSNextKeyView" ref="596496639"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">Subtitle — Subtitle</string>
<reference key="IBUITextColor" ref="429073164"/>
<reference key="IBUIHighlightedColor" ref="429073164"/>
<string key="IBUIShadowOffset">{0, 0}</string>
<int key="IBUIBaselineAdjustment">0</int>
<int key="IBUILineBreakMode">0</int>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<string key="name">HelveticaNeue-Light</string>
<string key="family">Helvetica Neue</string>
<int key="traits">0</int>
<double key="pointSize">12</double>
</object>
<object class="NSFont" key="IBUIFont">
<string key="NSName">HelveticaNeue-Light</string>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
</object>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
</array>
<string key="NSFrameSize">{298, 167}</string>
<string key="NSFrameSize">{308, 174}</string>
<reference key="NSSuperview" ref="541525164"/>
<reference key="NSNextKeyView" ref="130196590"/>
<reference key="IBUIBackgroundColor" ref="476951524"/>
<reference key="NSNextKeyView" ref="99927648"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">4</int>
......@@ -305,7 +202,7 @@
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
</array>
<string key="NSFrameSize">{298, 167}</string>
<string key="NSFrameSize">{308, 174}</string>
<reference key="NSNextKeyView" ref="343928585"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -324,38 +221,6 @@
<object class="IBObjectContainer" key="IBDocument.Objects">
<bool key="usesAutoincrementingIDs">NO</bool>
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">albumNameLabel</string>
<reference key="source" ref="541525164"/>
<reference key="destination" ref="405891686"/>
</object>
<string key="id">39</string>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">artistNameLabel</string>
<reference key="source" ref="541525164"/>
<reference key="destination" ref="457142782"/>
</object>
<string key="id">40</string>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">mediaIsUnreadView</string>
<reference key="source" ref="541525164"/>
<reference key="destination" ref="699596644"/>
</object>
<string key="id">41</string>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">progressView</string>
<reference key="source" ref="541525164"/>
<reference key="destination" ref="501792178"/>
</object>
<string key="id">42</string>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">removeMediaButton</string>
......@@ -364,14 +229,6 @@
</object>
<string key="id">43</string>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">seriesNameLabel</string>
<reference key="source" ref="541525164"/>
<reference key="destination" ref="22663525"/>
</object>