Commit 6bad00fc authored by Felix Paul Kühne's avatar Felix Paul Kühne

ATV: re-write audio playback appearance from scratch

parent 278de66d
......@@ -31,6 +31,4 @@ pod 'box-ios-sdk-v2', :git => 'git://github.com/fkuehne/box-ios-sdk-v2.git' #has
pod 'upnpx', '~>1.3.6'
pod 'CocoaHTTPServer', :git => 'git://github.com/fkuehne/CocoaHTTPServer.git' # has our fixes
pod 'MetaDataFetcherKit', '~>0.1.5'
pod 'MSWeakTimer', :git => 'git://github.com/fkuehne/MSWeakTimer.git' #has tvOS support added
pod 'JSAnimatedImagesView', :git => 'git://github.com/fkuehne/JSAnimatedImagesView.git' #has tvOS support added
end
......@@ -20,10 +20,8 @@ PODS:
- CocoaHTTPServer (2.3)
- HockeySDK (3.6.4)
- InAppSettingsKit (2.2.2)
- JSAnimatedImagesView (1.0.1)
- MetaDataFetcherKit (0.1.5):
- AFNetworking (= 3.0.0-beta.1)
- MSWeakTimer (1.1.1)
- OBSlider (1.1.0)
- RESideMenu (4.0.7)
- SSKeychain (1.2.3)
......@@ -35,9 +33,7 @@ DEPENDENCIES:
- HockeySDK (~> 3.6.4)
- InAppSettingsKit (from `git://github.com/fkuehne/InAppSettingsKit.git`, commit
`415ea6bb`)
- JSAnimatedImagesView (from `git://github.com/fkuehne/JSAnimatedImagesView.git`)
- MetaDataFetcherKit (~> 0.1.5)
- MSWeakTimer (from `git://github.com/fkuehne/MSWeakTimer.git`)
- OBSlider (= 1.1.0)
- RESideMenu (~> 4.0.7)
- SSKeychain (from `git://github.com/fkuehne/sskeychain.git`)
......@@ -51,10 +47,6 @@ EXTERNAL SOURCES:
InAppSettingsKit:
:commit: 415ea6bb
:git: git://github.com/fkuehne/InAppSettingsKit.git
JSAnimatedImagesView:
:git: git://github.com/fkuehne/JSAnimatedImagesView.git
MSWeakTimer:
:git: git://github.com/fkuehne/MSWeakTimer.git
SSKeychain:
:git: git://github.com/fkuehne/sskeychain.git
......@@ -68,12 +60,6 @@ CHECKOUT OPTIONS:
InAppSettingsKit:
:commit: 415ea6bb
:git: git://github.com/fkuehne/InAppSettingsKit.git
JSAnimatedImagesView:
:commit: fd203bc32fedccc4589afb72974b7b1a9edf79f3
:git: git://github.com/fkuehne/JSAnimatedImagesView.git
MSWeakTimer:
:commit: 12a962bf2feaf219a044ccfa06b380f5b3ab26ee
:git: git://github.com/fkuehne/MSWeakTimer.git
SSKeychain:
:commit: a8e9b21f96adf1ec296e51778ef137f0ea3bd078
:git: git://github.com/fkuehne/sskeychain.git
......@@ -84,9 +70,7 @@ SPEC CHECKSUMS:
CocoaHTTPServer: 07df8b05a8bde406fe367d22c90a24a2fd4ca49f
HockeySDK: c07cdd580296737edcd0963e292c19885a53f563
InAppSettingsKit: 76d5cfbaa3e3f8aa53fe3628516da7eb1aa6a5cb
JSAnimatedImagesView: ad2d21873490d3e675cbe8e49954dfd9495bdcec
MetaDataFetcherKit: be17957a9498740bc34329a7e8295e930800884a
MSWeakTimer: 08188e0ae3f8eafcc31b95639565543c3c03cda6
OBSlider: 490f108007bfdd5414a38650b211fe403a95b8a0
RESideMenu: f24c508404b49c667344c54aba7e590883533958
SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
......
......@@ -18,5 +18,6 @@
@property (nonatomic) NSURLSessionDataTask *downloadTask;
- (void)setImageWithURL:(NSURL *)url;
- (void)cancelLoading;
@property (nonatomic, readwrite) BOOL animateImageSetting;
@end
......@@ -59,7 +59,12 @@ static NSCache *sharedImageCache = nil;
[[NSOperationQueue mainQueue] addOperationWithBlock:^{
__strong typeof(weakSelf) strongSelf = weakSelf;
if ([strongSelf.downloadTask.originalRequest.URL isEqual:url]) {
strongSelf.image = image;
if (strongSelf.animateImageSetting) {
[UIView animateWithDuration:.3 animations:^{
strongSelf.image = image;
}];
} else
strongSelf.image = image;
strongSelf.downloadTask = nil;
}
}];
......
......@@ -14,6 +14,8 @@
#import "VLCPlaybackController.h"
#import "VLCTransportBar.h"
@class VLCNetworkImageView;
@interface VLCFullscreenMovieTVViewController : UIViewController <VLCPlaybackControllerDelegate>
@property (readwrite, nonatomic, weak) IBOutlet UIView *movieView;
......@@ -25,6 +27,15 @@
@property (readwrite, nonatomic, weak) IBOutlet UIActivityIndicatorView *activityIndicator;
@property (readwrite, nonatomic, weak) IBOutlet UIView *dimmingView;
@property (readwrite, nonatomic, weak) IBOutlet UIView *audioView;
@property (readwrite, nonatomic, weak) IBOutlet VLCNetworkImageView *audioLargeBackgroundImageView;
@property (readwrite, nonatomic, weak) IBOutlet UIVisualEffectView *audioVisualEffectView;
@property (readwrite, nonatomic, weak) IBOutlet VLCNetworkImageView *audioArtworkImageView;
@property (readwrite, nonatomic, weak) IBOutlet UILabel *audioTitleLabel;
@property (readwrite, nonatomic, weak) IBOutlet UILabel *audioArtistLabel;
@property (readwrite, nonatomic, weak) IBOutlet UILabel *audioAlbumNameLabel;
@property (readwrite, nonatomic, weak) IBOutlet UITextView *audioDescriptionTextView;
+ (instancetype) fullscreenMovieTVViewController;
@end
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