From ca300100b8bb5ed7b08b1dc633fd115db719ad14 Mon Sep 17 00:00:00 2001 From: Sarah Zakarias Date: Thu, 24 May 2018 08:49:17 +0200 Subject: [PATCH] Update plugin template to comply with new type and style rules (#17840) --- .../java/androidIdentifier/MainActivity.java.tmpl | 1 - .../create/ios-objc.tmpl/Runner/AppDelegate.h | 2 +- .../create/ios-objc.tmpl/Runner/AppDelegate.m | 3 ++- .../templates/create/ios-objc.tmpl/Runner/main.m | 4 ++-- .../flutter_tools/templates/create/lib/main.dart.tmpl | 11 ++++++----- .../flutter_tools/templates/plugin/CHANGELOG.md.tmpl | 2 +- .../main/java/androidIdentifier/pluginClass.java.tmpl | 10 +++------- 7 files changed, 15 insertions(+), 18 deletions(-) diff --git a/packages/flutter_tools/templates/create/android-java.tmpl/app/src/main/java/androidIdentifier/MainActivity.java.tmpl b/packages/flutter_tools/templates/create/android-java.tmpl/app/src/main/java/androidIdentifier/MainActivity.java.tmpl index d1484acf25..226d9ff470 100644 --- a/packages/flutter_tools/templates/create/android-java.tmpl/app/src/main/java/androidIdentifier/MainActivity.java.tmpl +++ b/packages/flutter_tools/templates/create/android-java.tmpl/app/src/main/java/androidIdentifier/MainActivity.java.tmpl @@ -1,7 +1,6 @@ package {{androidIdentifier}}; import android.os.Bundle; - import io.flutter.app.FlutterActivity; import io.flutter.plugins.GeneratedPluginRegistrant; diff --git a/packages/flutter_tools/templates/create/ios-objc.tmpl/Runner/AppDelegate.h b/packages/flutter_tools/templates/create/ios-objc.tmpl/Runner/AppDelegate.h index cf210d213f..36e21bbf9c 100644 --- a/packages/flutter_tools/templates/create/ios-objc.tmpl/Runner/AppDelegate.h +++ b/packages/flutter_tools/templates/create/ios-objc.tmpl/Runner/AppDelegate.h @@ -1,5 +1,5 @@ -#import #import +#import @interface AppDelegate : FlutterAppDelegate diff --git a/packages/flutter_tools/templates/create/ios-objc.tmpl/Runner/AppDelegate.m b/packages/flutter_tools/templates/create/ios-objc.tmpl/Runner/AppDelegate.m index 112becd13b..59a72e90be 100644 --- a/packages/flutter_tools/templates/create/ios-objc.tmpl/Runner/AppDelegate.m +++ b/packages/flutter_tools/templates/create/ios-objc.tmpl/Runner/AppDelegate.m @@ -3,7 +3,8 @@ @implementation AppDelegate -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { +- (BOOL)application:(UIApplication *)application + didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { [GeneratedPluginRegistrant registerWithRegistry:self]; // Override point for customization after application launch. return [super application:application didFinishLaunchingWithOptions:launchOptions]; diff --git a/packages/flutter_tools/templates/create/ios-objc.tmpl/Runner/main.m b/packages/flutter_tools/templates/create/ios-objc.tmpl/Runner/main.m index 0ccc450011..dff6597e45 100644 --- a/packages/flutter_tools/templates/create/ios-objc.tmpl/Runner/main.m +++ b/packages/flutter_tools/templates/create/ios-objc.tmpl/Runner/main.m @@ -1,8 +1,8 @@ -#import #import +#import #import "AppDelegate.h" -int main(int argc, char * argv[]) { +int main(int argc, char* argv[]) { @autoreleasepool { return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); } diff --git a/packages/flutter_tools/templates/create/lib/main.dart.tmpl b/packages/flutter_tools/templates/create/lib/main.dart.tmpl index c808003a2e..ce3660df8d 100644 --- a/packages/flutter_tools/templates/create/lib/main.dart.tmpl +++ b/packages/flutter_tools/templates/create/lib/main.dart.tmpl @@ -3,6 +3,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_driver/driver_extension.dart'; {{/withDriverTest}} {{#withPluginHook}} +import 'dart:async'; + import 'package:flutter/services.dart'; import 'package:{{pluginProjectName}}/{{pluginProjectName}}.dart'; {{/withPluginHook}} @@ -136,13 +138,13 @@ class _MyAppState extends State { String _platformVersion = 'Unknown'; @override - initState() { + void initState() { super.initState(); initPlatformState(); } // Platform messages are asynchronous, so we initialize in an async method. - initPlatformState() async { + Future initPlatformState() async { String platformVersion; // Platform messages may fail, so we use a try/catch PlatformException. try { @@ -154,8 +156,7 @@ class _MyAppState extends State { // If the widget was removed from the tree while the asynchronous platform // message was in flight, we want to discard the reply rather than calling // setState to update our non-existent appearance. - if (!mounted) - return; + if (!mounted) return; setState(() { _platformVersion = platformVersion; @@ -167,7 +168,7 @@ class _MyAppState extends State { return new MaterialApp( home: new Scaffold( appBar: new AppBar( - title: new Text('Plugin example app'), + title: const Text('Plugin example app'), ), body: new Center( child: new Text('Running on: $_platformVersion\n'), diff --git a/packages/flutter_tools/templates/plugin/CHANGELOG.md.tmpl b/packages/flutter_tools/templates/plugin/CHANGELOG.md.tmpl index ac071598e5..41cc7d8192 100644 --- a/packages/flutter_tools/templates/plugin/CHANGELOG.md.tmpl +++ b/packages/flutter_tools/templates/plugin/CHANGELOG.md.tmpl @@ -1,3 +1,3 @@ -## [0.0.1] - TODO: Add release date. +## 0.0.1 * TODO: Describe initial release. diff --git a/packages/flutter_tools/templates/plugin/android-java.tmpl/src/main/java/androidIdentifier/pluginClass.java.tmpl b/packages/flutter_tools/templates/plugin/android-java.tmpl/src/main/java/androidIdentifier/pluginClass.java.tmpl index 80d1105c70..01bb87fc25 100644 --- a/packages/flutter_tools/templates/plugin/android-java.tmpl/src/main/java/androidIdentifier/pluginClass.java.tmpl +++ b/packages/flutter_tools/templates/plugin/android-java.tmpl/src/main/java/androidIdentifier/pluginClass.java.tmpl @@ -1,18 +1,14 @@ package {{androidIdentifier}}; +import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; -import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.PluginRegistry.Registrar; -/** - * {{pluginClass}} - */ +/** {{pluginClass}} */ public class {{pluginClass}} implements MethodCallHandler { - /** - * Plugin registration. - */ + /** Plugin registration. */ public static void registerWith(Registrar registrar) { final MethodChannel channel = new MethodChannel(registrar.messenger(), "{{projectName}}"); channel.setMethodCallHandler(new {{pluginClass}}());