Commit a7f73528 by Daniel Dahan

Updated TabsController to no longer force the default animation to change…

Updated TabsController to no longer force the default animation to change between tabs and not return to normal behavior.
parent 9ab21516
## 2.13.7 (development)
* Updated TabsController to no longer force the default animation to change between tabs and not return to normal behavior.
## 2.13.6 ## 2.13.6
* [issue-841](https://github.com/CosmicMind/Material/issues/841): Adjusted default sizing for Switch to be more like the original sizing. * [issue-841](https://github.com/CosmicMind/Material/issues/841): Adjusted default sizing for Switch to be more like the original sizing.
......
...@@ -217,10 +217,13 @@ fileprivate extension TabsController { ...@@ -217,10 +217,13 @@ fileprivate extension TabsController {
return return
} }
var isAuto = false
switch motionTransitionType { switch motionTransitionType {
case .auto: case .auto:
switch viewController.motionTransitionType { switch viewController.motionTransitionType {
case .auto: case .auto:
isAuto = true
MotionTransition.shared.setAnimationForNextTransition(fvcIndex < tvcIndex ? .slide(direction: .left) : .slide(direction: .right)) MotionTransition.shared.setAnimationForNextTransition(fvcIndex < tvcIndex ? .slide(direction: .left) : .slide(direction: .right))
default:break default:break
} }
...@@ -236,6 +239,10 @@ fileprivate extension TabsController { ...@@ -236,6 +239,10 @@ fileprivate extension TabsController {
return return
} }
if isAuto {
MotionTransition.shared.setAnimationForNextTransition(.auto)
}
completion?(isFinishing) completion?(isFinishing)
if isTriggeredByUserInteraction { if isTriggeredByUserInteraction {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment