Merge pull request #16 from jonasbark/master

lejard-h · web-flow · commit b3fe32b7454b · 2017-11-06T10:50:00.000+01:00
use standard Activity as calling class to support FlutterFragmentActivity
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.0.9
+
+- Android: remove the need to use FlutterActivity as base activity
+
 # 0.0.5
 
 - fix "onDestroy" event for iOS [#4](https://github.com/dart-flitter/flutter_webview_plugin/issues/4)
@@ -14,4 +18,4 @@
 
 # 0.0.2
 
-- Initial version for Android
+- Initial version for Android
diff --git a/android/src/main/java/com/flutter_webview_plugin/FlutterWebviewPlugin.java b/android/src/main/java/com/flutter_webview_plugin/FlutterWebviewPlugin.java
@@ -14,18 +14,18 @@
  * FlutterWebviewPlugin
  */
 public class FlutterWebviewPlugin implements MethodCallHandler {
-  private FlutterActivity activity;
+  private Activity activity;
   public static MethodChannel channel;
   private final int WEBVIEW_ACTIVITY_CODE = 1;
   private static final String CHANNEL_NAME = "flutter_webview_plugin";
 
   public static void registerWith(PluginRegistry.Registrar registrar) {
     channel = new MethodChannel(registrar.messenger(), CHANNEL_NAME);
-    FlutterWebviewPlugin instance = new FlutterWebviewPlugin((FlutterActivity) registrar.activity());
+    FlutterWebviewPlugin instance = new FlutterWebviewPlugin((Activity) registrar.activity());
     channel.setMethodCallHandler(instance);
   }
 
-  private FlutterWebviewPlugin(FlutterActivity activity) {
+  private FlutterWebviewPlugin(Activity activity) {
     this.activity = activity;
   }
 
@@ -62,4 +62,3 @@ private void close(MethodCall call, MethodChannel.Result result) {
     result.success(null);
   }
 }
-
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,7 +4,7 @@ authors:
 - Hadrien Lejard <hadrien.lejard@gmail.com>
 - Toufik Zitouni <toufiksapps@gmail.com>
 homepage: https://github.com/dart-flitter/flutter_webview_plugin
-version: 0.0.8
+version: 0.0.9
 
 flutter:
   plugin:

Original file line number	Diff line number	Diff line change
`@@ -14,18 +14,18 @@`
`14`	`14`	`* FlutterWebviewPlugin`
`15`	`15`	`*/`
`16`	`16`	`public class FlutterWebviewPlugin implements MethodCallHandler {`
`17`		`- private FlutterActivity activity;`
	`17`	`+ private Activity activity;`
`18`	`18`	`public static MethodChannel channel;`
`19`	`19`	`private final int WEBVIEW_ACTIVITY_CODE = 1;`
`20`	`20`	`private static final String CHANNEL_NAME = "flutter_webview_plugin";`
`21`	`21`
`22`	`22`	`public static void registerWith(PluginRegistry.Registrar registrar) {`
`23`	`23`	`channel = new MethodChannel(registrar.messenger(), CHANNEL_NAME);`
`24`		`- FlutterWebviewPlugin instance = new FlutterWebviewPlugin((FlutterActivity) registrar.activity());`
	`24`	`+ FlutterWebviewPlugin instance = new FlutterWebviewPlugin((Activity) registrar.activity());`
`25`	`25`	`channel.setMethodCallHandler(instance);`
`26`	`26`	`}`
`27`	`27`
`28`		`- private FlutterWebviewPlugin(FlutterActivity activity) {`
	`28`	`+ private FlutterWebviewPlugin(Activity activity) {`
`29`	`29`	`this.activity = activity;`
`30`	`30`	`}`
`31`	`31`
`@@ -62,4 +62,3 @@ private void close(MethodCall call, MethodChannel.Result result) {`
`62`	`62`	`result.success(null);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`		`-`