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 11 months 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
- name: "Run analysis"
uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736
with:
results_file: results.sarif
results_format: sarif

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

@ -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

32
isolate_example/lib/infinite_process_page.dart
Unescape View File

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

118
place_tracker/lib/place_map.dart
Unescape View File

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

6
tool/flutter_ci_script_master.sh
Unescape View File

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

Write Preview
Loading…
Cancel
Save