Bounds check when pulling item for page. Preemptive return if no image v...

MHVideoPhotoGallery/MMHVideoPhotoGallery/MHGallery/MHGallery.h

@@ -43,6 +43,8 @@ extern UIImage  *MHGalleryImage(NSString *imageName);
 
 extern UIView  *MHStatusBar(void);
 
+extern CGFloat MHToolbarHeightForOrientation(UIInterfaceOrientation orientation);
+
 extern NSString *const MHYoutubeChannel;
 extern NSString *const MHGalleryViewModeShare;
 extern NSString *const MHVimeoVideoBaseURL;

MHVideoPhotoGallery/MMHVideoPhotoGallery/MHGallery/MHGallery.m

@@ -66,6 +66,17 @@
     return statusBar;
 }
 
+CGFloat MHToolbarHeightForOrientation(UIInterfaceOrientation orientation) {
+    CGFloat toolbarHeight = 44.0f;
+
+    if (!MHISIPAD) {
+        if (UIInterfaceOrientationIsLandscape(orientation)) {
+            toolbarHeight = 32.0f;
+        }
+    }
+
+    return toolbarHeight;
+}
 
 UIImage *MHTemplateImage(NSString *imageName){
     return [MHGalleryImage(imageName) imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];

MHVideoPhotoGallery/MMHVideoPhotoGallery/MHGalleryController/MHGalleryController.m

@@ -56,8 +56,13 @@ -(void)setInteractivePresentationTransition:(MHTransitionPresentMHGallery *)inte
 }
 
 -(MHGalleryItem *)itemForIndex:(NSInteger)index{
+    if (index < 0 || index >= self.galleryItems.count) {
+        return nil;
+    }
+
     return self.galleryItems[index];
 }
+
 -(NSInteger)numberOfItemsInGallery:(MHGalleryController *)galleryController{
     return self.galleryItems.count;
 }

MHVideoPhotoGallery/MMHVideoPhotoGallery/MHGalleryImageViewerViewController/MHGalleryImageViewerViewController.m

