Commit e3929f53 authored by Felix Paul Kühne's avatar Felix Paul Kühne

playback: ensure we don't show a stray audio-only appearance briefly and that...

playback: ensure we don't show a stray audio-only appearance briefly and that the displayed artist name isn't botchered while searching for artwork and bio
parent 41c8154d
......@@ -54,8 +54,6 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
- (void)viewDidLoad
{
[super viewDidLoad];
self.extendedLayoutIncludesOpaqueBars = YES;
self.edgesForExtendedLayout = UIRectEdgeAll;
......@@ -118,13 +116,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
self.simultaneousGestureRecognizers = simultaneousGestureRecognizers;
self.audioView.hidden = YES;
self.audioDescriptionTextView.text = nil;
self.audioTitleLabel.text = nil;
self.audioArtworkImageView.image = [UIImage imageNamed:@"about-app-icon"];
self.audioLargeBackgroundImageView.image = [UIImage imageNamed:@"about-app-icon"];
self.audioArtworkImageView.animateImageSetting = YES;
self.audioLargeBackgroundImageView.animateImageSetting = YES;
[super viewDidLoad];
}
- (void)didReceiveMemoryWarning
......@@ -139,6 +131,16 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
{
[super viewWillAppear:animated];
self.audioView.hidden = YES;
self.audioDescriptionTextView.text = @"";
self.audioTitleLabel.text = @"";
self.audioArtistLabel.text = @"";
self.audioAlbumNameLabel.text = @"";
self.audioArtworkImageView.image = [UIImage imageNamed:@"about-app-icon"];
self.audioLargeBackgroundImageView.image = [UIImage imageNamed:@"about-app-icon"];
self.audioArtworkImageView.animateImageSetting = YES;
self.audioLargeBackgroundImageView.animateImageSetting = YES;
VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
vpc.delegate = self;
[vpc recoverPlaybackState];
......@@ -688,11 +690,6 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
[UIView animateWithDuration:.3 animations:^{
self.bufferingLabel.hidden = YES;
}];
if (controller.audioOnlyPlaybackSession) {
[UIView animateWithDuration:.3 animations:^{
self.audioView.hidden = NO;
}];
}
}
}
......@@ -758,6 +755,9 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
} else
[self.audioMetaDataFetcher searchForArtist:artist];
}
[UIView animateWithDuration:0.3 animations:^{
self.audioView.hidden = NO;
}];
} else if (!self.audioView.hidden) {
[self.audioMetaDataFetcher cancelAllRequests];
self.audioView.hidden = YES;
......@@ -806,7 +806,6 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
[self _simplifyMetaDataSearchString:searchRequest];
return;
}
self.audioArtistLabel.text = artist.name;
if (artist.biography) {
[self scrollAudioDescriptionAnimationToTop];
[UIView animateWithDuration:.3 animations:^{
......@@ -845,6 +844,9 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
- (void)MDFHatchetFetcher:(MDFHatchetFetcher *)aFetcher didFailToFindAlbum:(NSString *)albumName forArtistName:(NSString *)artistName
{
APLog(@"%s: %@ %@", __PRETTY_FUNCTION__, artistName, albumName);
UIImage *dummyImage = [UIImage imageNamed:@"about-app-icon"];
self.audioArtworkImageView.image = dummyImage;
self.audioLargeBackgroundImageView.image = dummyImage;
}
- (void)MDFHatchetFetcher:(MDFHatchetFetcher *)aFetcher didFindArtist:(MDFArtist *)artist forSearchRequest:(NSString *)searchRequest
......@@ -854,7 +856,6 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
[self _simplifyMetaDataSearchString:searchRequest];
return;
}
self.audioArtistLabel.text = artist.name;
if (artist.biography) {
[self scrollAudioDescriptionAnimationToTop];
[UIView animateWithDuration:.3 animations:^{
......@@ -894,6 +895,9 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
- (void)MDFHatchetFetcher:(MDFHatchetFetcher *)aFetcher didFailToFindArtistForSearchRequest:(NSString *)searchRequest
{
APLog(@"%s: %@", __PRETTY_FUNCTION__, searchRequest);
UIImage *dummyImage = [UIImage imageNamed:@"about-app-icon"];
self.audioArtworkImageView.image = dummyImage;
self.audioLargeBackgroundImageView.image = dummyImage;
}
- (void)scrollAudioDescriptionAnimationToTop
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment