Skip to content
This repository was archived by the owner on Apr 29, 2021. It is now read-only.

Commit 3edc797

Browse files
authored
Merge pull request #328 from IIzzaya/cupertino
[Bug] Fix CupertinoRoutePage Error
2 parents fed0017 + d0112bd commit 3edc797

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

Runtime/cupertino/route.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public class CupertinoRouteUtils {
4242
);
4343

4444
public static readonly DecorationTween _kGradientShadowTween = new DecorationTween(
45+
begin: _CupertinoEdgeShadowDecoration.none,
4546
end: new _CupertinoEdgeShadowDecoration(
4647
edgeGradient: new LinearGradient(
4748
begin: new Alignment(0.9f, 0.0f),
@@ -107,7 +108,8 @@ WidgetBuilder builder
107108
barrierDismissible: false,
108109
barrierColor: _kModalBarrierColor,
109110
transitionDuration: new TimeSpan(0, 0, 0, 0, 250),
110-
pageBuilder: (BuildContext _context, Animation<float> animation, Animation<float> secondaryAnimation) => {
111+
pageBuilder:
112+
(BuildContext _context, Animation<float> animation, Animation<float> secondaryAnimation) => {
111113
return builder(_context);
112114
},
113115
transitionBuilder: _buildCupertinoDialogTransitions
@@ -127,7 +129,7 @@ public _CupertinoEdgeShadowDecoration(
127129

128130
public readonly LinearGradient edgeGradient;
129131

130-
static _CupertinoEdgeShadowDecoration lerp(
132+
static _CupertinoEdgeShadowDecoration lerpCupertino(
131133
_CupertinoEdgeShadowDecoration a,
132134
_CupertinoEdgeShadowDecoration b,
133135
float t
@@ -143,18 +145,18 @@ float t
143145

144146
public override Decoration lerpFrom(Decoration a, float t) {
145147
if (!(a is _CupertinoEdgeShadowDecoration)) {
146-
return lerp(null, this, t);
148+
return lerpCupertino(null, this, t);
147149
}
148150

149-
return lerp(a, this, t);
151+
return lerpCupertino((_CupertinoEdgeShadowDecoration) a, this, t);
150152
}
151153

152154
public override Decoration lerpTo(Decoration b, float t) {
153155
if (!(b is _CupertinoEdgeShadowDecoration)) {
154-
return lerp(this, null, t);
156+
return lerpCupertino(this, null, t);
155157
}
156158

157-
return lerp(this, b, t);
159+
return lerpCupertino(this, (_CupertinoEdgeShadowDecoration) b, t);
158160
}
159161

160162
public override BoxPainter createBoxPainter(VoidCallback onChanged = null) {

Runtime/widgets/routes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ public void removeScopedWillPopCallback(WillPopCallback callback) {
605605
this._willPopCallbacks.Remove(callback);
606606
}
607607

608-
protected internal bool hasScopedWillPopCallback {
608+
public bool hasScopedWillPopCallback {
609609
get { return this._willPopCallbacks.isNotEmpty(); }
610610
}
611611

0 commit comments

Comments
 (0)