Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
Material
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitriy Stepanets
Material
Commits
e7a93e0b
Commit
e7a93e0b
authored
Sep 25, 2018
by
Orkhan Alikhanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added interactive transition cancellation delegates for TabsController
parent
d0338d27
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
1 deletions
+29
-1
Sources/iOS/TabsController.swift
+29
-1
No files found.
Sources/iOS/TabsController.swift
View file @
e7a93e0b
...
@@ -92,6 +92,24 @@ public protocol TabsControllerDelegate {
...
@@ -92,6 +92,24 @@ public protocol TabsControllerDelegate {
*/
*/
@objc
@objc
optional
func
tabsController
(
tabsController
:
TabsController
,
didSelect
viewController
:
UIViewController
)
optional
func
tabsController
(
tabsController
:
TabsController
,
didSelect
viewController
:
UIViewController
)
/**
A delegation method that is executed when the interactive transition to view controller
will be cancelled.
- Parameter tabsController: A TabsController.
- Parameter viewController: A UIViewController.
*/
@objc
optional
func
tabsController
(
tabsController
:
TabsController
,
willCancelSelecting
viewController
:
UIViewController
)
/**
A delegation method that is executed when the interactive transition to view controller
has been cancelled.
- Parameter tabsController: A TabsController.
- Parameter viewController: A UIViewController.
*/
@objc
optional
func
tabsController
(
tabsController
:
TabsController
,
didCancelSelecting
viewController
:
UIViewController
)
}
}
open
class
TabsController
:
TransitionController
{
open
class
TabsController
:
TransitionController
{
...
@@ -238,8 +256,10 @@ fileprivate extension TabsController {
...
@@ -238,8 +256,10 @@ fileprivate extension TabsController {
completion
?(
isFinishing
)
completion
?(
isFinishing
)
if
isTriggeredByUserInteraction
{
if
isTriggeredByUserInteraction
&&
isFinishing
{
self
.
delegate
?
.
tabsController
?(
tabsController
:
self
,
didSelect
:
viewController
)
self
.
delegate
?
.
tabsController
?(
tabsController
:
self
,
didSelect
:
viewController
)
}
else
{
self
.
delegate
?
.
tabsController
?(
tabsController
:
self
,
didCancelSelecting
:
viewController
)
}
}
}
}
}
}
...
@@ -305,8 +325,11 @@ private extension TabsController {
...
@@ -305,8 +325,11 @@ private extension TabsController {
return
return
}
}
if
targetIndex
!=
-
1
{
delegate
?
.
tabsController
?(
tabsController
:
self
,
willCancelSelecting
:
viewControllers
[
targetIndex
])
tabBar
.
cancelLineTransition
(
isAnimated
:
false
)
tabBar
.
cancelLineTransition
(
isAnimated
:
false
)
MotionTransition
.
shared
.
cancel
(
isAnimated
:
false
)
MotionTransition
.
shared
.
cancel
(
isAnimated
:
false
)
}
if
internalSelect
(
at
:
nextIndex
,
isTriggeredByUserInteraction
:
true
,
selectTabItem
:
false
)
{
if
internalSelect
(
at
:
nextIndex
,
isTriggeredByUserInteraction
:
true
,
selectTabItem
:
false
)
{
tabBar
.
startLineTransition
(
for
:
nextIndex
,
duration
:
0.35
)
tabBar
.
startLineTransition
(
for
:
nextIndex
,
duration
:
0.35
)
...
@@ -319,6 +342,10 @@ private extension TabsController {
...
@@ -319,6 +342,10 @@ private extension TabsController {
}
}
default
:
default
:
guard
targetIndex
!=
-
1
else
{
return
}
let
progress
=
(
translationX
+
velocityX
)
/
view
.
bounds
.
width
let
progress
=
(
translationX
+
velocityX
)
/
view
.
bounds
.
width
let
isUserHandDirectionLeft
=
progress
<
0
let
isUserHandDirectionLeft
=
progress
<
0
...
@@ -330,6 +357,7 @@ private extension TabsController {
...
@@ -330,6 +357,7 @@ private extension TabsController {
}
else
{
}
else
{
tabBar
.
cancelLineTransition
()
tabBar
.
cancelLineTransition
()
MotionTransition
.
shared
.
cancel
()
MotionTransition
.
shared
.
cancel
()
delegate
?
.
tabsController
?(
tabsController
:
self
,
willCancelSelecting
:
viewControllers
[
targetIndex
])
}
}
targetIndex
=
-
1
targetIndex
=
-
1
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment