Skip to content

Commit 8668843

Browse files
robelatorrobelator
committed
+Update dependencies
1 parent 9fe54e9 commit 8668843

14 files changed

Lines changed: 47 additions & 102 deletions

‎lib/_common.dart‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
1111
//.title~
1212

13+
export 'package:df_log/df_log.dart';
1314
export 'package:df_pod/df_pod.dart';
15+
export 'package:df_pwa_utils/df_pwa_utils.dart';
16+
export 'package:df_safer_dart/df_safer_dart.dart';
1417

1518
export 'package:flutter/foundation.dart';
1619
export 'package:flutter/rendering.dart';

‎lib/src/prioritized_indexed_stack/animation_effect.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
1111
//.title~
1212

13-
import 'package:flutter/widgets.dart';
14-
15-
import '/src/_src.g.dart';
13+
import '/_common.dart';
1614

1715
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1816

‎lib/src/prioritized_indexed_stack/animation_effect_builder.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
1111
//.title~
1212

13-
import 'package:flutter/widgets.dart';
14-
15-
import '/src/_src.g.dart';
13+
import '/_common.dart';
1614

1715
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1816

‎lib/src/prioritized_indexed_stack/animation_layer_effect.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import 'dart:ui' as ui;
1414

15-
import 'package:flutter/widgets.dart';
15+
import '/_common.dart';
1616

1717
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1818

‎lib/src/prioritized_indexed_stack/effects.dart‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
1111
//.title~
1212

13-
import 'package:flutter/foundation.dart';
14-
import 'package:flutter/widgets.dart';
15-
16-
import '/src/_src.g.dart';
13+
import '/_common.dart';
1714

1815
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1916

‎lib/src/prioritized_indexed_stack/layer_effect_result.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
1111
//.title~
1212

13-
import '/src/_src.g.dart';
13+
import '/_common.dart';
1414

1515
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1616

‎lib/src/prioritized_indexed_stack/prioritized_indexed_stack.dart‎

Lines changed: 22 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
1111
//.title~
1212

13-
// ignore_for_file: omit_local_variable_types
14-
1513
import '/_common.dart';
1614

1715
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
@@ -38,9 +36,7 @@ class PrioritizedIndexedStack extends StatelessWidget {
3836

3937
@override
4038
Widget build(BuildContext context) {
41-
final effectiveIndices = indices
42-
.map((index) => index == -1 ? null : index)
43-
.toList();
39+
final effectiveIndices = indices.map((index) => index == -1 ? null : index).toList();
4440

4541
final childOriginalIndexToStackingOrder = <int, int>{};
4642
if (children.isNotEmpty) {
@@ -96,8 +92,7 @@ class _RawPrioritizedIndexedStack extends Stack {
9692
context,
9793
alignment: alignment,
9894
textDirection: textDirection,
99-
why: () =>
100-
'to resolve $alignment for this PrioritizedIndexedStack widget',
95+
why: () => 'to resolve $alignment for this PrioritizedIndexedStack widget',
10196
),
10297
);
10398
return RenderPrioritizedIndexedStack(
@@ -120,8 +115,7 @@ class _RawPrioritizedIndexedStack extends Stack {
120115
context,
121116
alignment: alignment,
122117
textDirection: textDirection,
123-
why: () =>
124-
'to resolve $alignment for this PrioritizedIndexedStack widget',
118+
why: () => 'to resolve $alignment for this PrioritizedIndexedStack widget',
125119
),
126120
);
127121
renderObject
@@ -150,8 +144,8 @@ class RenderPrioritizedIndexedStack extends RenderStack {
150144
super.textDirection,
151145
super.fit,
152146
super.clipBehavior,
153-
}) : _indices = indices,
154-
_layerEffects = layerEffects;
147+
}) : _indices = indices,
148+
_layerEffects = layerEffects;
155149

156150
List<int?> _indices;
157151
List<int?> get indices => _indices;
@@ -191,20 +185,15 @@ class RenderPrioritizedIndexedStack extends RenderStack {
191185
return;
192186
}
193187

