unify PDF and EPUB reader: convert highlights to underlines, improve annotation UI, change paging from horizontal to vertical
- Convert PDF highlights from filled rectangles to underlines matching EPUB style - Update PDF annotation editor with EPUB-style design: gold sidebar rail, semi-transparent background, improved spacing and shadows, dark mode support - Change PDF page-curl paging from left-right horizontal to up-down vertical: update gesture recognition and tap regions accordingly Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
This commit is contained in:
shenlei
co-authored by
Claude Haiku 4.5
Claude Haiku 4.5
parent
72c1f8d89c
commit
fed34da246
@@ -0,0 +1,194 @@
|
||||
import UIKit
|
||||
|
||||
/// 页面创建、缩放状态和点击分区。与 EPUB 的 `RDEpubReaderView+ContentAccess`
|
||||
/// 及 Paging 模块保持同一职责边界。
|
||||
extension RDPDFReaderView {
|
||||
func makePageView(for page: Int) -> UIView {
|
||||
let view = dataSource?.pageContentView(readerView: self, pageNum: page) ?? UIView()
|
||||
view.tag = page
|
||||
configureInteraction(for: view)
|
||||
return view
|
||||
}
|
||||
|
||||
func configureInteraction(for view: UIView) {
|
||||
guard let page = view as? RDPDFReaderPageInteractable else { return }
|
||||
page.readerSetInternalGesturesEnabled(currentDisplayType != .pageCurl)
|
||||
page.readerContentTapHandler = { [weak self, weak view] point in
|
||||
guard let self, let view else { return }
|
||||
self.handleContentTap(view.convert(point, to: self))
|
||||
}
|
||||
page.readerZoomStateChangedHandler = { [weak self, weak view] zoomed in
|
||||
guard let self, view?.tag == self.currentPage else { return }
|
||||
self.isCurrentPageZoomed = zoomed
|
||||
self.updatePagingState()
|
||||
}
|
||||
page.readerSelectionStateChangedHandler = { [weak self, weak view] active in
|
||||
guard let self, view?.tag == self.currentPage else { return }
|
||||
self.isCurrentPageTextSelectionActive = active
|
||||
self.updatePagingState()
|
||||
}
|
||||
}
|
||||
|
||||
func synchronizePageState() {
|
||||
isCurrentPageZoomed = (pageContentView(pageNum: currentPage) as? RDPDFReaderPageInteractable)?.readerIsZoomed ?? false
|
||||
isCurrentPageTextSelectionActive = (pageContentView(pageNum: currentPage) as? RDPDFReaderPageInteractable)?.readerHasActiveTextSelection ?? false
|
||||
updatePagingState()
|
||||
}
|
||||
|
||||
func updatePagingState() {
|
||||
let enabled = isPagingEnabled && !isCurrentPageZoomed && !isCurrentPageTextSelectionActive
|
||||
collectionView.isScrollEnabled = enabled
|
||||
curlPanGestureRecognizer.isEnabled = currentDisplayType == .pageCurl
|
||||
&& isPagingEnabled
|
||||
&& !isCurrentPageTextSelectionActive
|
||||
}
|
||||
|
||||
func transitionCurl(to page: Int, animated: Bool) {
|
||||
if isTransitioning {
|
||||
pendingPage = (page, animated)
|
||||
return
|
||||
}
|
||||
if page == currentPage, curlContentView != nil {
|
||||
synchronizePageState()
|
||||
return
|
||||
}
|
||||
|
||||
let previousPage = currentPage
|
||||
let nextView = makePageView(for: page)
|
||||
nextView.frame = curlHostView.bounds
|
||||
nextView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
|
||||
|
||||
let installPage = { [weak self] in
|
||||
guard let self else { return }
|
||||
self.curlContentView?.removeFromSuperview()
|
||||
self.curlHostView.addSubview(nextView)
|
||||
self.curlContentView = nextView
|
||||
self.currentPage = page
|
||||
}
|
||||
|
||||
guard animated, curlContentView != nil, previousPage != page else {
|
||||
installPage()
|
||||
return
|
||||
}
|
||||
|
||||
isTransitioning = true
|
||||
curlPanInteraction = .idle
|
||||
let animation: UIView.AnimationOptions = page > previousPage ? .transitionCurlUp : .transitionCurlDown
|
||||
UIView.transition(
|
||||
with: curlHostView,
|
||||
duration: 0.38,
|
||||
options: [animation, .allowAnimatedContent],
|
||||
animations: installPage
|
||||
) { [weak self] _ in
|
||||
self?.finishCurlTransition()
|
||||
}
|
||||
}
|
||||
|
||||
@objc func handleCurlPan(_ gesture: UIPanGestureRecognizer) {
|
||||
guard let page = curlContentView as? RDPDFReaderPageInteractable else { return }
|
||||
switch gesture.state {
|
||||
case .began:
|
||||
guard !page.readerHasActiveTextSelection else {
|
||||
curlPanInteraction = .idle
|
||||
return
|
||||
}
|
||||
if page.readerIsZoomed {
|
||||
curlPanInteraction = .contentPan
|
||||
page.readerBeginExternalPan()
|
||||
} else {
|
||||
curlPanInteraction = .pageTurn(startPage: currentPage)
|
||||
}
|
||||
case .changed:
|
||||
guard !page.readerHasActiveTextSelection else {
|
||||
curlPanInteraction = .idle
|
||||
return
|
||||
}
|
||||
if case .contentPan = curlPanInteraction {
|
||||
page.readerUpdateExternalPan(translation: gesture.translation(in: curlHostView))
|
||||
}
|
||||
case .ended:
|
||||
guard !page.readerHasActiveTextSelection else {
|
||||
curlPanInteraction = .idle
|
||||
return
|
||||
}
|
||||
finishCurlPan(gesture, page: page, cancelled: false)
|
||||
case .cancelled, .failed:
|
||||
finishCurlPan(gesture, page: page, cancelled: true)
|
||||
default:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
private func finishCurlPan(
|
||||
_ gesture: UIPanGestureRecognizer,
|
||||
page: RDPDFReaderPageInteractable,
|
||||
cancelled: Bool
|
||||
) {
|
||||
let interaction = curlPanInteraction
|
||||
curlPanInteraction = .idle
|
||||
switch interaction {
|
||||
case .contentPan:
|
||||
page.readerEndExternalPan()
|
||||
case let .pageTurn(startPage):
|
||||
guard !cancelled, currentPage == startPage else { return }
|
||||
let translation = gesture.translation(in: curlHostView)
|
||||
let velocity = gesture.velocity(in: curlHostView)
|
||||
guard abs(translation.y) > abs(translation.x) else { return }
|
||||
let crossedDistance = abs(translation.y) >= max(44, curlHostView.bounds.height * 0.12)
|
||||
let crossedVelocity = abs(velocity.y) >= 450
|
||||
guard crossedDistance || crossedVelocity else { return }
|
||||
let direction = abs(translation.y) >= 4 ? translation.y : velocity.y
|
||||
transitionToPage(pageNum: startPage + (direction < 0 ? 1 : -1), animated: true)
|
||||
case .idle:
|
||||
break
|
||||
case .pinching:
|
||||
// 捏合拥有当前触摸序列，pan 的结束事件不能改变它的状态。
|
||||
curlPanInteraction = .pinching
|
||||
}
|
||||
}
|
||||
|
||||
@objc func handleCurlPinch(_ gesture: UIPinchGestureRecognizer) {
|
||||
guard currentDisplayType == .pageCurl,
|
||||
let contentView = curlContentView,
|
||||
let page = contentView as? RDPDFReaderPageInteractable else { return }
|
||||
let point = gesture.location(in: contentView)
|
||||
switch gesture.state {
|
||||
case .began:
|
||||
if case .contentPan = curlPanInteraction {
|
||||
page.readerEndExternalPan()
|
||||
}
|
||||
// 第二根手指到来后，捏合优先，已产生的单指翻页候选立即失效。
|
||||
curlPanInteraction = .pinching
|
||||
page.readerBeginExternalPinch(at: point)
|
||||
case .changed:
|
||||
if case .pinching = curlPanInteraction {
|
||||
page.readerUpdateExternalPinch(scale: gesture.scale, at: point)
|
||||
}
|
||||
case .ended, .cancelled, .failed:
|
||||
page.readerEndExternalPinch()
|
||||
// 重置 recognizer，确保捏合结束后仍留在屏幕上的单根手指不会在
|
||||
// 同一触摸序列中重新变成翻页或内容拖动。
|
||||
curlPanGestureRecognizer.isEnabled = false
|
||||
curlPanInteraction = .idle
|
||||
curlPanGestureRecognizer.isEnabled = currentDisplayType == .pageCurl && isPagingEnabled
|
||||
default:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
func handleContentTap(_ point: CGPoint) {
|
||||
if isCurrentPageTextSelectionActive {
|
||||
(curlContentView as? RDPDFReaderPageInteractable)?.readerClearTextSelection()
|
||||
return
|
||||
}
|
||||
if isToolViewVisible {
|
||||
toggleToolbars()
|
||||
} else if point.y < bounds.height / 3 {
|
||||
transitionToPage(pageNum: currentPage - 1, animated: true)
|
||||
} else if point.y > bounds.height * 2 / 3 {
|
||||
transitionToPage(pageNum: currentPage + 1, animated: true)
|
||||
} else {
|
||||
toggleToolbars()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
import UIKit
|
||||
|
||||
/// SDK 标注覆盖层：只负责以比例坐标绘制已保存的高亮。
|
||||
public final class RDPDFReaderHighlightOverlayView: UIView {
|
||||
public var highlights: [RDPDFReaderHighlight] = [] { didSet { setNeedsDisplay() } }
|
||||
|
||||
public override init(frame: CGRect) {
|
||||
super.init(frame: frame)
|
||||
isOpaque = false
|
||||
backgroundColor = .clear
|
||||
isUserInteractionEnabled = false
|
||||
}
|
||||
|
||||
public required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
|
||||
|
||||
public override func draw(_ rect: CGRect) {
|
||||
guard let context = UIGraphicsGetCurrentContext() else { return }
|
||||
context.clear(rect)
|
||||
for highlight in highlights {
|
||||
let color = UIColor(hexString: highlight.color)
|
||||
context.setStrokeColor(color.cgColor)
|
||||
context.setLineWidth(2)
|
||||
let normalizedRect = highlight.normalizedRect
|
||||
let underlineRect = CGRect(x: rect.width * normalizedRect.minX, y: rect.height * normalizedRect.minY, width: rect.width * normalizedRect.width, height: rect.height * normalizedRect.height)
|
||||
let y = underlineRect.maxY - 1
|
||||
context.move(to: CGPoint(x: underlineRect.minX, y: y))
|
||||
context.addLine(to: CGPoint(x: underlineRect.maxX, y: y))
|
||||
context.strokePath()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// SDK 搜索命中覆盖层。与读者标注共用页面比例坐标体系。
|
||||
public final class RDPDFReaderSearchHighlightOverlayView: UIView {
|
||||
public var matchRects: [CGRect] = [] { didSet { setNeedsDisplay() } }
|
||||
public var activeIndex = -1 { didSet { setNeedsDisplay() } }
|
||||
|
||||
public override init(frame: CGRect) {
|
||||
super.init(frame: frame)
|
||||
isOpaque = false
|
||||
backgroundColor = .clear
|
||||
isUserInteractionEnabled = false
|
||||
}
|
||||
|
||||
public required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
|
||||
|
||||
public override func draw(_ rect: CGRect) {
|
||||
guard let context = UIGraphicsGetCurrentContext() else { return }
|
||||
context.clear(rect)
|
||||
for (index, matchRect) in matchRects.enumerated() {
|
||||
let color = index == activeIndex
|
||||
? UIColor(red: 0.14, green: 0.42, blue: 0.95, alpha: 0.34)
|
||||
: UIColor(red: 0.21, green: 0.48, blue: 0.95, alpha: 0.16)
|
||||
context.setFillColor(color.cgColor)
|
||||
context.fill(CGRect(x: rect.width * matchRect.minX, y: rect.height * matchRect.minY, width: rect.width * matchRect.width, height: rect.height * matchRect.height))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private extension UIColor {
|
||||
convenience init(hexString: String) {
|
||||
let hex = hexString.trimmingCharacters(in: .whitespacesAndNewlines).replacingOccurrences(of: "#", with: "")
|
||||
let value = UInt32(hex, radix: 16) ?? 0
|
||||
self.init(red: CGFloat((value >> 16) & 0xFF) / 255, green: CGFloat((value >> 8) & 0xFF) / 255, blue: CGFloat(value & 0xFF) / 255, alpha: 1)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user