Skip to content

Commit c8593bf

Browse files
robelatorrobelator
committed
update
1 parent 5bb733b commit c8593bf

File tree

2 files changed

+30
-99
lines changed

2 files changed

+30
-99
lines changed

‎lib/src/prioritized_indexed_stack/effects.dart‎

Lines changed: 21 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ class NoEffect extends AnimationEffect {
3030

3131
class FadeEffectWeb extends AnimationEffect {
3232
const FadeEffectWeb()
33-
: super(
34-
duration: const Duration(milliseconds: 275),
35-
curve: Curves.easeOutSine,
36-
);
33+
: super(duration: const Duration(milliseconds: 275), curve: Curves.easeOutSine);
3734

3835
@override
3936
get data {
@@ -52,10 +49,7 @@ class FadeEffectWeb extends AnimationEffect {
5249

5350
class FadeEffect extends AnimationEffect {
5451
const FadeEffect()
55-
: super(
56-
duration: const Duration(milliseconds: 275),
57-
curve: Curves.easeOutSine,
58-
);
52+
: super(duration: const Duration(milliseconds: 275), curve: Curves.easeOutSine);
5953

6054
@override
6155
get data {
@@ -70,19 +64,14 @@ class FadeEffect extends AnimationEffect {
7064

7165
class BackwardEffectWeb extends AnimationEffect {
7266
const BackwardEffectWeb()
73-
: super(
74-
duration: const Duration(milliseconds: 275),
75-
curve: Curves.easeInOutQuint,
76-
);
67+
: super(duration: const Duration(milliseconds: 275), curve: Curves.easeInOutQuint);
7768

7869
@override
7970
get data {
8071
return (context, size, value) {
8172
final w = size.width * value;
8273
return [
83-
AnimationLayerEffect(
84-
transform: Matrix4.translationValues(-size.width + w, 0.0, 0.0),
85-
),
74+
AnimationLayerEffect(transform: Matrix4.translationValues(-size.width + w, 0.0, 0.0)),
8675
// Web version is simple for performance reasons.
8776
if (kIsWeb)
8877
const AnimationLayerEffect(ignorePointer: true)
@@ -99,19 +88,14 @@ class BackwardEffectWeb extends AnimationEffect {
9988

10089
class BackwardEffect extends AnimationEffect {
10190
const BackwardEffect()
102-
: super(
103-
duration: const Duration(milliseconds: 275),
104-
curve: Curves.easeInOutQuint,
105-
);
91+
: super(duration: const Duration(milliseconds: 275), curve: Curves.easeInOutQuint);
10692

10793
@override
10894
get data {
10995
return (context, size, value) {
11096
final w = size.width * value;
11197
return [
112-
AnimationLayerEffect(
113-
transform: Matrix4.translationValues(-size.width + w, 0.0, 0.0),
114-
),
98+
AnimationLayerEffect(transform: Matrix4.translationValues(-size.width + w, 0.0, 0.0)),
11599
AnimationLayerEffect(
116100
opacity: 1.0 - value * 0.1,
117101
transform: Matrix4.translationValues(w * 0.5, 0.0, 0.0),
@@ -124,26 +108,21 @@ class BackwardEffect extends AnimationEffect {
124108

125109
class ForwardEffectWeb extends AnimationEffect {
126110
const ForwardEffectWeb()
127-
: super(
128-
duration: const Duration(milliseconds: 275),
129-
curve: Curves.easeInOutQuint,
130-
);
111+
: super(duration: const Duration(milliseconds: 275), curve: Curves.easeInOutQuint);
131112

132113
@override
133114
get data {
134115
return (context, size, value) {
135116
final w = size.width * value;
136117
return [
137-
AnimationLayerEffect(
138-
transform: Matrix4.translationValues(size.width - w, 0.0, 0.0),
139-
),
118+
AnimationLayerEffect(transform: Matrix4.translationValues(size.width - w, 0.0, 0.0)),
140119
// Web version is simple for performance reasons.
141120
if (kIsWeb)
142121
const AnimationLayerEffect(ignorePointer: true)
143122
else
144123
AnimationLayerEffect(
145124
opacity: 1.0 - value * 0.1,
146-
transform: Matrix4.translationValues(w * 0.5, 0.0, 0.0),
125+
transform: Matrix4.translationValues(-w * 0.5, 0.0, 0.0),
147126
ignorePointer: true,
148127
),
149128
];
@@ -153,19 +132,14 @@ class ForwardEffectWeb extends AnimationEffect {
153132

154133
class ForwardEffect extends AnimationEffect {
155134
const ForwardEffect()
156-
: super(
157-
duration: const Duration(milliseconds: 275),
158-
curve: Curves.easeInOutQuint,
159-
);
135+
: super(duration: const Duration(milliseconds: 275), curve: Curves.easeInOutQuint);
160136

161137
@override
162138
get data {
163139
return (context, size, value) {
164140
final w = size.width * value;
165141
return [
166-
AnimationLayerEffect(
167-
transform: Matrix4.translationValues(size.width - w, 0.0, 0.0),
168-
),
142+
AnimationLayerEffect(transform: Matrix4.translationValues(size.width - w, 0.0, 0.0)),
169143
AnimationLayerEffect(
170144
opacity: 1.0 - value * 0.1,
171145
transform: Matrix4.translationValues(-w * 0.5, 0.0, 0.0),
@@ -178,19 +152,14 @@ class ForwardEffect extends AnimationEffect {
178152

179153
class SlideUpEffect extends AnimationEffect {
180154
const SlideUpEffect()
181-
: super(
182-
duration: const Duration(milliseconds: 275),
183-
curve: Curves.easeInOutQuart,
184-
);
155+
: super(duration: const Duration(milliseconds: 275), curve: Curves.easeInOutQuart);
185156

186157
@override
187158
get data {
188159
return (context, size, value) {
189160
final h = size.height * value;
190161
return [
191-
AnimationLayerEffect(
192-
transform: Matrix4.translationValues(0.0, size.height - h, 0.0),
193-
),
162+
AnimationLayerEffect(transform: Matrix4.translationValues(0.0, size.height - h, 0.0)),
194163
AnimationLayerEffect(
195164
opacity: 1.0 - value * 0.1,
196165
transform: Matrix4.translationValues(0.0, -h * 0.5, 0.0),
@@ -203,19 +172,14 @@ class SlideUpEffect extends AnimationEffect {
203172

204173
class SlideDownEffect extends AnimationEffect {
205174
const SlideDownEffect()
206-
: super(
207-
duration: const Duration(milliseconds: 275),
208-
curve: Curves.easeInOutQuart,
209-
);
175+
: super(duration: const Duration(milliseconds: 275), curve: Curves.easeInOutQuart);
210176

211177
@override
212178
get data {
213179
return (context, size, value) {
214180
final h = size.height * value;
215181
return [
216-
AnimationLayerEffect(
217-
transform: Matrix4.translationValues(0.0, -size.height + h, 0.0),
218-
),
182+
AnimationLayerEffect(transform: Matrix4.translationValues(0.0, -size.height + h, 0.0)),
219183
AnimationLayerEffect(
220184
opacity: 1.0 - value * 0.1,
221185
transform: Matrix4.translationValues(0.0, h * 0.5, 0.0),
@@ -228,19 +192,14 @@ class SlideDownEffect extends AnimationEffect {
228192

229193
class CupertinoEffect extends AnimationEffect {
230194
const CupertinoEffect()
231-
: super(
232-
duration: const Duration(milliseconds: 410),
233-
curve: Curves.easeInOut,
234-
);
195+
: super(duration: const Duration(milliseconds: 410), curve: Curves.easeInOut);
235196

236197
@override
237198
get data {
238199
return (context, size, value) {
239200
final w = size.width * value;
240201
return [
241-
AnimationLayerEffect(
242-
transform: Matrix4.translationValues(size.width - w, 0.0, 0.0),
243-
),
202+
AnimationLayerEffect(transform: Matrix4.translationValues(size.width - w, 0.0, 0.0)),
244203
AnimationLayerEffect(
245204
opacity: 1.0 - value * 0.1,
246205
transform: Matrix4.translationValues(-w * 0.5, 0.0, 0.0),
@@ -253,19 +212,14 @@ class CupertinoEffect extends AnimationEffect {
253212

254213
class MaterialEffect extends AnimationEffect {
255214
const MaterialEffect()
256-
: super(
257-
duration: const Duration(milliseconds: 275),
258-
curve: Curves.fastOutSlowIn,
259-
);
215+
: super(duration: const Duration(milliseconds: 275), curve: Curves.fastOutSlowIn);
260216

261217
@override
262218
get data {
263219
return (context, size, value) {
264220
final w = size.width * value;
265221
return [
266-
AnimationLayerEffect(
267-
transform: Matrix4.translationValues(size.width - w, 0.0, 0.0),
268-
),
222+
AnimationLayerEffect(transform: Matrix4.translationValues(size.width - w, 0.0, 0.0)),
269223
AnimationLayerEffect(
270224
opacity: 1.0 - value * 0.1,
271225
transform: Matrix4.translationValues(-w * 0.5, 0.0, 0.0),
@@ -278,22 +232,15 @@ class MaterialEffect extends AnimationEffect {
278232

279233
class PageFlapDown extends AnimationEffect {
280234
const PageFlapDown()
281-
: super(
282-
duration: const Duration(milliseconds: 275),
283-
curve: Curves.easeInSine,
284-
);
235+
: super(duration: const Duration(milliseconds: 275), curve: Curves.easeInSine);
285236

286237
@override
287238
get data {
288239
return (context, size, value) {
289240
return [
290241
AnimationLayerEffect(
291242
transform:
292-
Matrix4.translationValues(
293-
0.25 * (size.width - size.width * value),
294-
0.0,
295-
0.0,
296-
) +
243+
Matrix4.translationValues(0.25 * (size.width - size.width * value), 0.0, 0.0) +
297244
Matrix4.skew((1 - value), -0.1 * (1 - value)) +
298245
Matrix4.rotationX((1 - value)),
299246
),

‎lib/src/route_controller.dart‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -52,29 +52,24 @@ class RouteController {
5252
RouteState Function()? initialRouteState,
5353
this.errorRouteState,
5454
required this.fallbackRouteState,
55-
required List<RouteBuilder>
56-
builders, // Changed: parameter name, not assigned to a field
55+
required List<RouteBuilder> builders, // Changed: parameter name, not assigned to a field
5756
}) {
5857
// Initialize the _builderMap from the `builders` parameter
59-
_builderMap = {
60-
for (var builder in builders) builder.routeState.path: builder,
61-
};
58+
_builderMap = {for (var builder in builders) builder.routeState.path: builder};
6259

6360
platformNavigator.addStateCallback(pushUri);
6461
// Set all the builder output to SizedBox.shrink.
6562
resetState();
6663
_requested = current;
67-
final routeState =
68-
initialRouteState?.call() ?? _requested ?? fallbackRouteState();
64+
final routeState = initialRouteState?.call() ?? _requested ?? fallbackRouteState();
6965
push(routeState);
7066
}
7167

7268
//
7369
//
7470
//
7571

76-
RouteState getNavigatorOrFallbackRouteState() =>
77-
_requested ?? fallbackRouteState();
72+
RouteState getNavigatorOrFallbackRouteState() => _requested ?? fallbackRouteState();
7873

7974
//
8075
//
@@ -86,9 +81,7 @@ class RouteController {
8681
return null;
8782
}
8883
// Uses the optimized _getBuilderByPath
89-
return _getBuilderByPath(
90-
url,
91-
)?.routeState.copyWith(queryParameters: url.queryParameters);
84+
return _getBuilderByPath(url)?.routeState.copyWith(queryParameters: url.queryParameters);
9285
}
9386

9487
//
@@ -135,9 +128,7 @@ class RouteController {
135128
// Now iterates over _builderMap.values. Order might differ from original list,
136129
// but for clearing cache, order of individual items usually doesn't matter.
137130
for (final builder in _builderMap.values) {
138-
_widgetCache[builder.routeState] = SizedBox.shrink(
139-
key: builder.routeState.key,
140-
);
131+
_widgetCache[builder.routeState] = SizedBox.shrink(key: builder.routeState.key);
141132
}
142133
}
143134

@@ -188,10 +179,7 @@ class RouteController {
188179
}
189180

190181
/// Pushes the previous route state back onto the stack.
191-
void pushBack({
192-
RouteState? fallback,
193-
AnimationEffect? animationEffect = const NoEffect(),
194-
}) {
182+
void pushBack({RouteState? fallback, AnimationEffect? animationEffect = const NoEffect()}) {
195183
if (_prevRouteState.path == '/') {
196184
push(fallback ?? fallbackRouteState(), animationEffect: animationEffect);
197185
} else {
@@ -316,10 +304,7 @@ class RouteController {
316304
builder: (context, results) {
317305
final layerEffects = results.map((e) => e.data).toList()[0];
318306
return PrioritizedIndexedStack(
319-
indices: [
320-
_indexOfRouteState(routeState),
321-
_indexOfRouteState(_prevRouteState),
322-
],
307+
indices: [_indexOfRouteState(routeState), _indexOfRouteState(_prevRouteState)],
323308
layerEffects: layerEffects,
324309
children: _widgetCache.values.toList(),
325310
);
@@ -357,8 +342,7 @@ class RouteController {
357342
//
358343

359344
static RouteController of(BuildContext context) {
360-
final provider = context
361-
.dependOnInheritedWidgetOfExactType<RouteControllerProvider>();
345+
final provider = context.dependOnInheritedWidgetOfExactType<RouteControllerProvider>();
362346
if (provider == null) {
363347
throw Log.err('No RouteStateControllerProvider found in context');
364348
}

0 commit comments

Comments
 (0)