Merge pull request #2 from ericpinet/CurrentPlayingSongToolbar

CurrentPlayingSongToolbar
UnicorneCloud · Jan 11, 2018 · d2cc4f5 · d2cc4f5
2 parents c36dd80 + ff1f55a
commit d2cc4f5
Show file tree

Hide file tree

Showing 79 changed files with 3,071 additions and 2,262 deletions.
diff --git a/MusicPutt.xcodeproj/project.pbxproj b/MusicPutt.xcodeproj/project.pbxproj
@@ -1167,6 +1167,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEVELOPMENT_TEAM = NU5E6U97UG;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "MusicPutt/MusicPutt-Prefix.pch";
@@ -1209,6 +1210,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEVELOPMENT_TEAM = NU5E6U97UG;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "MusicPutt/MusicPutt-Prefix.pch";

diff --git a/MusicPutt/Base.lproj/Main.storyboard b/MusicPutt/Base.lproj/Main.storyboard
diff --git a/MusicPutt/MPDataManager.h b/MusicPutt/MPDataManager.h
@@ -15,6 +15,7 @@
 @class CMMotionManager;
 @class Playlist;
 @class BFNavigationBarDrawer;
+@class iToolbar;
 
 /**
  * MPDataManager is the main application data manager. This class maintain all data for
@@ -36,7 +37,7 @@
 /**
  *  Toolbar displayed when playlist is editing.
  */
-@property (strong, nonatomic) BFNavigationBarDrawer*  currentEditingPlaylistToolbar;
+@property (strong, nonatomic) iToolbar*  currentEditingPlaylistToolbar;
 
 /**
  *  Current selected itunes playlist select in the playlist navigation bar.

diff --git a/MusicPutt/MPDataManager.m b/MusicPutt/MPDataManager.m
@@ -14,6 +14,7 @@
 #import "ITunesSearchApi.h"
 #import "MusicPuttApi.h"
 #import "MPListening.h"
+#import <BFNavigationBarDrawer.h>
 
 #import <MediaPlayer/MPMusicPlayerController.h>
 #import <CoreMotion/CoreMotion.h>
@@ -57,7 +58,7 @@ -(bool) initialise
     currentPlayingToolbarMustBeHidden = false;
 
     // init current editing playlist toolbar
-    _currentEditingPlaylistToolbar = [[BFNavigationBarDrawer alloc] init];
+    _currentEditingPlaylistToolbar = [[iToolbar alloc] init];
 
     // the initial state of playlist editing mode is FALSE:
     playlistEditing = false;

diff --git a/MusicPutt/MusicPutt-Info.plist b/MusicPutt/MusicPutt-Info.plist
@@ -21,29 +21,31 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0</string>
+	<string>2.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>NSAppleMusicUsageDescription</key>
+	<string>Play your music</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIRequiresFullScreen</key>
+	<false/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
-	<key>NSAppleMusicUsageDescription</key>
-	<string>Play your music</string>
-	<key>NSAppTransportSecurity</key>
-        <dict>
-         <key>NSAllowsArbitraryLoads</key>
-         <true/>
-        </dict>
 </dict>
 </plist>
diff --git a/MusicPutt/REFrostedViewControllerMain.m b/MusicPutt/REFrostedViewControllerMain.m
@@ -27,7 +27,7 @@ @implementation REFrostedViewControllerMain
 - (void)awakeFromNib
 {
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 
     //self.liveBlur = TRUE;
 

diff --git a/MusicPutt/UICurrentPlayingToolBar.h b/MusicPutt/UICurrentPlayingToolBar.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Eric Pinet. All rights reserved.
 //
 
-#import "BFNavigationBarDrawer.h"
+#import <iToolbar.h>
 
 #import "UIViewCurrentToolBar.h"
 
@@ -16,7 +16,7 @@
  *  This toolbar can display current playing song. 
  * @see UIViewCurrentToolBar.h
  */
-@interface UICurrentPlayingToolBar : BFNavigationBarDrawer
+@interface UICurrentPlayingToolBar : iToolbar
 {
     UIViewCurrentToolBar *view;
 }

diff --git a/MusicPutt/UICurrentPlayingToolBar.m b/MusicPutt/UICurrentPlayingToolBar.m
@@ -30,23 +30,12 @@ - (id)initWithFrame:(CGRect)frame
         // Initialization code
 
         // setup app delegate
