Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
flutter_boost_1.22.4
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李增强
flutter_boost_1.22.4
Commits
6e223c20
Commit
6e223c20
authored
May 18, 2020
by
SpeciedCrab
Committed by
justin
Jun 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 1.17
parent
f7f7d96f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
34 deletions
+54
-34
lib/container/boost_container.dart
lib/container/boost_container.dart
+49
-34
lib/container/boost_page_route.dart
lib/container/boost_page_route.dart
+5
-0
No files found.
lib/container/boost_container.dart
View file @
6e223c20
...
...
@@ -39,9 +39,9 @@ enum ContainerLifeCycle {
}
typedef
BoostContainerLifeCycleObserver
=
void
Function
(
ContainerLifeCycle
state
,
BoostContainerSettings
settings
,
);
ContainerLifeCycle
state
,
BoostContainerSettings
settings
,
);
class
BoostContainer
extends
Navigator
{
const
BoostContainer
({
...
...
@@ -52,17 +52,17 @@ class BoostContainer extends Navigator {
RouteFactory
onUnknownRoute
,
List
<
NavigatorObserver
>
observers
,
})
:
super
(
key:
key
,
initialRoute:
initialRoute
,
onGenerateRoute:
onGenerateRoute
,
onUnknownRoute:
onUnknownRoute
,
observers:
observers
,
);
key:
key
,
initialRoute:
initialRoute
,
onGenerateRoute:
onGenerateRoute
,
onUnknownRoute:
onUnknownRoute
,
observers:
observers
,
);
factory
BoostContainer
.
copy
(
Navigator
navigator
,
[
BoostContainerSettings
settings
=
const
BoostContainerSettings
(),
])
=>
Navigator
navigator
,
[
BoostContainerSettings
settings
=
const
BoostContainerSettings
(),
])
=>
BoostContainer
(
key:
GlobalKey
<
BoostContainerState
>(),
settings:
settings
,
...
...
@@ -73,9 +73,9 @@ class BoostContainer extends Navigator {
);
factory
BoostContainer
.
obtain
(
Navigator
navigator
,
BoostContainerSettings
settings
,
)
=>
Navigator
navigator
,
BoostContainerSettings
settings
,
)
=>
BoostContainer
(
key:
GlobalKey
<
BoostContainerState
>(),
settings:
settings
,
...
...
@@ -110,13 +110,13 @@ class BoostContainer extends Navigator {
static
BoostContainerState
tryOf
(
BuildContext
context
)
{
final
BoostContainerState
container
=
context
.
findAncestorStateOfType
<
BoostContainerState
>();
context
.
findAncestorStateOfType
<
BoostContainerState
>();
return
container
;
}
static
BoostContainerState
of
(
BuildContext
context
)
{
final
BoostContainerState
container
=
context
.
findAncestorStateOfType
<
BoostContainerState
>();
context
.
findAncestorStateOfType
<
BoostContainerState
>();
assert
(
container
!=
null
,
'not in flutter boost'
);
return
container
;
}
...
...
@@ -161,6 +161,15 @@ class BoostContainerState extends NavigatorState {
void
initState
()
{
super
.
initState
();
backPressedHandler
=
()
=>
maybePop
();
final
String
initRoute
=
widget
.
initialRoute
??
Navigator
.
defaultRouteName
;
if
(
initRoute
!=
null
&&
routerHistory
.
isEmpty
)
{
routerHistory
.
addAll
(
widget
.
onGenerateInitialRoutes
(
this
,
widget
.
initialRoute
??
Navigator
.
defaultRouteName
)
);
}
}
@override
...
...
@@ -177,22 +186,28 @@ class BoostContainerState extends NavigatorState {
@override
Future
<
bool
>
maybePop
<
T
extends
Object
>([
T
result
])
async
{
if
(
routerHistory
.
isEmpty
)
{
pop
(
result
);
return
true
;
}
final
Route
<
T
>
route
=
routerHistory
.
last
as
Route
<
T
>;
final
RoutePopDisposition
disposition
=
await
route
.
willPop
();
if
(
mounted
)
{
switch
(
disposition
)
{
case
RoutePopDisposition
.
pop
:
pop
(
result
);
return
true
;
break
;
case
RoutePopDisposition
.
doNotPop
:
return
false
;
break
;
case
RoutePopDisposition
.
bubble
:
pop
(
result
);
return
true
;
break
;
}
switch
(
disposition
)
{
case
RoutePopDisposition
.
pop
:
pop
(
result
);
return
true
;
break
;
case
RoutePopDisposition
.
doNotPop
:
return
false
;
break
;
case
RoutePopDisposition
.
bubble
:
pop
(
result
);
return
true
;
break
;
}
}
return
false
;
}
...
...
@@ -238,10 +253,10 @@ class BoostContainerState extends NavigatorState {
VoidCallback
addLifeCycleObserver
(
BoostContainerLifeCycleObserver
observer
)
{
return
FlutterBoost
.
singleton
.
addBoostContainerLifeCycleObserver
(
(
ContainerLifeCycle
state
,
BoostContainerSettings
settings
,
)
{
(
ContainerLifeCycle
state
,
BoostContainerSettings
settings
,
)
{
if
(
settings
.
uniqueId
==
uniqueId
)
{
observer
(
state
,
settings
);
}
...
...
lib/container/boost_page_route.dart
View file @
6e223c20
...
...
@@ -62,4 +62,9 @@ class BoostPageRoute<T> extends MaterialPageRoute<T> {
return
null
;
}
}
@override
Future
<
RoutePopDisposition
>
willPop
()
{
return
Future
<
RoutePopDisposition
>.
value
(
RoutePopDisposition
.
pop
);
}
}
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