Merge pull request #10 from Sigmapoint/develop

Fixed page calculation, added notification block
Marxon13 · Jun 26, 2015 · 976da11 · 976da11
2 parents de99828 + d94dc77
commit 976da11
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/Classes/View/PDFKBasicPDFViewer.h b/Classes/View/PDFKBasicPDFViewer.h
@@ -16,6 +16,8 @@
 #import <UIKit/UIKit.h>
 @class PDFKDocument;
 
+typedef void (^PDFKBasicPDFViewerPageChangeBlock)(NSUInteger page);
+
 @interface PDFKBasicPDFViewer : UIViewController
 
 /**@name Initalization*/
@@ -45,6 +47,8 @@
 
 /**@name Properties*/
 
+@property (nonatomic, strong) PDFKBasicPDFViewerPageChangeBlock pageChangeBlock;
+
 @property (nonatomic, strong, readonly) PDFKDocument *document;
 
 /**@name Features*/

diff --git a/Classes/View/PDFKBasicPDFViewer.m b/Classes/View/PDFKBasicPDFViewer.m
@@ -435,7 +435,7 @@ - (void)toggleShowBookmarks:(id)sender
 
 - (void)thumbCollectionView:(PDFKBasicPDFViewerThumbsCollectionView *)thumbsCollectionView didSelectPage:(NSUInteger)page
 {
-    [self.pageCollectionView displayPage:page animated:NO];
+    [self.pageCollectionView displayPage:page animated:YES];
     self.document.currentPage = page;
     [self.pageScrubber updateScrubber];
     [self toggleSinglePageView];
@@ -453,6 +453,10 @@ - (void)singlePageCollectionView:(PDFKBasicPDFViewerSinglePageCollectionView *)c
     self.document.currentPage = page;
     [self.pageScrubber updateScrubber];
     [self resetNavigationToolbar];
+
+    if (_pageChangeBlock) {
+        _pageChangeBlock(page);
+    }
 }
 
 - (void)nextPage

diff --git a/Classes/View/PDFKBasicPDFViewerSinglePageCollectionView.m b/Classes/View/PDFKBasicPDFViewerSinglePageCollectionView.m
@@ -100,9 +100,16 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
 
 - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
 {
-    //Get the current cell and notify the delegate
-    NSIndexPath *indexPath = [self indexPathsForVisibleItems][0];
-    NSUInteger page = indexPath.row + 1;
+    //Get the current page and notify the delegate
+    NSUInteger page = (scrollView.contentOffset.x + scrollView.frame.size.width) / scrollView.frame.size.width;
+
+    [_singlePageDelegate singlePageCollectionView:self didDisplayPage:page];
+}
+
+- (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView
+{
+    //Get the current page and notify the delegate
+    NSUInteger page = (scrollView.contentOffset.x + scrollView.frame.size.width) / scrollView.frame.size.width;
 
     [_singlePageDelegate singlePageCollectionView:self didDisplayPage:page];
 }