-        self.del = [[UIApplication sharedApplication] delegate];
+        self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 
-        NSMutableArray *barItems = [[NSMutableArray alloc] init];
-        UIBarButtonItem *flexSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:self action:nil];
-        [barItems addObject:flexSpace];
-
-        UINib *nib = [UINib nibWithNibName:@"UIViewCurrentPlayingToolBar" bundle:nil];
-        view = [[nib instantiateWithOwner:self options:nil] objectAtIndex:0];
-        [view setBackgroundColor:[UIColor clearColor]];
-        UIBarButtonItem *customViewContainer = [[UIBarButtonItem alloc] initWithCustomView:view];
-
-        [barItems addObject:customViewContainer];
-
-        UIBarButtonItem *flexSpace2 = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:self action:nil];
-        [barItems addObject:flexSpace2];
-
-        [self setItems:barItems animated:YES];
+        view = [[[NSBundle mainBundle] loadNibNamed:@"UIViewCurrentPlayingToolBar" owner:nil options:nil] objectAtIndex:0];
+        [view setBackgroundColor:UIColor.clearColor];
+        [self setContentView:view];
+        [self layoutIfNeeded];
     }
     return self;
 }
@@ -57,7 +46,8 @@ -(void)dealloc {
 - (void) setNavigationController:(UINavigationController*) controller;
 {
     self->navController = controller;
-    [view setNavigationController:navController];
+    [view setNavigationController:self->navController];
+    [self setParentNavbar:(iNavigationBar*)controller.navigationBar];
 }
 
 - (id)init
@@ -66,34 +56,11 @@ - (id)init
     return self;
 }
 
-- (void)setupConstraintsWithNavigationBar:(UINavigationBar *)bar {
-	NSLayoutConstraint *constraint;
-	constraint = [NSLayoutConstraint constraintWithItem:self
-											  attribute:NSLayoutAttributeLeft
-											  relatedBy:NSLayoutRelationEqual
-												 toItem:bar
-											  attribute:NSLayoutAttributeLeft
-											 multiplier:1
-											   constant:0];
-	[self.superview addConstraint:constraint];
-
-	constraint = [NSLayoutConstraint constraintWithItem:self
-											  attribute:NSLayoutAttributeRight
-											  relatedBy:NSLayoutRelationEqual
-												 toItem:bar
-											  attribute:NSLayoutAttributeRight
-											 multiplier:1
-											   constant:0];
-	[self.superview addConstraint:constraint];
-
-	constraint = [NSLayoutConstraint constraintWithItem:self
-											  attribute:NSLayoutAttributeHeight
-											  relatedBy:NSLayoutRelationEqual
-												 toItem:nil
-											  attribute:NSLayoutAttributeNotAnAttribute
-											 multiplier:1
-											   constant:60];
-	[self addConstraint:constraint];
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    // Triggered when touch is released
+    [self hideAnimated:false];
+    [view viewPressed];
 }
 
 /**
@@ -105,7 +72,7 @@ - (void)setupConstraintsWithNavigationBar:(UINavigationBar *)bar {
 - (void)showFromNavigationBar:(UINavigationBar *)bar animated:(BOOL)animated
 {
     [view updateCurrentPlayingItem];
-    [super showFromNavigationBar:bar animated:animated];
+    [super show:animated];
     [view startNotificationCapture];
 }
 
@@ -116,7 +83,7 @@ - (void)showFromNavigationBar:(UINavigationBar *)bar animated:(BOOL)animated
  */
 - (void)hideAnimated:(BOOL)animated
 {
-    [super hideAnimated:animated];
+    [super hide:animated];
     [view stopNotificationCapture];
 }
 

diff --git a/MusicPutt/UITabBarControllerMain.m b/MusicPutt/UITabBarControllerMain.m
@@ -36,7 +36,7 @@ - (void)viewDidLoad
     // Do any additional setup after loading the view.
 
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
     self.del.mpdatamanager.tabbar = self;
 
     // setup current navigation controller

