Formatted files nad dart fixed analyze errors

slovnicki · Aug 6, 2024 · 80617d0 · 80617d0
1 parent 2432fbd
commit 80617d0
Show file tree

Hide file tree

Showing 12 changed files with 215 additions and 92 deletions.
diff --git a/package/lib/src/beam_guard.dart b/package/lib/src/beam_guard.dart
@@ -122,7 +122,8 @@ class BeamGuard {
     onCheckFailed?.call(context, target);
 
     if (showPage != null) {
-      final redirectBeamStack = GuardShowPage(target.state.routeInformation, showPage!);
+      final redirectBeamStack =
+          GuardShowPage(target.state.routeInformation, showPage!);
       if (replaceCurrentStack) {
         delegate.beamToReplacement(redirectBeamStack);
       } else {
@@ -140,11 +141,13 @@ class BeamGuard {
 
     if (beamTo != null) {
       final redirectBeamStack = beamTo!(context, origin, target, deepLink);
-      if (redirectBeamStack.state.routeInformation.uri == target.state.routeInformation.uri) {
+      if (redirectBeamStack.state.routeInformation.uri ==
+          target.state.routeInformation.uri) {
         // just block if this will produce an immediate infinite loop
         return true;
       }
-      if (redirectBeamStack.state.routeInformation.uri == origin.state.routeInformation.uri) {
+      if (redirectBeamStack.state.routeInformation.uri ==
+          origin.state.routeInformation.uri) {
         // just block if redirect is the current route
         return true;
       }

diff --git a/package/lib/src/beam_interceptor_pop_scope.dart b/package/lib/src/beam_interceptor_pop_scope.dart
@@ -37,7 +37,8 @@ class BeamInterceptorPopScope extends StatefulWidget {
   final BeamerDelegate? beamerDelegate;
 
   @override
-  State<BeamInterceptorPopScope> createState() => _BeamInterceptorPopScopeState();
+  State<BeamInterceptorPopScope> createState() =>
+      _BeamInterceptorPopScopeState();
 }
 
 class _BeamInterceptorPopScopeState extends State<BeamInterceptorPopScope> {

diff --git a/package/lib/src/beam_page.dart b/package/lib/src/beam_page.dart
@@ -85,11 +85,15 @@ class BeamPage extends Page {
     // Take the history element that is being popped and the one before
     // as they will be compared later on to fine-tune the pop experience.
     final poppedHistoryElement = delegate.removeLastHistoryElement()!;
-    final previousHistoryElement = delegate.beamingHistory.isNotEmpty ? delegate.beamingHistory.last.history.last : null;
+    final previousHistoryElement = delegate.beamingHistory.isNotEmpty
+        ? delegate.beamingHistory.last.history.last
+        : null;
 
     // Convert both to Uri as their path and query will be compared.
     final poppedUri = poppedHistoryElement.routeInformation.uri;
-    final previousUri = previousHistoryElement != null ? previousHistoryElement.routeInformation.uri : Uri.parse(delegate.initialPath);
+    final previousUri = previousHistoryElement != null
+        ? previousHistoryElement.routeInformation.uri
+        : Uri.parse(delegate.initialPath);
 
     final poppedPathSegments = poppedUri.pathSegments;
     final poppedQueryParameters = poppedUri.queryParameters;
@@ -120,7 +124,8 @@ class BeamPage extends Page {
     // Otherwise, find the route information with popPath in history.
     RouteInformation? lastRouteInformation;
     if (popPath == previousUri.path) {
-      lastRouteInformation = delegate.removeLastHistoryElement()?.routeInformation;
+      lastRouteInformation =
+          delegate.removeLastHistoryElement()?.routeInformation;
     } else {
       // find the last
       var found = false;
@@ -222,7 +227,8 @@ class BeamPage extends Page {
   /// `context` is the build context.
   /// `child` is the child of this [BeamPage]
   /// `settings` will be passed to [PageRoute] constructor.
-  final Route Function(BuildContext context, RouteSettings settings, Widget child)? routeBuilder;
+  final Route Function(
+      BuildContext context, RouteSettings settings, Widget child)? routeBuilder;
 
   /// Whether to present current [BeamPage] as a fullscreen dialog
   ///
@@ -260,7 +266,8 @@ class BeamPage extends Page {
           settings: this,
           pageBuilder: (_, __, ___) => child,
           transitionDuration: transitionDuration ?? Duration(milliseconds: 300),
-          reverseTransitionDuration: reverseTransitionDuration ?? Duration(milliseconds: 300),
+          reverseTransitionDuration:
+              reverseTransitionDuration ?? Duration(milliseconds: 300),
           transitionsBuilder: (_, animation, __, child) => FadeTransition(
             opacity: animation,
             child: child,
@@ -273,9 +280,12 @@ class BeamPage extends Page {
           settings: this,
           pageBuilder: (_, __, ___) => child,
           transitionDuration: transitionDuration ?? Duration(milliseconds: 300),
-          reverseTransitionDuration: reverseTransitionDuration ?? Duration(milliseconds: 300),
+          reverseTransitionDuration:
+              reverseTransitionDuration ?? Duration(milliseconds: 300),
           transitionsBuilder: (_, animation, __, child) => SlideTransition(
-            position: animation.drive(Tween(begin: const Offset(0, 1), end: const Offset(0, 0)).chain(CurveTween(curve: Curves.ease))),
+            position: animation.drive(
+                Tween(begin: const Offset(0, 1), end: const Offset(0, 0))
+                    .chain(CurveTween(curve: Curves.ease))),
             child: child,
           ),
         );
@@ -286,9 +296,12 @@ class BeamPage extends Page {
           settings: this,
           pageBuilder: (_, __, ___) => child,
           transitionDuration: transitionDuration ?? Duration(milliseconds: 300),
-          reverseTransitionDuration: reverseTransitionDuration ?? Duration(milliseconds: 300),
+          reverseTransitionDuration:
+              reverseTransitionDuration ?? Duration(milliseconds: 300),
           transitionsBuilder: (_, animation, __, child) => SlideTransition(
-            position: animation.drive(Tween(begin: const Offset(1, 0), end: const Offset(0, 0)).chain(CurveTween(curve: Curves.ease))),
+            position: animation.drive(
+                Tween(begin: const Offset(1, 0), end: const Offset(0, 0))
+                    .chain(CurveTween(curve: Curves.ease))),
             child: child,
           ),
         );
@@ -299,9 +312,12 @@ class BeamPage extends Page {
           settings: this,
           pageBuilder: (_, __, ___) => child,
           transitionDuration: transitionDuration ?? Duration(milliseconds: 300),
-          reverseTransitionDuration: reverseTransitionDuration ?? Duration(milliseconds: 300),
+          reverseTransitionDuration:
+              reverseTransitionDuration ?? Duration(milliseconds: 300),
           transitionsBuilder: (_, animation, __, child) => SlideTransition(
-            position: animation.drive(Tween(begin: const Offset(-1, 0), end: const Offset(0, 0)).chain(CurveTween(curve: Curves.ease))),
+            position: animation.drive(
+                Tween(begin: const Offset(-1, 0), end: const Offset(0, 0))
+                    .chain(CurveTween(curve: Curves.ease))),
             child: child,
           ),
         );
@@ -312,9 +328,12 @@ class BeamPage extends Page {
           settings: this,
           pageBuilder: (_, __, ___) => child,
           transitionDuration: transitionDuration ?? Duration(milliseconds: 300),
-          reverseTransitionDuration: reverseTransitionDuration ?? Duration(milliseconds: 300),
+          reverseTransitionDuration:
+              reverseTransitionDuration ?? Duration(milliseconds: 300),
           transitionsBuilder: (_, animation, __, child) => SlideTransition(
-            position: animation.drive(Tween(begin: const Offset(0, -1), end: const Offset(0, 0)).chain(CurveTween(curve: Curves.ease))),
+            position: animation.drive(
+                Tween(begin: const Offset(0, -1), end: const Offset(0, 0))
+                    .chain(CurveTween(curve: Curves.ease))),
             child: child,
           ),
         );
@@ -325,7 +344,8 @@ class BeamPage extends Page {
           settings: this,
           pageBuilder: (_, __, ___) => child,
           transitionDuration: transitionDuration ?? Duration(milliseconds: 300),
-          reverseTransitionDuration: reverseTransitionDuration ?? Duration(milliseconds: 300),
+          reverseTransitionDuration:
+              reverseTransitionDuration ?? Duration(milliseconds: 300),
           transitionsBuilder: (_, animation, __, child) => ScaleTransition(
             scale: animation,
             child: child,

diff --git a/package/lib/src/beam_stack.dart b/package/lib/src/beam_stack.dart
@@ -45,7 +45,9 @@ class BeamParameters {
   }) {
     return BeamParameters(
       transitionDelegate: transitionDelegate ?? this.transitionDelegate,
-      popConfiguration: resetPopConfiguration ? null : popConfiguration ?? this.popConfiguration,
+      popConfiguration: resetPopConfiguration
+          ? null
+          : popConfiguration ?? this.popConfiguration,
       beamBackOnPop: beamBackOnPop ?? this.beamBackOnPop,
       popBeamStackOnPop: popBeamStackOnPop ?? this.popBeamStackOnPop,
       stacked: stacked ?? this.stacked,
@@ -81,7 +83,8 @@ class HistoryElement {
 ///   * keeping a [state] that provides the link between the first 2
 ///
 /// Extend this class to define your stacks to which you can then beam to.
-abstract class BeamStack<T extends RouteInformationSerializable> extends ChangeNotifier {
+abstract class BeamStack<T extends RouteInformationSerializable>
+    extends ChangeNotifier {
   /// Creates a [BeamStack] with specified properties.
   ///
   /// All attributes can be null.
@@ -166,7 +169,8 @@ abstract class BeamStack<T extends RouteInformationSerializable> extends ChangeN
   /// One should override this if using a custom state class.
   ///
   /// See [create].
-  T createState(RouteInformation routeInformation) => BeamState.fromRouteInformation(
+  T createState(RouteInformation routeInformation) =>
+      BeamState.fromRouteInformation(
         routeInformation,
         beamStack: this,
       ) as T;
@@ -279,7 +283,8 @@ abstract class BeamStack<T extends RouteInformationSerializable> extends ChangeN
         history.removeRange(sameStateIndex, history.length);
       }
     }
-    if (history.isEmpty || routeInformation.uri != history.last.routeInformation.uri) {
+    if (history.isEmpty ||
+        routeInformation.uri != history.last.routeInformation.uri) {
       history.add(HistoryElement(routeInformation, beamParameters));
     }
   }
@@ -317,7 +322,9 @@ abstract class BeamStack<T extends RouteInformationSerializable> extends ChangeN
     for (final pathPattern in pathPatterns) {
       if (pathPattern is String) {
         // If it is an exact match or asterisk pattern
-        if (pathPattern == uri.path || pathPattern == '/*' || pathPattern == '*') {
+        if (pathPattern == uri.path ||
+            pathPattern == '/*' ||
+            pathPattern == '*') {
           return true;
         }
 
@@ -331,13 +338,16 @@ abstract class BeamStack<T extends RouteInformationSerializable> extends ChangeN
 
         // If we're in strict mode and URI has fewer segments than pattern,
         // we don't have a match so can continue.
-        if (strictPathPatterns && uriPathSegments.length < pathPatternSegments.length) {
+        if (strictPathPatterns &&
+            uriPathSegments.length < pathPatternSegments.length) {
           continue;
         }
 
         // If URI has more segments and pattern doesn't end with asterisk,
         // we don't have a match so can continue.
-        if (uriPathSegments.length > pathPatternSegments.length && (pathPatternSegments.isEmpty || !pathPatternSegments.last.endsWith('*'))) {
+        if (uriPathSegments.length > pathPatternSegments.length &&
+            (pathPatternSegments.isEmpty ||
+                !pathPatternSegments.last.endsWith('*'))) {
           continue;
         }
 
@@ -347,7 +357,8 @@ abstract class BeamStack<T extends RouteInformationSerializable> extends ChangeN
           // If all checks have passed up to i,
           // if pattern has no more segments to traverse and it ended with asterisk,
           // it is a match and we can break,
-          if (pathPatternSegments.length < i + 1 && pathPatternSegments.last.endsWith('*')) {
+          if (pathPatternSegments.length < i + 1 &&
+              pathPatternSegments.last.endsWith('*')) {
             checksPassed = true;
             break;
           }
@@ -359,7 +370,8 @@ abstract class BeamStack<T extends RouteInformationSerializable> extends ChangeN
           }
           // If they are not the same and pattern doesn't expects path parameter,
           // there's no match and we can break.
-          if (uriPathSegments[i] != pathPatternSegments[i] && !pathPatternSegments[i].startsWith(':')) {
+          if (uriPathSegments[i] != pathPatternSegments[i] &&
+              !pathPatternSegments[i].startsWith(':')) {
             checksPassed = false;
             break;
           }
@@ -408,7 +420,9 @@ abstract class BeamStack<T extends RouteInformationSerializable> extends ChangeN
 
       if (asteriskIndex == -1) return guardPathPattern == path;
 
-      return uri.toString().contains(guardPathPattern.substring(0, asteriskIndex));
+      return uri
+          .toString()
+          .contains(guardPathPattern.substring(0, asteriskIndex));
     }
 
     return false;
@@ -526,7 +540,8 @@ class GuardShowPage extends BeamStack<BeamState> {
   final BeamPage beamPage;
 
   @override
-  List<BeamPage> buildPages(BuildContext context, BeamState state) => [beamPage];
+  List<BeamPage> buildPages(BuildContext context, BeamState state) =>
+      [beamPage];
 
   @override
   List<String> get pathPatterns => [routeInformation.uri.path];
@@ -580,8 +595,10 @@ class RoutesBeamStack extends BeamStack<BeamState> {
   @override
   List<BeamPage> buildPages(BuildContext context, BeamState state) {
     final filteredRoutes = chooseRoutes(state.routeInformation, routes.keys);
-    final routeBuilders = Map.of(routes)..removeWhere((key, value) => !filteredRoutes.containsKey(key));
-    final sortedRoutes = routeBuilders.keys.toList()..sort((a, b) => _compareKeys(a, b));
+    final routeBuilders = Map.of(routes)
+      ..removeWhere((key, value) => !filteredRoutes.containsKey(key));
+    final sortedRoutes = routeBuilders.keys.toList()
+      ..sort((a, b) => _compareKeys(a, b));
     final pages = sortedRoutes.map<BeamPage>((route) {
       final routeElement = routes[route]!(context, state, data);
       if (routeElement is BeamPage) {

diff --git a/package/lib/src/beamer.dart b/package/lib/src/beamer.dart
@@ -1,5 +1,6 @@
 import 'package:beamer/beamer.dart';
-import 'package:beamer/src/path_url_strategy_nonweb.dart' if (dart.library.html) 'path_url_strategy_web.dart' as url_strategy;
+import 'package:beamer/src/path_url_strategy_nonweb.dart'
+    if (dart.library.html) 'path_url_strategy_web.dart' as url_strategy;
 import 'package:flutter/widgets.dart';
 
 /// Represents a navigation area and is a wrapper for [Router].
@@ -40,7 +41,8 @@ class Beamer extends StatefulWidget {
       final delegate = Router.of(context).routerDelegate as BeamerDelegate;
       return root ? delegate.root : delegate;
     } catch (e) {
-      assert(BeamerProvider.of(context) != null, 'There was no Router nor BeamerProvider in current context. If using MaterialApp.builder, wrap the MaterialApp.router in BeamerProvider to which you pass the same routerDelegate as to MaterialApp.router.');
+      assert(BeamerProvider.of(context) != null,
+          'There was no Router nor BeamerProvider in current context. If using MaterialApp.builder, wrap the MaterialApp.router in BeamerProvider to which you pass the same routerDelegate as to MaterialApp.router.');
       return BeamerProvider.of(context)!.routerDelegate;
     }
   }
@@ -91,9 +93,11 @@ class BeamerState extends State<Beamer> {
     // The parent will only be null, if this state is disposed and therefore
     // `build` cannot be called on it any more.
     final backButtonDispatcher = widget.backButtonDispatcher ??
-        ((parent!.backButtonDispatcher is BeamerBackButtonDispatcher && widget.createBackButtonDispatcher)
+        ((parent!.backButtonDispatcher is BeamerBackButtonDispatcher &&
+                widget.createBackButtonDispatcher)
             ? BeamerChildBackButtonDispatcher(
-                parent: parent!.backButtonDispatcher! as BeamerBackButtonDispatcher,
+                parent:
+                    parent!.backButtonDispatcher! as BeamerBackButtonDispatcher,
                 delegate: routerDelegate,
               )
             : null);