Commit f557526b by Maurits van Beusekom Committed by GitHub

Merge pull request #451 from Baseflow/nullsafety

Nullsafety
parents 2ccdb77c 83ef1983
## 6.0.0
* Migrated to null safety
## 5.1.0+2 ## 5.1.0+2
* Solve mismatch with permission constants between Dart and Android (due to addition of permission on iOS); * Solve mismatch with permission constants between Dart and Android (due to addition of permission on iOS);
......
# #
# NOTE: This podspec is NOT to be published. It is only used as a local source! # NOTE: This podspec is NOT to be published. It is only used as a local source!
# This is a generated file; do not edit or check into version control.
# #
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Flutter' s.name = 'Flutter'
s.version = '1.0.0' s.version = '1.0.0'
s.summary = 'High-performance, high-fidelity mobile apps.' s.summary = 'High-performance, high-fidelity mobile apps.'
s.description = <<-DESC
Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS.
DESC
s.homepage = 'https://flutter.io' s.homepage = 'https://flutter.io'
s.license = { :type => 'MIT' } s.license = { :type => 'MIT' }
s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
s.ios.deployment_target = '8.0' s.ios.deployment_target = '8.0'
s.vendored_frameworks = 'Flutter.framework' # Framework linking is handled by Flutter tooling, not CocoaPods.
# Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
s.vendored_frameworks = 'path/to/nothing'
end end
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
<Workspace <Workspace
version = "1.0"> version = "1.0">
<FileRef <FileRef
location = "group:Runner.xcodeproj"> location = "self:">
</FileRef> </FileRef>
</Workspace> </Workspace>
...@@ -74,18 +74,18 @@ class BaseflowPluginExample extends StatelessWidget { ...@@ -74,18 +74,18 @@ class BaseflowPluginExample extends StatelessWidget {
1, 1,
); );
} }
return MaterialColor(color.value, swatch); return MaterialColor(color.value, swatch as Map<int, Color>);
} }
} }
/// A Flutter example demonstrating how the [pluginName] plugin could be used /// A Flutter example demonstrating how the [pluginName] plugin could be used
class AppHome extends StatefulWidget { class AppHome extends StatefulWidget {
/// Constructs the [AppHome] class /// Constructs the [AppHome] class
AppHome({Key key, this.title}) : super(key: key); AppHome({Key? key, this.title}) : super(key: key);
/// The [title] of the application, which is shown in the application's /// The [title] of the application, which is shown in the application's
/// title bar. /// title bar.
final String title; final String? title;
@override @override
_AppHomeState createState() => _AppHomeState(); _AppHomeState createState() => _AppHomeState();
......
...@@ -70,7 +70,7 @@ class _PermissionState extends State<PermissionWidget> { ...@@ -70,7 +70,7 @@ class _PermissionState extends State<PermissionWidget> {
} }
void checkServiceStatus(BuildContext context, Permission permission) async { void checkServiceStatus(BuildContext context, Permission permission) async {
Scaffold.of(context).showSnackBar(SnackBar( ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text((await permission.status).toString()), content: Text((await permission.status).toString()),
)); ));
} }
......
...@@ -74,11 +74,13 @@ class InfoPage extends StatelessWidget { ...@@ -74,11 +74,13 @@ class InfoPage extends StatelessWidget {
margin: const EdgeInsets.only(top: 24.0), margin: const EdgeInsets.only(top: 24.0),
alignment: Alignment.center, alignment: Alignment.center,
child: SizedBox.expand( child: SizedBox.expand(
child: RaisedButton( child: ElevatedButton(
textTheme: Theme.of(context).buttonTheme.textTheme, style: ElevatedButton.styleFrom(
shape: padding: const EdgeInsets.all(8),
RoundedRectangleBorder(borderRadius: BorderRadius.circular(30.0)), shape: RoundedRectangleBorder(
padding: const EdgeInsets.all(8), borderRadius: BorderRadius.circular(30.0),
),
),
child: Text(text), child: Text(text),
onPressed: () => _launchURL(url), onPressed: () => _launchURL(url),
), ),
......
...@@ -2,7 +2,7 @@ name: permission_handler_example ...@@ -2,7 +2,7 @@ name: permission_handler_example
description: Demonstrates how to use the permission_handler plugin. description: Demonstrates how to use the permission_handler plugin.
environment: environment:
sdk: ">=2.1.0 <3.0.0" sdk: ">=2.12.0-259.9.beta <3.0.0"
dependencies: dependencies:
flutter: flutter:
...@@ -15,7 +15,7 @@ dev_dependencies: ...@@ -15,7 +15,7 @@ dev_dependencies:
permission_handler: permission_handler:
path: ../ path: ../
url_launcher: ^5.4.11 url_launcher: ^6.0.0
flutter: flutter:
uses-material-design: true uses-material-design: true
......
...@@ -46,7 +46,8 @@ extension PermissionActions on Permission { ...@@ -46,7 +46,8 @@ extension PermissionActions on Permission {
/// ///
/// Returns the new [PermissionStatus]. /// Returns the new [PermissionStatus].
Future<PermissionStatus> request() async { Future<PermissionStatus> request() async {
return (await [this].request())[this]; final permissionStatus = (await [this].request())[this];
return permissionStatus ?? PermissionStatus.denied;
} }
} }
......
name: permission_handler name: permission_handler
description: Permission plugin for Flutter. This plugin provides a cross-platform (iOS, Android) API to request and check permissions. description: Permission plugin for Flutter. This plugin provides a cross-platform (iOS, Android) API to request and check permissions.
version: 5.1.0+2 version: 6.0.0
homepage: https://github.com/baseflowit/flutter-permission-handler homepage: https://github.com/baseflowit/flutter-permission-handler
flutter: flutter:
...@@ -15,13 +15,13 @@ flutter: ...@@ -15,13 +15,13 @@ flutter:
dependencies: dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
meta: ^1.1.6 meta: ^1.3.0
permission_handler_platform_interface: ^2.0.2 permission_handler_platform_interface: ^3.0.0
dev_dependencies: dev_dependencies:
effective_dart: ^1.2.1 effective_dart: ^1.3.0
plugin_platform_interface: ^1.0.1 plugin_platform_interface: ^2.0.0
environment: environment:
sdk: ">=2.7.0 <3.0.0" sdk: ">=2.12.0-259.9.beta <3.0.0"
flutter: ">=1.12.8 <2.0.0" flutter: ">=1.12.8 <2.0.0"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment