Starter/samples
1
0
Fork 0
mirror of https://github.com/flutter/samples.git synced 2025-11-08 13:58:47 +00:00
Code Issues Releases Wiki Activity

Fixes Future<void> issue in Shrine. (#28)

Browse Source
This commit is contained in:
Andrew Brogdon
2018-11-08 09:59:43 -08:00
committed by GitHub
parent 4ed6aca905
commit 811b5d245a
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jsonexample/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildSystemType</key>
<string>Original</string>
</dict>
</plist>

9
jsonexample/pubspec.yaml
View File

@@ -7,19 +7,22 @@ environment:
dependencies: dependencies:
json_annotation: ^1.0.0 json_annotation: ^1.0.0
built_collection: '>=2.0.0 <5.0.0' built_collection: '>=2.0.0 <5.0.0'
built_value: ^6.1.0 built_value: ^6.1.5
flutter: flutter:
sdk: flutter sdk: flutter
dev_dependencies: dev_dependencies:
build_runner: '>=0.9.0 <0.11.0' build_runner: ^1.0.0
built_value_generator: ^6.1.0 built_value_generator: ^6.1.5
json_serializable: ^1.0.0 json_serializable: ^1.0.0
flutter_test: flutter_test:
sdk: flutter sdk: flutter
dependency_overrides:
analyzer: 0.33.0
flutter: flutter:
uses-material-design: true uses-material-design: true

8
shrine/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildSystemType</key>
<string>Original</string>
</dict>
</plist>

3
shrine/lib/expanding_bottom_sheet.dart
View File

@@ -381,7 +381,8 @@ class _ExpandingBottomSheetState extends State<ExpandingBottomSheet> with Ticker
// only be relevant for Android). // only be relevant for Android).
Future<bool> _onWillPop() async { Future<bool> _onWillPop() async {
if (!_isOpen) { if (!_isOpen) {
return SystemNavigator.pop(); await SystemNavigator.pop();
return true;
} }
close(); close();