Merge branch 'flutter:main' into purchase-details-jsonRepresentation

Author: shaunpanjabi

.ci/flutter_master.version

@@ -1 +1 @@
-0e536eb9fe4b15eb22ea62c0652f0851b9580026
+d8baa77b38461e7061e06e72c6bf50d64d302b8c

packages/camera/camera/CHANGELOG.md

@@ -1,3 +1,7 @@
+## NEXT
+
+* Fixes overflowed toggles in the camera example.
+
 ## 0.11.1
 
 * Adds API support query for image streaming.

packages/camera/camera/example/lib/main.dart

@@ -225,43 +225,33 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
 
   /// Display the thumbnail of the captured image or video.
   Widget _thumbnailWidget() {
-    final VideoPlayerController? localVideoController = videoController;
-
-    return Expanded(
-      child: Align(
-        alignment: Alignment.centerRight,
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: <Widget>[
-            if (localVideoController == null && imageFile == null)
-              Container()
-            else
-              SizedBox(
-                width: 64.0,
-                height: 64.0,
-                child: (localVideoController == null)
-                    ? (
-                        // The captured image on the web contains a network-accessible URL
-                        // pointing to a location within the browser. It may be displayed
-                        // either with Image.network or Image.memory after loading the image
-                        // bytes to memory.
-                        kIsWeb
-                            ? Image.network(imageFile!.path)
-                            : Image.file(File(imageFile!.path)))
-                    : Container(
-                        decoration: BoxDecoration(
-                            border: Border.all(color: Colors.pink)),
-                        child: Center(
-                          child: AspectRatio(
-                              aspectRatio:
-                                  localVideoController.value.aspectRatio,
-                              child: VideoPlayer(localVideoController)),
-                        ),
-                      ),
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: <Widget>[
+        if (videoController case final VideoPlayerController controller?)
+          Container(
+            width: 64.0,
+            height: 64.0,
+            decoration: BoxDecoration(border: Border.all(color: Colors.pink)),
+            child: Center(
+              child: AspectRatio(
+                aspectRatio: controller.value.aspectRatio,
+                child: VideoPlayer(controller),
               ),
-          ],
-        ),
-      ),
+            ),
+          )
+        else if (imageFile?.path case final String path)
+          Container(
+            width: 64.0,
+            height: 64.0,
+            decoration: BoxDecoration(border: Border.all(color: Colors.pink)),
+            // The captured image on the web contains a network-accessible URL
+            // pointing to a location within the browser. It may be displayed
+            // either with Image.network or Image.memory after loading the image
+            // bytes to memory.
+            child: kIsWeb ? Image.network(path) : Image.file(File(path)),
+          ),
+      ],
     );
   }
 
@@ -598,7 +588,12 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
       }
     }
 
-    return Row(children: toggles);
+    return Expanded(
+      child: SizedBox(
+        height: 56.0,
+        child: ListView(scrollDirection: Axis.horizontal, children: toggles),
+      ),
+    );
   }
 
   String timestamp() => DateTime.now().millisecondsSinceEpoch.toString();
@@ -1048,6 +1043,9 @@ class CameraApp extends StatelessWidget {
   }
 }
 
+/// Getting available cameras for testing.
+@visibleForTesting
+List<CameraDescription> get cameras => _cameras;
 List<CameraDescription> _cameras = <CameraDescription>[];
 
 Future<void> main() async {

packages/camera/camera/example/test/main_test.dart

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:camera/camera.dart';
 import 'package:camera_example/main.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -13,4 +14,23 @@ void main() {
     await tester.pumpAndSettle();
     expect(find.byType(SnackBar), findsOneWidget);
   });
+
+  testWidgets(
+    'CameraDescription toggles will not overflow',
+    (WidgetTester tester) async {
+      WidgetsFlutterBinding.ensureInitialized();
+      // Adds 10 fake camera descriptions.
+      for (int i = 0; i < 10; i++) {
+        cameras.add(
+          CameraDescription(
+            name: 'camera_$i',
+            lensDirection: CameraLensDirection.back,
+            sensorOrientation: 90,
+          ),
+        );
+      }
+      await tester.pumpWidget(const CameraApp());
+      await tester.pumpAndSettle();
+    },
+  );
 }

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.6.18+2
+
+* Fixes premature garbage collection of native objects when app is under memory pressure.
+
+## 0.6.18+1
+
+* Makes Java style improvements.
+
 ## 0.6.18
 
 * Adds support for the `MediaSettings.enableAudio` setting, which determines whether or not audio is

packages/camera/camera_android_camerax/android/build.gradle

@@ -49,6 +49,11 @@ android {
         unitTests.includeAndroidResources = true
         unitTests.returnDefaultValues = true
         unitTests.all {
+            // The org.gradle.jvmargs property that may be set in gradle.properties does not impact
+            // the Java heap size when running the Android unit tests. The following property here
+            // sets the heap size to a size large enough to run the robolectric tests across
+            // multiple SDK levels.
+            jvmArgs "-Xmx1G"
             testLogging {
                events "passed", "skipped", "failed", "standardOut", "standardError"
                outputs.upToDateWhen {false}