Merge branch 'main' of github.com:flutter/samples into navigation-and-routing-update

.github/workflows/scorecards-analysis.yml

@@ -27,7 +27,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736
         with:
           results_file: results.sarif
           results_format: sarif

add_to_app/books/flutter_module_books/pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
 dev_dependencies:
   analysis_defaults:
     path: ../../../analysis_defaults
-  pigeon: ">=11.0.0 <13.0.0"
+  pigeon: ">=11.0.0 <14.0.0"
   flutter_test:
     sdk: flutter
 

isolate_example/lib/infinite_process_page.dart

@@ -54,7 +54,10 @@ class InfiniteProcessPage extends StatelessWidget {
           Column(
             mainAxisSize: MainAxisSize.min,
             children: [
-              ButtonBar(
+              Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: OverflowBar(
+                  spacing: 8.0,
                   alignment: MainAxisAlignment.center,
                   children: [
                     ElevatedButton(
@@ -69,6 +72,7 @@ class InfiniteProcessPage extends StatelessWidget {
                     ),
                   ],
                 ),
+              ),
               Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [

place_tracker/lib/place_map.dart

@@ -440,28 +440,32 @@ class _AddPlaceButtonBar extends StatelessWidget {
       child: Container(
         padding: const EdgeInsets.fromLTRB(0.0, 0.0, 0.0, 14.0),
         alignment: Alignment.bottomCenter,
-        child: ButtonBar(
+        child: Padding(
+          padding: const EdgeInsets.all(8.0),
+          child: OverflowBar(
             alignment: MainAxisAlignment.center,
+            spacing: 8.0,
             children: [
               ElevatedButton(
-              style: ElevatedButton.styleFrom(foregroundColor: Colors.blue),
+                style: ElevatedButton.styleFrom(
-              onPressed: onSavePressed,
+                  backgroundColor: Colors.blue,
-              child: const Text(
+                  foregroundColor: Colors.white,
-                'Save',
-                style: TextStyle(color: Colors.white, fontSize: 16.0),
                 ),
+                onPressed: onSavePressed,
+                child: const Text('Save'),
               ),
               ElevatedButton(
-              style: ElevatedButton.styleFrom(foregroundColor: Colors.red),
+                style: ElevatedButton.styleFrom(
-              onPressed: onCancelPressed,
+                  backgroundColor: Colors.red,
-              child: const Text(
+                  foregroundColor: Colors.white,
-                'Cancel',
-                style: TextStyle(color: Colors.white, fontSize: 16.0),
                 ),
+                onPressed: onCancelPressed,
+                child: const Text('Cancel'),
               ),
             ],
           ),
         ),
+      ),
     );
   }
 }
@@ -484,20 +488,23 @@ class _CategoryButtonBar extends StatelessWidget {
       child: Container(
         padding: const EdgeInsets.fromLTRB(0.0, 0.0, 0.0, 14.0),
         alignment: Alignment.bottomCenter,
-        child: ButtonBar(
+        child: Padding(
+          padding: const EdgeInsets.all(8.0),
+          child: OverflowBar(
             alignment: MainAxisAlignment.center,
-          children: [
+            spacing: 8.0,
+            children: <Widget>[
               FilledButton(
                 style: FilledButton.styleFrom(
                     backgroundColor:
                         selectedPlaceCategory == PlaceCategory.favorite
                             ? Colors.green[700]
                             : Colors.lightGreen),
+                onPressed: () => onChanged(PlaceCategory.favorite),
                 child: const Text(
                   'Favorites',
                   style: TextStyle(color: Colors.white, fontSize: 14.0),
                 ),
-              onPressed: () => onChanged(PlaceCategory.favorite),
               ),
               FilledButton(
                 style: FilledButton.styleFrom(
@@ -505,11 +512,11 @@ class _CategoryButtonBar extends StatelessWidget {
                         selectedPlaceCategory == PlaceCategory.visited
                             ? Colors.green[700]
                             : Colors.lightGreen),
+                onPressed: () => onChanged(PlaceCategory.visited),
                 child: const Text(
                   'Visited',
                   style: TextStyle(color: Colors.white, fontSize: 14.0),
                 ),
-              onPressed: () => onChanged(PlaceCategory.visited),
               ),
               FilledButton(
                 style: FilledButton.styleFrom(
@@ -517,15 +524,16 @@ class _CategoryButtonBar extends StatelessWidget {
                         selectedPlaceCategory == PlaceCategory.wantToGo
                             ? Colors.green[700]
                             : Colors.lightGreen),
+                onPressed: () => onChanged(PlaceCategory.wantToGo),
                 child: const Text(
                   'Want To Go',
                   style: TextStyle(color: Colors.white, fontSize: 14.0),
                 ),
-              onPressed: () => onChanged(PlaceCategory.wantToGo),
               ),
             ],
           ),
         ),
+      ),
     );
   }
 }

tool/flutter_ci_script_master.sh

@@ -38,8 +38,10 @@ declare -ar PROJECT_NAMES=(
     # TODO(DomesticMouse): Dart formatting required
     # "experimental/pedometer"
     # "experimental/pedometer/example"
-    "experimental/varfont_shader_puzzle"
+    # TODO(DomesticMouse): Dart formatting required
-    "experimental/web_dashboard"
+    # "experimental/varfont_shader_puzzle"
+    # TODO(DomesticMouse): Because every version of flutter_test from sdk depends on intl 0.18.1 and web_dashboard depends on intl ^0.17.0, flutter_test from sdk is forbidden.
+    # "experimental/web_dashboard"
     "flutter_maps_firestore"
     "form_app"
     "game_template"