@@ -134,10 +134,10 @@ -(void)viewDidLoad{
     [self.pageViewController didMoveToParentViewController:self];
     [self.view addSubview:self.pageViewController.view];
 
-    self.toolbar = [UIToolbar.alloc initWithFrame:CGRectMake(0, self.view.frame.size.height-44, self.view.frame.size.width, 44)];
+    self.toolbar = [UIToolbar.alloc initWithFrame:CGRectMake(0, self.view.frame.size.height-MHToolbarHeightForOrientation(self.currentOrientation), self.view.frame.size.width, MHToolbarHeightForOrientation(self.currentOrientation))];
     if(self.currentOrientation == UIInterfaceOrientationLandscapeLeft || self.currentOrientation == UIInterfaceOrientationLandscapeRight){
         if (self.view.bounds.size.height > self.view.bounds.size.width) {
-            self.toolbar.frame = CGRectMake(0, self.view.frame.size.width-44, self.view.frame.size.height, 44);
+            self.toolbar.frame = CGRectMake(0, self.view.frame.size.width-MHToolbarHeightForOrientation(self.currentOrientation), self.view.frame.size.height, MHToolbarHeightForOrientation(self.currentOrientation));
         }
     }
 
@@ -435,6 +435,10 @@ -(void)leftPressed:(id)sender{
         self.leftBarButton.enabled = NO;
     }
 
+    if (!imageViewController) {
+        return;
+    }
+
     __weak typeof(self) weakSelf = self;
 
     [self.pageViewController setViewControllers:@[imageViewController] direction:UIPageViewControllerNavigationDirectionReverse animated:YES completion:^(BOOL finished) {
@@ -455,6 +459,11 @@ -(void)rightPressed:(id)sender{
     if (indexPage+1 == self.numberOfGalleryItems-1) {
         self.rightBarButton.enabled = NO;
     }
+
+    if (!imageViewController) {
+        return;
+    }
+
     __weak typeof(self) weakSelf = self;
 
     [self.pageViewController setViewControllers:@[imageViewController] direction:UIPageViewControllerNavigationDirectionForward animated:YES completion:^(BOOL finished) {
@@ -523,7 +532,7 @@ - (UIViewController *)pageViewController:(UIPageViewController *)pvc viewControl
 }
 
 -(void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration{
-    self.toolbar.frame = CGRectMake(0, self.view.frame.size.height-44, self.view.frame.size.width, 44);
+    self.toolbar.frame = CGRectMake(0, self.view.frame.size.height-MHToolbarHeightForOrientation(self.currentOrientation), self.view.frame.size.width, MHToolbarHeightForOrientation(self.currentOrientation));
     self.pageViewController.view.bounds = self.view.bounds;
     [self.pageViewController.view.subviews.firstObject setFrame:CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height) ];
 

MHVideoPhotoGallery/MMHVideoPhotoGallery/MHMediaPreviewCollectionViewCell/MHMediaPreviewCollectionViewCell.m

@@ -79,6 +79,8 @@ -(void)setGalleryItem:(MHGalleryItem *)galleryItem{
 
     __weak typeof(self) weakSelf = self;
 
+    [self.activityIndicator startAnimating];
+
     if (galleryItem.galleryType == MHGalleryTypeVideo) {
         [MHGallerySharedManager.sharedManager startDownloadingThumbImage:galleryItem.URLString
                                                             successBlock:^(UIImage *image,NSUInteger videoDuration,NSError *error) {
@@ -97,6 +99,8 @@ -(void)setGalleryItem:(MHGalleryItem *)galleryItem{
                                                             }];
     }else{
         [self.thumbnail setImageForMHGalleryItem:galleryItem imageType:MHImageTypeThumb successBlock:^(UIImage *image, NSError *error) {
+            [weakSelf.activityIndicator stopAnimating];
+
             if (!image) {
                 weakSelf.thumbnail.backgroundColor = UIColor.whiteColor;
                 weakSelf.thumbnail.image = MHGalleryImage(@"error");

MHVideoPhotoGallery/MMHVideoPhotoGallery/Transitions/MHTransitionShowDetail.m

@@ -54,9 +54,10 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
     UITextView *descriptionLabel = toViewController.descriptionView;
     descriptionLabel.alpha =0;
 
+    CGFloat toolbarHeight = MHToolbarHeightForOrientation([UIApplication sharedApplication].statusBarOrientation);
     UIToolbar *tb = toViewController.toolbar;
     tb.alpha =0;
-    tb.frame = CGRectMake(0, toViewController.view.frame.size.height-44, toViewController.view.frame.size.width , 44);
+    tb.frame = CGRectMake(0, toViewController.view.frame.size.height-toolbarHeight, toViewController.view.frame.size.width, toolbarHeight);
 
     UIToolbar *descriptionViewBackground = toViewController.descriptionViewBackground;
     descriptionViewBackground.alpha =0;

MHVideoPhotoGallery/MMHVideoPhotoGallery/Transitions/MHTransitionShowShareView.m

@@ -127,10 +127,8 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
 
         [containerView addSubview:toViewController.view];
 
-
-
-
-        toViewController.toolbar.frame = CGRectMake(0, fromViewController.view.frame.size.height-44, fromViewController.view.frame.size.width, 44);
+        CGFloat toolbarHeight = MHToolbarHeightForOrientation([UIApplication sharedApplication].statusBarOrientation);
+        toViewController.toolbar.frame = CGRectMake(0, fromViewController.view.frame.size.height-toolbarHeight, fromViewController.view.frame.size.width, toolbarHeight);
         MHGalleryController *galleryController = (MHGalleryController*)fromViewController.navigationController;
         MHGalleryItem *item = [galleryController.dataSource itemForIndex:toViewController.pageIndex];
         [toViewController updateToolBarForItem:item];