msb-public
/
samples
mirror of https://github.com/flutter/samples.git
1
0
Code Issues Projects Releases Wiki Activity

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

Browse Source
navigation-and-routing-update
John Ryan 1 year ago
parent 42aeff4466 3e4e3bc784
commit 65d4c568ee
5 changed files with 87 additions and 73 deletions
Show Stats Download Patch File Download Diff File

2
.github/workflows/scorecards-analysis.yml vendored
Unescape View File

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

2
add_to_app/books/flutter_module_books/pubspec.yaml
Unescape View File

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

32
isolate_example/lib/infinite_process_page.dart
Unescape View File

@ -54,20 +54,24 @@ class InfiniteProcessPage extends StatelessWidget {
Column( Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
ButtonBar( Padding(
alignment: MainAxisAlignment.center, padding: const EdgeInsets.all(8.0),
children: [ child: OverflowBar(
ElevatedButton( spacing: 8.0,
style: ElevatedButton.styleFrom(elevation: 8.0), alignment: MainAxisAlignment.center,
onPressed: () => controller.start(), children: [
child: const Text('Start'), ElevatedButton(
), style: ElevatedButton.styleFrom(elevation: 8.0),
ElevatedButton( onPressed: () => controller.start(),
style: ElevatedButton.styleFrom(elevation: 8.0), child: const Text('Start'),
onPressed: () => controller.terminate(), ),
child: const Text('Terminate'), ElevatedButton(
), style: ElevatedButton.styleFrom(elevation: 8.0),
], onPressed: () => controller.terminate(),
child: const Text('Terminate'),
),
],
),
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,

118
place_tracker/lib/place_map.dart
Unescape View File

@ -440,26 +440,30 @@ class _AddPlaceButtonBar extends StatelessWidget {
child: Container( child: Container(
padding: const EdgeInsets.fromLTRB(0.0, 0.0, 0.0, 14.0), padding: const EdgeInsets.fromLTRB(0.0, 0.0, 0.0, 14.0),
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
child: ButtonBar( child: Padding(
alignment: MainAxisAlignment.center, padding: const EdgeInsets.all(8.0),
children: [ child: OverflowBar(
ElevatedButton( alignment: MainAxisAlignment.center,
style: ElevatedButton.styleFrom(foregroundColor: Colors.blue), spacing: 8.0,
onPressed: onSavePressed, children: [
child: const Text( ElevatedButton(
'Save', style: ElevatedButton.styleFrom(
style: TextStyle(color: Colors.white, fontSize: 16.0), backgroundColor: Colors.blue,
foregroundColor: Colors.white,
),
onPressed: onSavePressed,
child: const Text('Save'),
), ),
), ElevatedButton(
ElevatedButton( style: ElevatedButton.styleFrom(
style: ElevatedButton.styleFrom(foregroundColor: Colors.red), backgroundColor: Colors.red,
onPressed: onCancelPressed, foregroundColor: Colors.white,
child: const Text( ),
'Cancel', onPressed: onCancelPressed,
style: TextStyle(color: Colors.white, fontSize: 16.0), child: const Text('Cancel'),
), ),
), ],
], ),
), ),
), ),
); );
@ -484,46 +488,50 @@ class _CategoryButtonBar extends StatelessWidget {
child: Container( child: Container(
padding: const EdgeInsets.fromLTRB(0.0, 0.0, 0.0, 14.0), padding: const EdgeInsets.fromLTRB(0.0, 0.0, 0.0, 14.0),
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
child: ButtonBar( child: Padding(
alignment: MainAxisAlignment.center, padding: const EdgeInsets.all(8.0),
children: [ child: OverflowBar(
FilledButton( alignment: MainAxisAlignment.center,
style: FilledButton.styleFrom( spacing: 8.0,
backgroundColor: children: <Widget>[
selectedPlaceCategory == PlaceCategory.favorite FilledButton(
? Colors.green[700] style: FilledButton.styleFrom(
: Colors.lightGreen), backgroundColor:
child: const Text( selectedPlaceCategory == PlaceCategory.favorite
'Favorites', ? Colors.green[700]
style: TextStyle(color: Colors.white, fontSize: 14.0), : 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(
FilledButton( backgroundColor:
style: FilledButton.styleFrom( selectedPlaceCategory == PlaceCategory.visited
backgroundColor: ? Colors.green[700]
selectedPlaceCategory == PlaceCategory.visited : Colors.lightGreen),
? Colors.green[700] onPressed: () => onChanged(PlaceCategory.visited),
: Colors.lightGreen), child: const Text(
child: const Text( 'Visited',
'Visited', style: TextStyle(color: Colors.white, fontSize: 14.0),
style: TextStyle(color: Colors.white, fontSize: 14.0), ),
), ),
onPressed: () => onChanged(PlaceCategory.visited), FilledButton(
), style: FilledButton.styleFrom(
FilledButton( backgroundColor:
style: FilledButton.styleFrom( selectedPlaceCategory == PlaceCategory.wantToGo
backgroundColor: ? Colors.green[700]
selectedPlaceCategory == PlaceCategory.wantToGo : Colors.lightGreen),
? Colors.green[700] onPressed: () => onChanged(PlaceCategory.wantToGo),
: Colors.lightGreen), child: const Text(
child: const Text( 'Want To Go',
'Want To Go', style: TextStyle(color: Colors.white, fontSize: 14.0),
style: TextStyle(color: Colors.white, fontSize: 14.0), ),
), ),
onPressed: () => onChanged(PlaceCategory.wantToGo), ],
), ),
],
), ),
), ),
); );

6
tool/flutter_ci_script_master.sh
Unescape View File

@ -38,8 +38,10 @@ declare -ar PROJECT_NAMES=(
# TODO(DomesticMouse): Dart formatting required # TODO(DomesticMouse): Dart formatting required
# "experimental/pedometer" # "experimental/pedometer"
# "experimental/pedometer/example" # "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" "flutter_maps_firestore"
"form_app" "form_app"
"game_template" "game_template"

Write Preview
Loading…
Cancel
Save