Prepare 2.10 release

lib/constants.dart

@@ -4,9 +4,11 @@
 
 // Only put constants shared between files here.
 
-// height of the 'Gallery' header
 import 'dart:typed_data';
 
+import 'package:transparent_image/transparent_image.dart' as transparent_image;
+
+// Height of the 'Gallery' header
 const double galleryHeaderHeight = 64;
 
 // The font size delta for headline4 font.
@@ -26,11 +28,11 @@ const Duration halfSplashPageAnimationDuration = Duration(milliseconds: 150);
 
 // Duration for settings panel to open on mobile.
 const Duration settingsPanelMobileAnimationDuration =
-    Duration(milliseconds: 600);
+    Duration(milliseconds: 200);
 
 // Duration for settings panel to open on desktop.
 const Duration settingsPanelDesktopAnimationDuration =
-    Duration(milliseconds: 200);
+    Duration(milliseconds: 600);
 
 // Duration for home page elements to fade in.
 const Duration entranceAnimationDuration = Duration(milliseconds: 200);
@@ -39,74 +41,4 @@ const Duration entranceAnimationDuration = Duration(milliseconds: 200);
 const double firstHeaderDesktopTopPadding = 5.0;
 
 // A transparent image used to avoid loading images when they are not needed.
-// TODO(guidezpl): Replace with transparent_image when
-//https://github.com/brianegan/transparent_image/pull/13 is merged.
-final Uint8List kTransparentImage = Uint8List.fromList(<int>[
-  0x89,
-  0x50,
-  0x4E,
-  0x47,
-  0x0D,
-  0x0A,
-  0x1A,
-  0x0A,
-  0x00,
-  0x00,
-  0x00,
-  0x0D,
-  0x49,
-  0x48,
-  0x44,
-  0x52,
-  0x00,
-  0x00,
-  0x00,
-  0x01,
-  0x00,
-  0x00,
-  0x00,
-  0x01,
-  0x08,
-  0x06,
-  0x00,
-  0x00,
-  0x00,
-  0x1F,
-  0x15,
-  0xC4,
-  0x89,
-  0x00,
-  0x00,
-  0x00,
-  0x0A,
-  0x49,
-  0x44,
-  0x41,
-  0x54,
-  0x78,
-  0x9C,
-  0x63,
-  0x00,
-  0x01,
-  0x00,
-  0x00,
-  0x05,
-  0x00,
-  0x01,
-  0x0D,
-  0x0A,
-  0x2D,
-  0xB4,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x49,
-  0x45,
-  0x4E,
-  0x44,
-  0xAE,
-  0x42,
-  0x60,
-  0x82,
-]);
+final Uint8List kTransparentImage = transparent_image.kTransparentImage;

macos/Podfile.lock

@@ -39,4 +39,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.11.3

pubspec.lock

@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "0c80aeab9bc807ab10022cd3b2f4cf2ecdf231949dc1ddd9442406a003f19201"
+      sha256: "569ddca58d535e601dd1584afa117710abc999d036c0cd2c51777fb257df78e8"
       url: "https://pub.dev"
     source: hosted
-    version: "52.0.0"
+    version: "53.0.0"
   adaptive_breakpoints:
     dependency: "direct main"
     description:
@@ -21,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: cd8ee83568a77f3ae6b913a36093a1c9b1264e7cb7f834d9ddd2311dade9c1f4
+      sha256: "10927c4b7c7c88b1adbca278c3d5531db92e2f4b4abf04e2919a800af965f3f5"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "5.5.0"
   animations:
     dependency: "direct main"
     description:
@@ -37,10 +37,10 @@ packages:
     dependency: "direct dev"
     description:
       name: args
-      sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611"
+      sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   async:
     dependency: transitive
     description:
@@ -419,10 +419,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379
+      sha256: "2e32f1640f07caef0d3cb993680f181c79e54a3827b997d5ee221490d131fbd9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.8"
   path_provider_platform_interface:
     dependency: transitive
     description:
@@ -616,10 +616,10 @@ packages:
     dependency: transitive
     description:
       name: source_maps
