Add logic to navigate between chapter indexes

Author: sendyhalim

Yomu/Controllers/ChapterPageCollectionViewController.swift

@@ -18,6 +18,7 @@ class ChapterPageCollectionViewController: NSViewController {
   @IBOutlet weak var collectionView: NSCollectionView!
   @IBOutlet weak var close: NSButton!
   @IBOutlet weak var readingProgress: NSTextField!
+  @IBOutlet weak var pageCount: NSTextField!
   @IBOutlet weak var zoomIn: NSButton!
   @IBOutlet weak var zoomOut: NSButton!
   @IBOutlet weak var zoomScale: NSTextField!
@@ -73,6 +74,15 @@ class ChapterPageCollectionViewController: NSViewController {
         self?.delegate?.closeChapterPage()
       }) ==> disposeBag
 
+    readingProgress
+      .rx.controlEvent
+      .map { [weak self] in
+        Int(self!.readingProgress.stringValue) ?? -1
+      }
+      .map { $0 - 1 }
+      .filter(vm.chapterIndexIsValid)
+      .subscribe(onNext: scrollToChapter) ==> disposeBag
+
     nextChapterButton
       .rx.tap
       .subscribe(onNext: { [weak self] in
@@ -111,6 +121,10 @@ class ChapterPageCollectionViewController: NSViewController {
       ~~> readingProgress.rx.text.orEmpty
       ==> disposeBag
 
+    vm.pageCount
+      ~~> pageCount.rx.text.orEmpty
+      ==> disposeBag
+
     vm.zoomScale
       .asDriver(onErrorJustReturn: "")
       ~~> zoomScale.rx.text.orEmpty
@@ -139,6 +153,13 @@ class ChapterPageCollectionViewController: NSViewController {
 
     collectionView.scrollToVisible(targetRect)
   }
+
+  func scrollToChapter(atIndex index: Int) {
+    vm.setCurrentPageIndex(index)
+
+    let set: Set<IndexPath> = [IndexPath(item: index, section: 0)]
+    collectionView.scrollToItems(at: set, scrollPosition: NSCollectionViewScrollPosition.top)
+  }
 }
 
 extension ChapterPageCollectionViewController: NSCollectionViewDataSource {

Yomu/ViewModels/ChapterPageCollectionViewModel.swift

@@ -89,6 +89,7 @@ struct ChapterPageCollectionViewModel {
   let zoomScale: Driver<String>
   let headerTitle: Driver<String>
   let readingProgress: Driver<String>
+  let pageCount: Driver<String>
   let zoomScroll: Driver<ScrollOffset>
   let disposeBag = DisposeBag()
 
@@ -109,7 +110,6 @@ struct ChapterPageCollectionViewModel {
     let _currentPageIndex = self._currentPageIndex
 
     chapterVM = chapterViewModel
-
     chapterPages = _chapterPages.asDriver()
 
     reload = chapterPages
@@ -120,6 +120,10 @@ struct ChapterPageCollectionViewModel {
       .asDriver()
       .map { String($0 + 1) }
 
+    pageCount = _chapterPages
+      .asDriver()
+      .map { "\($0.count) pages" }
+
     zoomIn
       .map {
         ZoomScale(scale: _zoomScale.value.scale + Config.chapterPageSize.zoomScaleStep)
@@ -198,4 +202,8 @@ struct ChapterPageCollectionViewModel {
   func setZoomScale(_ scale: String) {
     _zoomScale.value = ZoomScale(scale: scale)
   }
+
+  func chapterIndexIsValid(index: Int) -> Bool {
+    return 0 ... (count - 1) ~= index
+  }
 }

Yomu/Views/xibs/ChapterPageCollection.xib

@@ -13,6 +13,7 @@
                 <outlet property="collectionView" destination="IEp-r8-DMM" id="eZ6-Qc-gUP"/>
                 <outlet property="headerTitle" destination="5l1-IJ-UVG" id="IWO-FR-7AU"/>
                 <outlet property="nextChapterButton" destination="FZR-ij-u6b" id="kdk-PO-lRL"/>
+                <outlet property="pageCount" destination="E5O-V0-gGw" id="A6o-nX-Ew8"/>
                 <outlet property="previousChapterButton" destination="iOD-h6-QOG" id="BAe-II-b1t"/>
                 <outlet property="readingProgress" destination="OsJ-kq-iDe" id="TVE-lV-BER"/>
                 <outlet property="view" destination="c22-O7-iKe" id="TTh-Zp-q8q"/>