Skip to content

Commit

Permalink
RTL-support (#11)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nighthawk
nighthawk authored Jan 6, 2022
1 parent a63c449 commit fbfe5e9
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 36 deletions.
16 changes: 13 additions & 3 deletions Sources/TGCardViewController/TGCardViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ open class TGCardViewController: UIViewController {
let edgePanner = UIScreenEdgePanGestureRecognizer()
edgePanner.addTarget(self, action: #selector(popMaybe))
edgePanner.isEnabled = mode == .floating
edgePanner.edges = .left
edgePanner.edges = traitCollection.layoutDirection == .leftToRight ? .left : .right
view.addGestureRecognizer(edgePanner)
self.edgePanner = edgePanner
}
Expand Down Expand Up @@ -1144,7 +1144,12 @@ extension TGCardViewController {
// centres the current location, etc.
var mapInsets = UIEdgeInsets.zero
if cardIsNextToMap(in: traitCollection) {
mapInsets.left = cardWrapperShadow.isHidden ? 0 : (traitCollection.horizontalSizeClass == .regular ? 360 : view.frame.width * 0.38) // same as in storyboard
let cardWidth = cardWrapperShadow.isHidden ? 0 : (traitCollection.horizontalSizeClass == .regular ? 360 : view.frame.width * 0.38) // same as in storyboard
if traitCollection.layoutDirection == .rightToLeft {
mapInsets.right = cardWidth
} else {
mapInsets.left = cardWidth
}
} else {
// Our view has the full height, including what's below safe area insets.
// The maximum interactive area is that without the bottom and anything
Expand All @@ -1163,7 +1168,12 @@ extension TGCardViewController {
mapInsets.top = headerView.frame.maxY
}
if !bottomFloatingView.arrangedSubviews.isEmpty {
mapInsets.right = bottomFloatingViewWrapper.bounds.width
let floatingWidth = bottomFloatingViewWrapper.bounds.width
if traitCollection.layoutDirection == .rightToLeft {
mapInsets.left = floatingWidth
} else {
mapInsets.right = floatingWidth
}
}
return mapInsets
}
Expand Down
124 changes: 91 additions & 33 deletions Sources/TGCardViewController/cards/TGPageCardView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import UIKit


protocol TGPageCardViewDelegate: AnyObject {

func didChangeCurrentPage(to index: Int, animated: Bool)
Expand All @@ -17,7 +16,7 @@ protocol TGPageCardViewDelegate: AnyObject {

class TGPageCardView: TGCardView {

fileprivate enum Constants {
private enum Constants {
static let animationDuration: Double = 0.4
static let spaceBetweenCards: CGFloat = 5
}
Expand All @@ -28,28 +27,36 @@ class TGPageCardView: TGCardView {

@IBOutlet weak var pagerTrailingConstant: NSLayoutConstraint!

fileprivate var lastHorizontalOffset: CGFloat = 0
private var lastHorizontalOffset: CGFloat = 0

private var visiblePageLefty: Int = 0

fileprivate var visiblePage: Int = 0
private var visiblePageLogical: Int = 0

weak var delegate: TGPageCardViewDelegate?

/// The card views, ordered as provided, i.e., logically first one first; not by how it appears.
var cardViews: [TGCardView] {
(contentView.subviews as? [TGCardView]) ?? []
}

private var pageCount: Int {
cardViews.count
}

private func cardView(index: Int) -> TGCardView? {
let cardViews = self.cardViews
guard index >= 0, index <= cardViews.count else { return nil }
return cardViews[index]
}

private var topView: UIView?
override var preferredView: UIView? {
cardViews.first?.preferredView ?? self
topView ?? self
}

override var grabHandles: [TGGrabHandleView] {
cardViews.compactMap { $0.grabHandle }
cardViews.compactMap(\.grabHandle)
}

override var headerHeight: CGFloat {
Expand All @@ -72,11 +79,8 @@ class TGPageCardView: TGCardView {

override var contentScrollView: UIScrollView? {
get {
guard currentPage < cardViews.count else {
return nil
}

return cardViews[currentPage].contentScrollView
let logical = currentLogicalIndex()
return cardView(index: logical)?.contentScrollView
}
set {
assertionFailure("Don't set this on paging a PageCard. Was set to \(String(describing: newValue)).")
Expand All @@ -89,7 +93,7 @@ class TGPageCardView: TGCardView {
// remove corner as we want each card to show its own corners
layer.mask = nil

move(to: visiblePage, animated: false)
move(to: visiblePageLogical, animated: false)
}

// MARK: - New instance
Expand Down Expand Up @@ -137,13 +141,18 @@ class TGPageCardView: TGCardView {

// Page card doesn't always start with page 0. So we keep a reference
// to the first page index, which can then be used at a later point.
visiblePage = pageCard.initialPageIndex

visiblePageLogical = pageCard.initialPageIndex
visiblePageLefty = isRightToLeft
? contents.count - 1 - pageCard.initialPageIndex
: pageCard.initialPageIndex

// This will be used in both `moveForward` and `moveBackward`, so
// it's important to "initailise" this value correctly.
lastHorizontalOffset = CGFloat(pageCard.initialPageIndex) * (frame.width + Constants.spaceBetweenCards)
lastHorizontalOffset = CGFloat(visiblePageLefty) * (frame.width + Constants.spaceBetweenCards)

self.accessibilityElements = [cardView(index: pageCard.initialPageIndex)].compactMap { $0 }
let topMost = cardView(index: visiblePageLogical)
self.accessibilityElements = [topMost].compactMap { $0 }
self.topView = topMost
}

override func updateDismissButton(show: Bool, isSpringLoaded: Bool) {
Expand Down Expand Up @@ -208,15 +217,48 @@ class TGPageCardView: TGCardView {

// MARK: - Navigation

var currentPage: Int {
private var isRightToLeft: Bool {
traitCollection.layoutDirection == .rightToLeft
}

private func currentLeftyIndex() -> Int {
// Using `floor` here as we're getting fractions here, e.g., on iPhone X in landscape
return Int(floor(pager.contentOffset.x) / (floor(frame.width) + Constants.spaceBetweenCards))
}

private func currentLogicalIndex() -> Int {
let lefty = currentLeftyIndex()
return isRightToLeft ? pageCount - lefty - 1 : lefty
}

var currentPage: Int {
currentLogicalIndex()
}

func moveForward(animated: Bool = true) {
if isRightToLeft {
moveLeft(animated: animated)
} else {
moveRight(animated: animated)
}
}

func moveBackward(animated: Bool = true) {
if isRightToLeft {
moveRight(animated: animated)
} else {
moveLeft(animated: animated)
}
}

private func moveRight(animated: Bool) {
// Assign `visiblePage` here so that we allow paging there even if VoiceOver is enabled
visiblePage = min(cardViews.count - 1, visiblePage + 1)
self.accessibilityElements = [cardView(index: visiblePage)].compactMap { $0 }
visiblePageLefty = min(cardViews.count - 1, visiblePageLefty + 1)
visiblePageLogical = isRightToLeft ? pageCount - visiblePageLefty - 1 : visiblePageLefty

let topMost = cardView(index: visiblePageLogical)
self.accessibilityElements = [topMost].compactMap { $0 }
self.topView = topMost

// Shift by the entire width of the card view
let nextFullWidthHorizontalOffset = pager.contentOffset.x + frame.width + Constants.spaceBetweenCards
Expand All @@ -241,12 +283,16 @@ class TGPageCardView: TGCardView {
lastHorizontalOffset = horizontalOffset
}

func moveBackward(animated: Bool = true) {
private func moveLeft(animated: Bool) {
// Assign `visiblePage` here so that we allow paging there even if VoiceOver is enabled
visiblePage = max(0, visiblePage - 1)
self.accessibilityElements = [cardView(index: visiblePage)].compactMap { $0 }
visiblePageLefty = max(0, visiblePageLefty - 1)
visiblePageLogical = isRightToLeft ? pageCount - visiblePageLefty - 1 : visiblePageLefty

// See `moveForward()` for comments.
let topMost = cardView(index: visiblePageLogical)
self.accessibilityElements = [topMost].compactMap { $0 }
self.topView = topMost

// See `moveRight()` for comments.
let nextFullWidthHorizontalOffset = pager.contentOffset.x - frame.width - Constants.spaceBetweenCards
let nextFullPageHorizontalOffset = lastHorizontalOffset - frame.width - Constants.spaceBetweenCards
let horizontalOffset = fmax(nextFullPageHorizontalOffset, nextFullWidthHorizontalOffset)
Expand All @@ -260,14 +306,22 @@ class TGPageCardView: TGCardView {
}

func move(to cardIndex: Int, animated: Bool = true) {
let leftIndex = isRightToLeft
? pageCount - cardIndex - 1
: cardIndex

// index must fall within the range of available content cards.
guard 0..<contentView.subviews.count ~= cardIndex else { return }
guard 0..<contentView.subviews.count ~= leftIndex else { return }

// Assign `visiblePage` here so that we allow paging there even if VoiceOver is enabled
visiblePage = cardIndex
self.accessibilityElements = [cardView(index: visiblePage)].compactMap { $0 }
visiblePageLefty = leftIndex
visiblePageLogical = cardIndex

let newX = (frame.width + Constants.spaceBetweenCards) * CGFloat(cardIndex)
let topMost = cardView(index: visiblePageLogical)
self.accessibilityElements = [topMost].compactMap { $0 }
self.topView = topMost

let newX = (frame.width + Constants.spaceBetweenCards) * CGFloat(leftIndex)
pager.setContentOffset(CGPoint(x: newX, y: 0), animated: animated)
}

Expand All @@ -291,19 +345,23 @@ extension TGPageCardView: UIScrollViewDelegate {
scrollViewDidComeToCompleteStop(scrollView)
}

fileprivate func scrollViewDidComeToCompleteStop(_ scrollView: UIScrollView) {

private func scrollViewDidComeToCompleteStop(_ scrollView: UIScrollView) {
// Don't allow paging by scrolling when VoiceOver is running. This is working
// around a weird behaviour in (at least) iOS 15 that immediately scrolls to
// offset.y == 0 on presenting the initial page.
if UIAccessibility.isVoiceOverRunning, currentPage != visiblePage {
move(to: visiblePage, animated: false)
let logical = currentLogicalIndex()
if UIAccessibility.isVoiceOverRunning, visiblePageLogical != logical {
move(to: visiblePageLogical, animated: false)
return
}

delegate?.didChangeCurrentPage(to: currentPage, animated: true)
visiblePage = currentPage
visiblePageLogical = logical
delegate?.didChangeCurrentPage(to: logical, animated: true)
lastHorizontalOffset = scrollView.contentOffset.y

let topMost = cardView(index: logical)
self.accessibilityElements = [topMost].compactMap { $0 }
self.topView = topMost
}

}

0 comments on commit fbfe5e9

Please sign in to comment.