Skip to content

Fix RTL interfaces #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix RTL interfaces #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87b0190
fix direction of dots movement
Feb 22, 2021
63a47ad
flip direction of gesture in RTL only
Feb 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion Source/GestureControl/GestureControl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@ public class GestureControl: UIView {
extension GestureControl {

@objc dynamic func swipeHandler(_ gesture: UISwipeGestureRecognizer) {
delegate.gestureControlDidSwipe(gesture.direction)
var direction = gesture.direction
let isRTL = UIView.userInterfaceLayoutDirection(for: gesture.view!.semanticContentAttribute) == .rightToLeft

// Flip direction only if in RTL interface
if (isRTL && direction == .right) {
direction = .left
} else if (isRTL && direction == .left) {
direction = .right
}

delegate.gestureControlDidSwipe(direction)
}
}
5 changes: 4 additions & 1 deletion Source/PageView/PageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,10 @@ extension PageView {
}

let containerWidth = CGFloat(itemsCount + 1) * selectedItemRadius + space * CGFloat(itemsCount - 1)
let toValue = containerWidth / 2.0 - selectedItemRadius - (selectedItemRadius + space) * CGFloat(index)

let isRTL = UIView.userInterfaceLayoutDirection(for: self.semanticContentAttribute) == .rightToLeft
let sign: CGFloat = isRTL ? 1 : -1
let toValue = containerWidth / 2.0 + sign * (selectedItemRadius + (selectedItemRadius + space) * CGFloat(index))
containerX.constant = toValue

if animated == true {
Expand Down