Merge branch 'main' into vs_squashed

Author: ruicraveiro

.ci/flutter_master.version

@@ -1 +1 @@
-303f222e17e3aede60f12dadc37b4d626ced48de
+2d30fe448cd41eaf4778a735e852ec7a7bb6eaf9

packages/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml

@@ -17,7 +17,7 @@ dependencies:
   flutter:
     sdk: flutter
   google_sign_in: ^6.0.0
-  googleapis: ^10.1.0
+  googleapis: ">=10.1.0 <14.0.0"
   googleapis_auth: ^1.1.0
 
 dev_dependencies:

packages/file_selector/file_selector_android/example/android/app/build.gradle

@@ -41,7 +41,7 @@ android {
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

packages/flutter_adaptive_scaffold/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.3.1
+
+* Use improved MediaQuery methods.
+
+## 0.3.0
+
+* Adds `inDuration`, `outDuration`, `inCurve`, and `outCurve` parameters for 
+configuring additional `SlotLayoutConfig` animation behavior.
+* **BREAKING CHANGES**:
+  * Removes `duration` parameter from `SlotLayoutConfig`.
+
 ## 0.2.6
 
 * Add new sample for using AdaptiveScaffold with GoRouter.

packages/flutter_adaptive_scaffold/example/lib/main.dart

@@ -693,7 +693,7 @@ class _ItemListTile extends StatelessWidget {
                     style: Theme.of(context).textTheme.bodyLarge),
                 const SizedBox(height: 9),
                 SizedBox(
-                  width: MediaQuery.of(context).size.width,
+                  width: MediaQuery.sizeOf(context).width,
                   child: (email.bodyImage != '')
                       ? Image.asset(email.bodyImage)
                       : Container(),
@@ -717,7 +717,7 @@ class _DetailTile extends StatelessWidget {
     return Padding(
       padding: const EdgeInsets.all(8.0),
       child: SizedBox(
-        height: MediaQuery.of(context).size.height,
+        height: MediaQuery.sizeOf(context).height,
         child: Container(
           decoration: const BoxDecoration(
             color: Color.fromARGB(255, 245, 241, 248),
@@ -891,7 +891,7 @@ class _EmailTile extends StatelessWidget {
                       color: Colors.grey[700], height: 1.35, fontSize: 14.5)),
               const SizedBox(height: 9),
               SizedBox(
-                  width: MediaQuery.of(context).size.width,
+                  width: MediaQuery.sizeOf(context).width,
                   child:
                       (bodyImage != '') ? Image.asset(bodyImage) : Container()),
               const SizedBox(height: 10),

packages/flutter_adaptive_scaffold/lib/src/adaptive_layout.dart

@@ -293,7 +293,7 @@ class _AdaptiveLayoutState extends State<AdaptiveLayout>
     });
 
     Rect? hinge;
-    for (final DisplayFeature e in MediaQuery.of(context).displayFeatures) {
+    for (final DisplayFeature e in MediaQuery.displayFeaturesOf(context)) {
       if (e.type == DisplayFeatureType.hinge ||
           e.type == DisplayFeatureType.fold) {
         if (e.bounds.left != 0) {

packages/flutter_adaptive_scaffold/lib/src/adaptive_scaffold.dart

@@ -362,7 +362,7 @@ class AdaptiveScaffold extends StatefulWidget {
         padding: padding,
         child: SizedBox(
           width: width,
-          height: MediaQuery.of(context).size.height,
+          height: MediaQuery.sizeOf(context).height,
           child: LayoutBuilder(
             builder: (BuildContext context, BoxConstraints constraints) {
               return SingleChildScrollView(

packages/flutter_adaptive_scaffold/lib/src/slot_layout.dart

@@ -72,14 +72,20 @@ class SlotLayout extends StatefulWidget {
     WidgetBuilder? builder,
     Widget Function(Widget, Animation<double>)? inAnimation,
     Widget Function(Widget, Animation<double>)? outAnimation,
-    Duration? duration,
+    Duration? inDuration,
+    Duration? outDuration,
+    Curve? inCurve,
+    Curve? outCurve,
     required Key key,
   }) =>
       SlotLayoutConfig._(
         builder: builder,
         inAnimation: inAnimation,
         outAnimation: outAnimation,
-        duration: duration,
+        inDuration: inDuration,
+        outDuration: outDuration,
+        inCurve: inCurve,
+        outCurve: outCurve,
         key: key,
       );
 
@@ -96,7 +102,11 @@ class _SlotLayoutState extends State<SlotLayout>
     chosenWidget = SlotLayout.pickWidget(context, widget.config);
     bool hasAnimation = false;
     return AnimatedSwitcher(
-        duration: chosenWidget?.duration ?? const Duration(milliseconds: 1000),
+        duration:
+            chosenWidget?.inDuration ?? const Duration(milliseconds: 1000),
+        reverseDuration: chosenWidget?.outDuration,
+        switchInCurve: chosenWidget?.inCurve ?? Curves.linear,
+        switchOutCurve: chosenWidget?.outCurve ?? Curves.linear,
         layoutBuilder: (Widget? currentChild, List<Widget> previousChildren) {
           final Stack elements = Stack(
             children: <Widget>[
@@ -137,7 +147,10 @@ class SlotLayoutConfig extends StatelessWidget {
     required this.builder,
     this.inAnimation,
     this.outAnimation,
-    this.duration,
+    this.inDuration,
+    this.outDuration,
+    this.inCurve,
+    this.outCurve,
   });
 
   /// The child Widget that [SlotLayout] eventually returns with an animation.
@@ -161,8 +174,21 @@ class SlotLayoutConfig extends StatelessWidget {
   ///   as the returned widget.
   final Widget Function(Widget, Animation<double>)? outAnimation;
 
-  /// The amount of time taken by the execution of the in and out animations.
-  final Duration? duration;
+  /// The duration of the transition from the old child to the new one during
+  /// a switch in [SlotLayout].
+  final Duration? inDuration;
+
+  /// The duration of the transition from the new child to the old one during
+  /// a switch in [SlotLayout].
+  final Duration? outDuration;
+
+  /// The animation curve to use when transitioning in a new child during a
+  /// switch in [SlotLayout].
+  final Curve? inCurve;
+
+  /// The animation curve to use when transitioning a previous slot out during
+  /// a switch in [SlotLayout].
+  final Curve? outCurve;
 
   /// An empty [SlotLayoutConfig] to be placed in a slot to indicate that the slot
   /// should show nothing.

packages/flutter_adaptive_scaffold/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_adaptive_scaffold
 description: Widgets to easily build adaptive layouts, including navigation elements.
-version: 0.2.6
+version: 0.3.1
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_adaptive_scaffold%22
 repository: https://github.com/flutter/packages/tree/main/packages/flutter_adaptive_scaffold
 

packages/flutter_adaptive_scaffold/test/adaptive_layout_test.dart

@@ -443,35 +443,35 @@ void main() {
 class TestBreakpoint0 extends Breakpoint {
   @override
   bool isActive(BuildContext context) {
-    return MediaQuery.of(context).size.width >= 0;
+    return MediaQuery.sizeOf(context).width >= 0;
   }
 }
 
 class TestBreakpoint400 extends Breakpoint {
   @override
   bool isActive(BuildContext context) {
-    return MediaQuery.of(context).size.width > 400;
+    return MediaQuery.sizeOf(context).width > 400;
   }
 }
 
 class TestBreakpoint800 extends Breakpoint {
   @override
   bool isActive(BuildContext context) {
-    return MediaQuery.of(context).size.width > 800;
+    return MediaQuery.sizeOf(context).width > 800;
   }
 }
 
 class TestBreakpoint1200 extends Breakpoint {
   @override
   bool isActive(BuildContext context) {
-    return MediaQuery.of(context).size.width > 1200;
+    return MediaQuery.sizeOf(context).width > 1200;
   }
 }
 
 class TestBreakpoint1600 extends Breakpoint {
   @override
   bool isActive(BuildContext context) {
-    return MediaQuery.of(context).size.width > 1600;
+    return MediaQuery.sizeOf(context).width > 1600;
   }
 }
 
@@ -664,35 +664,35 @@ MediaQuery slot(double width, Duration duration, WidgetTester tester) {
           TestBreakpoint0(): SlotLayout.from(
             inAnimation: leftOutIn,
             outAnimation: leftInOut,
-            duration: duration,
+            inDuration: duration,
             key: const Key('0'),
             builder: (_) => const SizedBox(width: 10, height: 10),
           ),
           TestBreakpoint400(): SlotLayout.from(
             inAnimation: leftOutIn,
             outAnimation: leftInOut,
-            duration: duration,
+            inDuration: duration,
             key: const Key('400'),
             builder: (_) => const SizedBox(width: 10, height: 10),
           ),
           TestBreakpoint800(): SlotLayout.from(
             inAnimation: leftOutIn,
             outAnimation: leftInOut,
-            duration: duration,
+            inDuration: duration,
             key: const Key('800'),
             builder: (_) => const SizedBox(width: 10, height: 10),
           ),
           TestBreakpoint1200(): SlotLayout.from(
             inAnimation: leftOutIn,
             outAnimation: leftInOut,
-            duration: duration,
+            inDuration: duration,
             key: const Key('1200'),
             builder: (_) => const SizedBox(width: 10, height: 10),
           ),
           TestBreakpoint1600(): SlotLayout.from(
             inAnimation: leftOutIn,
             outAnimation: leftInOut,
-            duration: duration,
+            inDuration: duration,
             key: const Key('1600'),
             builder: (_) => const SizedBox(width: 10, height: 10),
           ),