194-
for (
195-
var stackingOrder = _indices.length - 1;
196-
stackingOrder >= 0;
197-
stackingOrder--
198-
) {
188+
for (var stackingOrder = _indices.length - 1; stackingOrder >= 0; stackingOrder--) {
199189
final childOriginalIndex = _indices[stackingOrder];
200190
if (childOriginalIndex == null) continue;
201191

202192
final childToPaint = _getChildRenderBox(childOriginalIndex);
203193
if (childToPaint == null) continue;
204194

205195
final childParentData = childToPaint.parentData! as StackParentData;
206-
final effectData =
207-
(_layerEffects != null && stackingOrder < _layerEffects!.length)
196+
final effectData = (_layerEffects != null && stackingOrder < _layerEffects!.length)
208197
? _layerEffects![stackingOrder]
209198
: null;
210199

@@ -220,8 +209,7 @@ class RenderPrioritizedIndexedStack extends RenderStack {
220209
var needsSaveLayer = false;
221210
if (effectData != null) {
222211
// Check if effectData itself is non-null
223-
needsSaveLayer =
224-
(currentOpacity != null && currentOpacity < 1.0) ||
212+
needsSaveLayer = (currentOpacity != null && currentOpacity < 1.0) ||
225213
currentColorFilter != null ||
226214
currentImageFilter != null;
227215
}
@@ -249,9 +237,7 @@ class RenderPrioritizedIndexedStack extends RenderStack {
249237
);
250238
}
251239

252-
final offsetForPainter = needsSaveLayer
253-
? Offset.zero
254-
: absoluteChildPaintOrigin;
240+
final offsetForPainter = needsSaveLayer ? Offset.zero : absoluteChildPaintOrigin;
255241

256242
if (animationTransform != null && !animationTransform.isIdentity()) {
257243
context.pushTransform(
@@ -364,19 +350,14 @@ class RenderPrioritizedIndexedStack extends RenderStack {
364350
return false;
365351
}
366352

367-
for (
368-
var stackingOrder = 0;
369-
stackingOrder < _indices.length;
370-
stackingOrder++
371-
) {
353+
for (var stackingOrder = 0; stackingOrder < _indices.length; stackingOrder++) {
372354
final childOriginalIndex = _indices[stackingOrder];
373355
if (childOriginalIndex == null) continue;
374356

375357
final childToTest = _getChildRenderBox(childOriginalIndex);
376358
if (childToTest == null) continue;
377359

378-
final effectData =
379-
(_layerEffects != null && stackingOrder < _layerEffects!.length)
360+
final effectData = (_layerEffects != null && stackingOrder < _layerEffects!.length)
380361
? _layerEffects![stackingOrder]
381362
: null;
382363

@@ -398,16 +379,15 @@ class RenderPrioritizedIndexedStack extends RenderStack {
398379
hitted = result.addWithPaintTransform(
399380
transform: currentTransform,
400381
position: position - childStackOffset,
401-
hitTest:
402-
(
403-
BoxHitTestResult hitTestResult,
404-
Offset transformedLocalPosition,
405-
) {
406-
return childToTest.hitTest(
407-
hitTestResult,
408-
position: transformedLocalPosition,
409-
);
410-
},
382+
hitTest: (
383+
BoxHitTestResult hitTestResult,
384+
Offset transformedLocalPosition,
385+
) {
386+
return childToTest.hitTest(
387+
hitTestResult,
388+
position: transformedLocalPosition,
389+
);
390+
},
411391
);
412392
} else {
413393
hitted = result.addWithPaintOffset(
@@ -499,8 +479,7 @@ class RenderPrioritizedIndexedStack extends RenderStack {
499479
class _PrioritizedIndexedStackElement extends MultiChildRenderObjectElement {
500480
_PrioritizedIndexedStackElement(_RawPrioritizedIndexedStack super.widget);
501481
@override
502-
_RawPrioritizedIndexedStack get widget =>
503-
super.widget as _RawPrioritizedIndexedStack;
482+
_RawPrioritizedIndexedStack get widget => super.widget as _RawPrioritizedIndexedStack;
504483
// ... (debugVisitOnstageChildren remains the same) ...
505484
@override
506485
void debugVisitOnstageChildren(ElementVisitor visitor) {
@@ -514,9 +493,7 @@ class _PrioritizedIndexedStackElement extends MultiChildRenderObjectElement {
514493
// ignore: prefer_collection_literals
515494
final visitedChildIndices = LinkedHashSet<int>();
516495
for (final targetIndex in effectiveIndices) {
517-
if (targetIndex != null &&
518-
targetIndex >= 0 &&
519-
targetIndex < children.length) {
496+
if (targetIndex != null && targetIndex >= 0 && targetIndex < children.length) {
520497
if (visitedChildIndices.add(targetIndex)) {
521498
visitor(children.elementAt(targetIndex));
522499
}

‎lib/src/route_builder.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
1111
//.title~
1212

13-
import 'package:flutter/widgets.dart';
14-
15-
import '_src.g.dart';
13+
import '/_common.dart';
1614

1715
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1816

‎lib/src/route_contoller_provider.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
1111
//.title~
1212

13-
import 'package:flutter/widgets.dart';
14-
15-
import '_src.g.dart';
13+
import '/_common.dart';
1614

1715
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1816

‎lib/src/route_controller.dart‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,7 @@
1212

1313
// ignore_for_file: invalid_use_of_protected_member, invalid_use_of_visible_for_testing_member
1414

15-
import 'package:df_log/df_log.dart' show Log;
16-
import 'package:flutter/widgets.dart';
17-
18-
import 'package:df_pod/df_pod.dart';
19-
import 'package:df_pwa_utils/df_pwa_utils.dart';
20-
21-
import '_src.g.dart';
15+
import '/_common.dart';
2216

2317
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
2418

@@ -54,8 +48,7 @@ class RouteController {
5448
RouteState Function()? initialRouteState,
5549
this.errorRouteState,
5650
required this.fallbackRouteState,
57-
required List<RouteBuilder>
58-
builders, // Changed: parameter name, not assigned to a field
51+
required List<RouteBuilder> builders, // Changed: parameter name, not assigned to a field
5952
}) {
6053
// Initialize the _builderMap from the `builders` parameter
6154
_builderMap = {
@@ -66,17 +59,15 @@ class RouteController {
6659
// Set all the builder output to SizedBox.shrink.
6760
resetState();
6861
_requested = current;
69-
final routeState =
70-
initialRouteState?.call() ?? _requested ?? fallbackRouteState();
62+
final routeState = initialRouteState?.call() ?? _requested ?? fallbackRouteState();
7163
push(routeState);
7264
}
7365

7466
//
7567
//
7668
//
7769

78-
RouteState getNavigatorOrFallbackRouteState() =>
79-
_requested ?? fallbackRouteState();
70+
RouteState getNavigatorOrFallbackRouteState() => _requested ?? fallbackRouteState();
8071

8172
//
8273
//
@@ -149,9 +140,8 @@ class RouteController {
149140
void resetState() {
150141
clearCache();
151142
// Now iterates over _builderMap.values.
152-
final routeStates = _builderMap.values
153-
.where((builder) => builder.shouldPrebuild)
154-
.map((e) => e.routeState);
143+
final routeStates =
144+
_builderMap.values.where((builder) => builder.shouldPrebuild).map((e) => e.routeState);
155145
addToCache(routeStates);
156146
}
157147

@@ -354,8 +344,7 @@ class RouteController {
354344
//
355345

356346
static RouteController of(BuildContext context) {
357-
final provider = context
358-
.dependOnInheritedWidgetOfExactType<RouteControllerProvider>();
347+
final provider = context.dependOnInheritedWidgetOfExactType<RouteControllerProvider>();
359348
if (provider == null) {
360349
throw Log.err('No RouteStateControllerProvider found in context');
361350
}

0 commit comments

Comments
 (0)