diff --git a/MusicPutt/UITableViewCellAlbum.m b/MusicPutt/UITableViewCellAlbum.m
@@ -33,7 +33,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
 - (void)awakeFromNib
 {
     // Initialization code
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated

diff --git a/MusicPutt/UITableViewCellArtist.m b/MusicPutt/UITableViewCellArtist.m
@@ -33,7 +33,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
 - (void)awakeFromNib
 {
     // Initialization code
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 }
 
 /**

diff --git a/MusicPutt/UITableViewCellArtistAlbum.m b/MusicPutt/UITableViewCellArtistAlbum.m
@@ -41,7 +41,7 @@ - (void)setSelected:(BOOL)selected animated:(BOOL)animated
     [super setSelected:selected animated:animated];
 
     // Configure the view for the selected state
-    self.del = [[UIApplication sharedApplication] delegate];    
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 }
 
 /**

diff --git a/MusicPutt/UITableViewCellFeature.m b/MusicPutt/UITableViewCellFeature.m
@@ -57,7 +57,7 @@ - (void)awakeFromNib
     // Initialization code
 
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 
     // active tap gesture on title label
     _title.userInteractionEnabled = YES;

diff --git a/MusicPutt/UITableViewCellMediaItem.m b/MusicPutt/UITableViewCellMediaItem.m
@@ -29,7 +29,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         // Initialization code
 
         // setup app delegate
-        self.del = [[UIApplication sharedApplication] delegate];
+        self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
     }
     return self;
 }
@@ -39,7 +39,7 @@ - (void)awakeFromNib
     // Initialization code
 
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated

diff --git a/MusicPutt/UITableViewCellPlaylist.m b/MusicPutt/UITableViewCellPlaylist.m
@@ -40,7 +40,7 @@ - (void)awakeFromNib
     // Initialization code
 
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated

diff --git a/MusicPutt/UITableViewCellPlaylistSong.m b/MusicPutt/UITableViewCellPlaylistSong.m
@@ -36,7 +36,7 @@ - (void)awakeFromNib
     // Initialization code
 
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated

diff --git a/MusicPutt/UITableViewControllerMenu.m b/MusicPutt/UITableViewControllerMenu.m
@@ -39,7 +39,7 @@ - (void)viewDidLoad
     [super viewDidLoad];
 
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 
     self.tableView.opaque = NO;
     self.tableView.backgroundColor = [UIColor clearColor];

diff --git a/MusicPutt/UIViewControllerAbout.m b/MusicPutt/UIViewControllerAbout.m
@@ -46,7 +46,7 @@ - (void)viewDidLoad
     // Do any additional setup after loading the view.
 
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 
     // setup title
     [self setTitle:@"About"];

diff --git a/MusicPutt/UIViewControllerAlbum.m b/MusicPutt/UIViewControllerAlbum.m
@@ -39,7 +39,7 @@ - (void)viewDidLoad
     // Do any additional setup after loading the view.
 
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 
     // setup title
     [self setTitle:@"Albums"];

diff --git a/MusicPutt/UIViewControllerAlbumPage.m b/MusicPutt/UIViewControllerAlbumPage.m
@@ -74,7 +74,7 @@ - (void)viewDidLoad
     // Do any additional setup after loading the view.
 
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 
     // Create blur effect
     UIToolbar *blurtoolbar = [[UIToolbar alloc] initWithFrame:self.view.frame];

diff --git a/MusicPutt/UIViewControllerAlbumSongs.m b/MusicPutt/UIViewControllerAlbumSongs.m
@@ -64,7 +64,7 @@ - (void)viewDidLoad
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 
     albumCollection = [[self.del mpdatamanager] currentAlbumCollection];
     songs = [albumCollection items];

diff --git a/MusicPutt/UIViewControllerAlbumStore.m b/MusicPutt/UIViewControllerAlbumStore.m
@@ -43,7 +43,7 @@ - (void)viewDidLoad {
     // Do any additional setup after loading the view.
 
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 
     // setup title
     [self setTitle:@"Store"];

diff --git a/MusicPutt/UIViewControllerArtist.m b/MusicPutt/UIViewControllerArtist.m
@@ -47,7 +47,7 @@ - (void)viewDidLoad
     // Do any additional setup after loading the view.
 
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 
     // setup title
     [self setTitle:@"Artists"];

diff --git a/MusicPutt/UIViewControllerArtistAlbum.m b/MusicPutt/UIViewControllerArtistAlbum.m
@@ -48,7 +48,7 @@ - (void)viewDidLoad
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 
     artistCollection = [[self.del mpdatamanager] currentArtistCollection];
 

diff --git a/MusicPutt/UIViewControllerFeature.m b/MusicPutt/UIViewControllerFeature.m
@@ -86,7 +86,7 @@ - (void)viewDidLoad
     // Do any additional setup after loading the view.
 
     // setup app delegate
-    self.del = [[UIApplication sharedApplication] delegate];
+    self.del = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 
     // setup title
     [self setTitle:@"Feature"];
@@ -129,8 +129,6 @@ - (void)viewDidLoad
 
                                                    if (musicPuttTracks.count>=4) {
                                                        results = musicPuttTracks;
-
-
                                                        UITableViewCellFeature* cell = (UITableViewCellFeature*)[_tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:_MUSICPUTT_CELL_INDEX_ inSection:0]];
                                                        if(cell)
                                                        {
@@ -165,6 +163,7 @@ - (void)viewDidLoad
                                                    }
                                                }
                                                failure:^(NSError* error){
+                                                   musicPuttReadyToFlip = true;
                                                    NSLog(@" %s - %@\n", __PRETTY_FUNCTION__, @"MusicPutt request failed");
                                                }];