-      sha256: "490098075234dcedb83c5d949b4c93dad5e6b7702748de000be2b57b8e6b2427"
+      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.11"
+    version: "0.10.12"
   source_span:
     dependency: transitive
     description:
@@ -692,6 +692,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.24"
+  transparent_image:
+    dependency: "direct main"
+    description:
+      name: transparent_image
+      sha256: e8991d955a2094e197ca24c645efec2faf4285772a4746126ca12875e54ca02f
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   typed_data:
     dependency: transitive
     description:
@@ -776,10 +784,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "2277c73618916ae3c2082b6df67b6ebb64b4c69d9bf23b23700707952ac30e60"
+      sha256: a4040e9852e56bf8a3c5a2e08a56f6facd76e75500cf2a922ce5d52394c4998a
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.2"
+    version: "11.0.1"
   watcher:
     dependency: transitive
     description:
@@ -832,10 +840,10 @@ packages:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86
+      sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0+3"
+    version: "1.0.0"
   yaml:
     dependency: transitive
     description:
@@ -846,4 +854,4 @@ packages:
     version: "3.1.1"
 sdks:
   dart: ">=2.19.0 <4.0.0"
-  flutter: ">=3.7.0-1.4.pre"
+  flutter: ">=3.8.0-14.0.pre.2"

pubspec.yaml

@@ -1,10 +1,10 @@
 name: gallery
 description: A resource to help developers evaluate and use Flutter.
 repository: https://github.com/flutter/gallery
-version: 2.10.0+021000
+version: 2.10.0+021000 # See README.md for details on versioning.
 
 environment:
-  flutter: ^3.7.0-1.4.pre # Keep relatively close to master channel version
+  flutter: ^3.8.0-14.0.pre.2 # Keep relatively close to master channel version
   sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
@@ -31,6 +31,7 @@ dependencies:
   scoped_model: ^2.0.0
   shared_preferences: ^2.0.15
   shrine_images: ^2.0.1
+  transparent_image: ^2.0.1
   url_launcher: ^6.1.2
   vector_math: ^2.1.2
 
@@ -48,6 +49,8 @@ dev_dependencies:
   web_benchmarks: ^0.1.0
 
 flutter:
+  generate: true # Enables generation of localized strings from arb files
+  uses-material-design: true
   deferred-components:
     - name: crane
       libraries:
@@ -96,7 +99,10 @@ flutter:
         - packages/flutter_gallery_assets/fonts/google_fonts/Raleway-SemiBold.ttf
         - packages/flutter_gallery_assets/fonts/google_fonts/Raleway-Regular.ttf
         - packages/flutter_gallery_assets/fonts/google_fonts/Raleway-Light.ttf
-
+  fonts:
+    - family: GalleryIcons
+      fonts:
+        - asset: packages/flutter_gallery_assets/fonts/GalleryIcons.ttf
   assets:
     - packages/flutter_gallery_assets/assets/studies/shrine_card_dark.png
     - packages/flutter_gallery_assets/assets/studies/starter_card.png
@@ -249,10 +255,3 @@ flutter:
     - packages/shrine_images/35-0.jpg
     - packages/shrine_images/36-0.jpg
     - packages/shrine_images/37-0.jpg
-
-  generate: true
-  uses-material-design: true
-  fonts:
-    - family: GalleryIcons
-      fonts:
-        - asset: packages/flutter_gallery_assets/fonts/GalleryIcons.ttf

web/index.html

@@ -33,14 +33,14 @@
 
   <script src="flutter.js" defer></script>
 
-  <!-- Global site tag (gtag.js) - Google Analytics -->
-  <script async src="https://www.googletagmanager.com/gtag/js?id=G-V5HG5ZQTYX"></script>
+  <!-- Google tag (gtag.js) -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=G-HBB5H8CECM"></script>
   <script>
     window.dataLayer = window.dataLayer || [];
-    function gtag() { dataLayer.push(arguments); }
+    function gtag(){dataLayer.push(arguments);}
     gtag('js', new Date());
 
-    gtag('config', 'G-V5HG5ZQTYX');
+    gtag('config', 'G-HBB5H8CECM');
   </script>
 </head>
 
@@ -267,4 +267,4 @@
   <!-- App -->
 </body>
 
-</html>
+</html>