将 PDF 成品阅读控制器下沉为 RDPDFReaderView SDK，并修复手机横屏单页连续竖滑

SDK 化收尾： - 新增 RDPDFReaderView 本地 pod（阅读容器、成品控制器、划线/注释、画笔、目录/设置面板、主题与持久化契约），Demo 精简为 PDFKit 页面提供者 + 持久化宿主 - Podfile/工程接入 RDPDFReaderView 与 SnapKit，示例书改用 PDF 阅读器示例文件手机横屏单页竖滑修复： - cell 高度改为宽度适配后的纸张高度（sizeForItemAt + 宿主按页提供纵横比），纵向超出一屏的内容由外层 collectionView 连续滚动承接，不再被裁掉 - 页面内部不再开启同向嵌套的兜底竖向拖动，修复外层滚动被吞、无法滚到下一页 - 修复 applyContentSize 先评估拖动开关后写 contentSize 的顺序缺陷 - 页码按视口中心命中 cell 计算，补 didEndDragging 兜底；旋转重锚点与 transitionToPage 改用真实布局位置 - 横竖屏同为竖滑时也重建 cell 并刷新全部可见页的适配配置 - 横屏单页点击不再跳页，只显隐工具栏；翻页交给连续竖滑 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-15 18:49:44 +09:00
parent a17164d1a9
commit 1422461224
347 changed files with 9912 additions and 3941 deletions
@@ -1,4 +1,5 @@
 import UIKit
+import SnapKit

 final class RDEPUBAnnotationEditorViewController: UIViewController, UITextViewDelegate {

@@ -56,9 +57,6 @@ final class RDEPUBAnnotationEditorViewController: UIViewController, UITextViewDe
        let quoteLabel = UILabel()
        let inputCard = UIView()

-        [quoteCard, rail, quoteLabel, inputCard, textView, countLabel].forEach {
-            $0.translatesAutoresizingMaskIntoConstraints = false
-        }
        view.addSubview(quoteCard)
        quoteCard.addSubview(rail)
        quoteCard.addSubview(quoteLabel)
@@ -91,32 +89,34 @@ final class RDEPUBAnnotationEditorViewController: UIViewController, UITextViewDe
        countLabel.textColor = .secondaryLabel
        countLabel.textAlignment = .right

-        NSLayoutConstraint.activate([
-            quoteCard.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: 20),
-            quoteCard.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 20),
-            quoteCard.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -20),
-            rail.leadingAnchor.constraint(equalTo: quoteCard.leadingAnchor, constant: 16),
-            rail.topAnchor.constraint(equalTo: quoteCard.topAnchor, constant: 16),
-            rail.bottomAnchor.constraint(equalTo: quoteCard.bottomAnchor, constant: -16),
-            rail.widthAnchor.constraint(equalToConstant: 4),
-            quoteLabel.leadingAnchor.constraint(equalTo: rail.trailingAnchor, constant: 14),
-            quoteLabel.trailingAnchor.constraint(equalTo: quoteCard.trailingAnchor, constant: -18),
-            quoteLabel.topAnchor.constraint(equalTo: quoteCard.topAnchor, constant: 16),
-            quoteLabel.bottomAnchor.constraint(equalTo: quoteCard.bottomAnchor, constant: -16),
-
-            inputCard.topAnchor.constraint(equalTo: quoteCard.bottomAnchor, constant: 18),
-            inputCard.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 20),
-            inputCard.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -20),
-            inputCard.bottomAnchor.constraint(equalTo: view.keyboardLayoutGuide.topAnchor, constant: -16),
-            inputCard.heightAnchor.constraint(greaterThanOrEqualToConstant: 210),
-            textView.topAnchor.constraint(equalTo: inputCard.topAnchor, constant: 14),
-            textView.leadingAnchor.constraint(equalTo: inputCard.leadingAnchor, constant: 14),
-            textView.trailingAnchor.constraint(equalTo: inputCard.trailingAnchor, constant: -14),
-            textView.bottomAnchor.constraint(equalTo: countLabel.topAnchor, constant: -8),
-            countLabel.leadingAnchor.constraint(equalTo: inputCard.leadingAnchor, constant: 16),
-            countLabel.trailingAnchor.constraint(equalTo: inputCard.trailingAnchor, constant: -16),
-            countLabel.bottomAnchor.constraint(equalTo: inputCard.bottomAnchor, constant: -12)
-        ])
+        quoteCard.snp.makeConstraints { make in
+            make.top.equalTo(view.safeAreaLayoutGuide).offset(20)
+            make.horizontalEdges.equalToSuperview().inset(20)
+        }
+        rail.snp.makeConstraints { make in
+            make.leading.equalToSuperview().offset(16)
+            make.verticalEdges.equalToSuperview().inset(16)
+            make.width.equalTo(4)
+        }
+        quoteLabel.snp.makeConstraints { make in
+            make.leading.equalTo(rail.snp.trailing).offset(14)
+            make.trailing.equalToSuperview().inset(18)
+            make.verticalEdges.equalToSuperview().inset(16)
+        }
+        inputCard.snp.makeConstraints { make in
+            make.top.equalTo(quoteCard.snp.bottom).offset(18)
+            make.horizontalEdges.equalToSuperview().inset(20)
+            make.bottom.equalTo(view.keyboardLayoutGuide.snp.top).offset(-16)
+            make.height.greaterThanOrEqualTo(210)
+        }
+        textView.snp.makeConstraints { make in
+            make.top.horizontalEdges.equalToSuperview().inset(14)
+            make.bottom.equalTo(countLabel.snp.top).offset(-8)
+        }
+        countLabel.snp.makeConstraints { make in
+            make.horizontalEdges.equalToSuperview().inset(16)
+            make.bottom.equalToSuperview().inset(12)
+        }
    }

    func textViewDidChange(_ textView: UITextView) {
@@ -1,4 +1,5 @@
 import UIKit
+import SnapKit

 final class RDEPUBReaderBottomToolView: RDEPUBReaderToolView, RDEPUBReaderBottomToolViewProtocol {

@@ -36,18 +37,16 @@ final class RDEPUBReaderBottomToolView: RDEPUBReaderToolView, RDEPUBReaderBottom
        accessibilityIdentifier = "epub.reader.bottomToolbar"

        addSubview(stackView)
-        stackView.translatesAutoresizingMaskIntoConstraints = false
        stackView.addArrangedSubview(chapterButton)
        stackView.addArrangedSubview(bookmarksButton)
        stackView.addArrangedSubview(annotationListButton)
        stackView.addArrangedSubview(settingsButton)

-        NSLayoutConstraint.activate([
-            stackView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 16),
-            stackView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -16),
-            stackView.topAnchor.constraint(equalTo: topAnchor),
-            stackView.bottomAnchor.constraint(equalTo: safeAreaLayoutGuide.bottomAnchor)
-        ])
+        stackView.snp.makeConstraints { make in
+            make.horizontalEdges.equalToSuperview().inset(16)
+            make.top.equalToSuperview()
+            make.bottom.equalTo(safeAreaLayoutGuide)
+        }

        configureButton(chapterButton, systemName: "list.bullet", fallbackTitle: "目录")
        configureButton(bookmarksButton, systemName: "bookmark", fallbackTitle: "书签")
@@ -59,7 +58,7 @@ final class RDEPUBReaderBottomToolView: RDEPUBReaderToolView, RDEPUBReaderBottom
        settingsButton.accessibilityIdentifier = "epub.reader.settings"

        [chapterButton, bookmarksButton, annotationListButton, settingsButton].forEach { button in
-            button.heightAnchor.constraint(greaterThanOrEqualToConstant: 44).isActive = true
+            button.snp.makeConstraints { $0.height.greaterThanOrEqualTo(44) }
        }

        chapterButton.addTarget(self, action: #selector(chapterAction), for: .touchUpInside)
@@ -1,4 +1,5 @@
 import UIKit
+import SnapKit

 open class RDEPUBReaderTopToolView: RDEPUBReaderToolView, RDEPUBReaderTopToolViewProtocol {

@@ -15,7 +16,7 @@ open class RDEPUBReaderTopToolView: RDEPUBReaderToolView, RDEPUBReaderTopToolVie
    private let searchButton = RDEPUBReaderTintButton(type: .system)
    private let bookmarkButton = RDEPUBReaderTintButton(type: .system)
    private let authorizationButton = RDEPUBReaderTintButton(type: .system)
-    private var authorizationButtonWidthConstraint: NSLayoutConstraint!
+    private var authorizationButtonWidthConstraint: Constraint!
    private let titleLabel: UILabel = {
        let label = UILabel()
        label.textAlignment = .center
@@ -35,48 +36,41 @@ open class RDEPUBReaderTopToolView: RDEPUBReaderToolView, RDEPUBReaderTopToolVie
        addSubview(authorizationButton)
        addSubview(titleLabel)

-        backButton.translatesAutoresizingMaskIntoConstraints = false
-        searchButton.translatesAutoresizingMaskIntoConstraints = false
-        bookmarkButton.translatesAutoresizingMaskIntoConstraints = false
-        authorizationButton.translatesAutoresizingMaskIntoConstraints = false
-        titleLabel.translatesAutoresizingMaskIntoConstraints = false
-
        backButton.addTarget(self, action: #selector(backAction), for: .touchUpInside)
        searchButton.addTarget(self, action: #selector(searchAction), for: .touchUpInside)
        bookmarkButton.addTarget(self, action: #selector(bookmarkAction), for: .touchUpInside)
        authorizationButton.addTarget(self, action: #selector(authorizationAction), for: .touchUpInside)

-        authorizationButtonWidthConstraint = authorizationButton.widthAnchor.constraint(equalToConstant: 0)
-
-        NSLayoutConstraint.activate([
-            backButton.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 8),
-            backButton.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor, constant: 4),
-            backButton.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -4),
-            backButton.widthAnchor.constraint(equalToConstant: 44),
-            backButton.heightAnchor.constraint(equalToConstant: 44),
-
-            authorizationButton.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -8),
-            authorizationButton.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor, constant: 4),
-            authorizationButton.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -4),
-            authorizationButton.heightAnchor.constraint(equalToConstant: 44),
-            authorizationButtonWidthConstraint,
-
-            bookmarkButton.trailingAnchor.constraint(equalTo: authorizationButton.leadingAnchor, constant: -4),
-            bookmarkButton.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor, constant: 4),
-            bookmarkButton.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -4),
-            bookmarkButton.widthAnchor.constraint(equalToConstant: 44),
-            bookmarkButton.heightAnchor.constraint(equalToConstant: 44),
-
-            searchButton.trailingAnchor.constraint(equalTo: bookmarkButton.leadingAnchor, constant: -4),
-            searchButton.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor, constant: 4),
-            searchButton.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -4),
-            searchButton.widthAnchor.constraint(equalToConstant: 44),
-            searchButton.heightAnchor.constraint(equalToConstant: 44),
-
-            titleLabel.leadingAnchor.constraint(equalTo: backButton.trailingAnchor, constant: 8),
-            titleLabel.trailingAnchor.constraint(equalTo: searchButton.leadingAnchor, constant: -8),
-            titleLabel.centerYAnchor.constraint(equalTo: backButton.centerYAnchor)
-        ])
+        backButton.snp.makeConstraints { make in
+            make.leading.equalToSuperview().offset(8)
+            make.top.equalTo(safeAreaLayoutGuide).offset(4)
+            make.bottom.equalToSuperview().inset(4)
+            make.size.equalTo(44)
+        }
+        authorizationButton.snp.makeConstraints { make in
+            make.trailing.equalToSuperview().inset(8)
+            make.top.equalTo(safeAreaLayoutGuide).offset(4)
+            make.bottom.equalToSuperview().inset(4)
+            make.height.equalTo(44)
+            authorizationButtonWidthConstraint = make.width.equalTo(0).constraint
+        }
+        bookmarkButton.snp.makeConstraints { make in
+            make.trailing.equalTo(authorizationButton.snp.leading).offset(-4)
+            make.top.equalTo(safeAreaLayoutGuide).offset(4)
+            make.bottom.equalToSuperview().inset(4)
+            make.size.equalTo(44)
+        }
+        searchButton.snp.makeConstraints { make in
+            make.trailing.equalTo(bookmarkButton.snp.leading).offset(-4)
+            make.top.equalTo(safeAreaLayoutGuide).offset(4)
+            make.bottom.equalToSuperview().inset(4)
+            make.size.equalTo(44)
+        }
+        titleLabel.snp.makeConstraints { make in
+            make.leading.equalTo(backButton.snp.trailing).offset(8)
+            make.trailing.equalTo(searchButton.snp.leading).offset(-8)
+            make.centerY.equalTo(backButton)
+        }

        if #available(iOS 13.0, *) {
            backButton.setImage(UIImage(systemName: "chevron.left")?.withRenderingMode(.alwaysTemplate), for: .normal)
@@ -138,7 +132,7 @@ open class RDEPUBReaderTopToolView: RDEPUBReaderToolView, RDEPUBReaderTopToolVie
        authorizationButton.setTitle(resolvedTitle, for: .normal)
        authorizationButton.isHidden = !isVisible
        authorizationButton.isEnabled = isVisible
-        authorizationButtonWidthConstraint.constant = isVisible ? 56 : 0
+        authorizationButtonWidthConstraint.update(offset: isVisible ? 56 : 0)
        authorizationButton.accessibilityLabel = resolvedTitle
    }