Merge branch 'master' of https://github.com/fluttercommunity/flutter_…

…webview_plugin into fluttercommunity-master

# Conflicts:
#	android/src/main/java/com/flutter_webview_plugin/FlutterWebviewPlugin.java
#	android/src/main/java/com/flutter_webview_plugin/WebviewManager.java
#	ios/Classes/FlutterWebviewPlugin.m
#	lib/src/base.dart

CHANGELOG.md

@@ -1,3 +1,19 @@
+# 0.2.1
+
+- Added webview scrolling listener
+- Added stopLoading() method
+
+# 0.2.0
+
+- update sdk
+- prevent negative webview height in scaffold
+- handle type error in getCookies
+- Support file upload via WebView on Android
+- fix WebviewScaffold crash on iOS
+- Scrollbar functionality to Web view
+- Add support of HTTP errors
+- Add headers when loading url
+
 # 0.1.6
 
 - fix onStateChanged

README.md

@@ -42,6 +42,23 @@ flutterWebviewPlugin.onUrlChanged.listen((String url) {
 });
 ```
 
+#### Listen for scroll event in webview
+
+```dart
+final flutterWebviewPlugin = new FlutterWebviewPlugin();
+flutterWebviewPlugin.onScrollYChanged.listen((double offsetY) { // latest offset value in vertical scroll
+  // compare vertical scroll changes here with old value
+});
+
+flutterWebviewPlugin.onScrollXChanged.listen((double offsetX) { // latest offset value in horizontal scroll
+  // compare horizontal scroll changes here with old value
+});
+
+````
+
+Note: Do note there is a slight difference is scroll distance between ios and android. Android scroll value difference tends to be larger than ios devices.
+
+
 #### Hidden WebView
 
 ```dart
@@ -84,15 +101,17 @@ flutterWebviewPlugin.launch(url,
 
 ```dart
 Future<Null> launch(String url,
-         {bool withJavascript: true,
+         {Map<String, String> headers: null,
+         bool withJavascript: true,
          bool clearCache: false,
          bool clearCookies: false,
          bool hidden: false,
          bool enableAppScheme: true,
          Rect rect: null,
          String userAgent: null,
          bool withZoom: false,
-         bool withLocalStorage: true});
+         bool withLocalStorage: true,
+         bool scrollBar: true});
 ```
 ```dart
 Future<String> evalJavascript(String code);

analysis_options.yaml

@@ -1,2 +1,121 @@
 analyzer:
-  strong-mode: true
+
+linter:
+  rules:
+  # these rules are documented on and in the same order as
+  # the Dart Lint rules page to make maintenance easier
+  # https://github.com/dart-lang/linter/blob/master/example/all.yaml
+  - always_declare_return_types
+  - always_put_control_body_on_new_line
+  # - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219
+  - always_require_non_null_named_parameters
+  # - always_specify_types
+  - annotate_overrides
+  # - avoid_annotating_with_dynamic # conflicts with always_specify_types
+  - avoid_as
+  # - avoid_bool_literals_in_conditional_expressions # not yet tested
+  # - avoid_catches_without_on_clauses # we do this commonly
+  # - avoid_catching_errors # we do this commonly
+  - avoid_classes_with_only_static_members
+  # - avoid_double_and_int_checks # only useful when targeting JS runtime
+  - avoid_empty_else
+  - avoid_field_initializers_in_const_classes
+  # - avoid_function_literals_in_foreach_calls
+  - avoid_init_to_null
+  # - avoid_js_rounded_ints # only useful when targeting JS runtime
+  - avoid_null_checks_in_equality_operators
+  # - avoid_positional_boolean_parameters # not yet tested
+  # - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
+  - avoid_relative_lib_imports
+  - avoid_renaming_method_parameters
+  - avoid_return_types_on_setters
+  # - avoid_returning_null # we do this commonly
+  # - avoid_returning_this # https://github.com/dart-lang/linter/issues/842
+  # - avoid_setters_without_getters # not yet tested
+  # - avoid_single_cascade_in_expression_statements # not yet tested
+  - avoid_slow_async_io
+  # - avoid_types_as_parameter_names # https://github.com/dart-lang/linter/pull/954/files
+  # - avoid_types_on_closure_parameters # conflicts with always_specify_types
+  # - avoid_unused_constructor_parameters # https://github.com/dart-lang/linter/pull/847
+  - await_only_futures
+  - camel_case_types
+  - cancel_subscriptions
+  # - cascade_invocations # not yet tested
+  # - close_sinks # https://github.com/flutter/flutter/issues/5789
+  # - comment_references # blocked on https://github.com/dart-lang/dartdoc/issues/1153
+  # - constant_identifier_names # https://github.com/dart-lang/linter/issues/204
+  - control_flow_in_finally
+  - directives_ordering
+  - empty_catches
+  - empty_constructor_bodies
+  - empty_statements
+  - hash_and_equals
+  - implementation_imports
+  # - invariant_booleans # https://github.com/flutter/flutter/issues/5790
+  - iterable_contains_unrelated_type
+  # - join_return_with_assignment # not yet tested
+  - library_names
+  - library_prefixes
+  - list_remove_unrelated_type
+  # - literal_only_boolean_expressions # https://github.com/flutter/flutter/issues/5791
+  - no_adjacent_strings_in_list
+  - no_duplicate_case_values
+  - non_constant_identifier_names
+  # - omit_local_variable_types # opposite of always_specify_types
+  # - one_member_abstracts # too many false positives
+  # - only_throw_errors # https://github.com/flutter/flutter/issues/5792
+  - overridden_fields
+  - package_api_docs
+  - package_names
+  - package_prefixed_library_names
+  # - parameter_assignments # we do this commonly
+  - prefer_adjacent_string_concatenation
+  - prefer_asserts_in_initializer_lists
+  - prefer_bool_in_asserts
+  - prefer_collection_literals
+  - prefer_conditional_assignment
+  - prefer_const_constructors
+  - prefer_const_constructors_in_immutables
+  - prefer_const_declarations
+  - prefer_const_literals_to_create_immutables
+  # - prefer_constructors_over_static_methods # not yet tested
+  - prefer_contains
+  - prefer_equal_for_default_values
+  # - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
+  - prefer_final_fields
+  - prefer_final_locals
+  # - prefer_foreach
+  # - prefer_function_declarations_over_variables # not yet tested
+  - prefer_initializing_formals
+  # - prefer_interpolation_to_compose_strings # not yet tested
+  # - prefer_iterable_whereType # https://github.com/dart-lang/sdk/issues/32463
+  - prefer_is_empty
+  - prefer_is_not_empty
+  - prefer_single_quotes
+  - prefer_typing_uninitialized_variables
+  - recursive_getters
+  - slash_for_doc_comments
+  - sort_constructors_first
+  - sort_unnamed_constructors_first
+  - super_goes_last
+  - test_types_in_equals
+  - throw_in_finally
+  # - type_annotate_public_apis # subset of always_specify_types
+  - type_init_formals
+  # - unawaited_futures # https://github.com/flutter/flutter/issues/5793
+  - unnecessary_brace_in_string_interps
+  - unnecessary_getters_setters
+  # - unnecessary_lambdas # https://github.com/dart-lang/linter/issues/498
+  - unnecessary_null_aware_assignments
+  - unnecessary_null_in_if_null_operators
+  - unnecessary_overrides
+  - unnecessary_parenthesis
+  # - unnecessary_statements # not yet tested
+  - unnecessary_this
+  - unrelated_type_equality_checks
+  - use_rethrow_when_possible
+  # - use_setters_to_change_properties # not yet tested
+  # - use_string_buffers # https://github.com/dart-lang/linter/pull/664
+  # - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review
+  - valid_regexps
+  # - void_checks # not yet tested

android/build.gradle

@@ -26,6 +26,7 @@ android {
 
     defaultConfig {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        minSdkVersion 16
     }
     lintOptions {
         disable 'InvalidPackage'

android/src/main/java/com/flutter_webview_plugin/BrowserClient.java

@@ -1,6 +1,8 @@
 package com.flutter_webview_plugin;
 
 import android.graphics.Bitmap;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
@@ -37,4 +39,13 @@ public void onPageFinished(WebView view, String url) {
         FlutterWebviewPlugin.channel.invokeMethod("onState", data);
 
     }
+
+    @Override
+    public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
+        super.onReceivedHttpError(view, request, errorResponse);
+        Map<String, Object> data = new HashMap<>();
+        data.put("url", request.getUrl().toString());
+        data.put("code", Integer.toString(errorResponse.getStatusCode()));
+        FlutterWebviewPlugin.channel.invokeMethod("onHttpError", data);
+    }
 }

android/src/main/java/com/flutter_webview_plugin/FlutterWebviewPlugin.java

@@ -3,6 +3,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Point;
 import android.view.Display;
 import android.widget.FrameLayout;
@@ -18,15 +19,16 @@
 /**
  * FlutterWebviewPlugin
  */
-public class FlutterWebviewPlugin implements MethodCallHandler {
+public class FlutterWebviewPlugin implements MethodCallHandler, PluginRegistry.ActivityResultListener {
     private Activity activity;
     private WebviewManager webViewManager;
     static MethodChannel channel;
     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(registrar.activity());
+        final FlutterWebviewPlugin instance = new FlutterWebviewPlugin(registrar.activity());
+        registrar.addActivityResultListener(instance);
         channel.setMethodCallHandler(instance);
     }
 
@@ -66,6 +68,9 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
                 break;
             case "reloadUrl":
                 reloadUrl(call, result);
+                break;
+            case "stopLoading":
+                stopLoading(call, result);
                 break;				
             default:
                 result.notImplemented();
@@ -83,6 +88,8 @@ private void openUrl(MethodCall call, MethodChannel.Result result) {
         boolean withZoom = call.argument("withZoom");
         boolean withLocalStorage = call.argument("withLocalStorage");
         Map<String, String> cookies = call.argument("cookies");
+        Map<String, String> headers = call.argument("headers");
+        boolean scrollBar = call.argument("scrollBar");
 
         if (webViewManager == null || webViewManager.closed == true) {
             webViewManager = new WebviewManager(activity);
@@ -98,9 +105,11 @@ private void openUrl(MethodCall call, MethodChannel.Result result) {
                 clearCookies,
                 userAgent,
                 url,
+                headers,
                 withZoom,
                 withLocalStorage,
-                cookies
+                cookies,
+                scrollBar
         );
         result.success(null);
     }
@@ -125,6 +134,12 @@ private FrameLayout.LayoutParams buildLayoutParams(MethodCall call) {
         return params;
     }
 
+    private void stopLoading(MethodCall call, MethodChannel.Result result) {
+        if (webViewManager != null){
+            webViewManager.stopLoading(call, result);
+        }
+    }
+
     private void close(MethodCall call, MethodChannel.Result result) {
         if (webViewManager != null) {
             webViewManager.close(call, result);
@@ -166,6 +181,7 @@ private void reloadUrl(MethodCall call, MethodChannel.Result result) {
                     false,
                     "",
                     url,
+                    null,
                     false,
                     false,
                     null
@@ -200,4 +216,12 @@ private int dp2px(Context context, float dp) {
         final float scale = context.getResources().getDisplayMetrics().density;
         return (int) (dp * scale + 0.5f);
     }
+
+    @Override
+    public boolean onActivityResult(int i, int i1, Intent intent) {
+        if(webViewManager != null && webViewManager.resultHandler != null){
+            return webViewManager.resultHandler.handleResult(i, i1, intent);
+        }
+        return false;
+    }
 }

android/src/main/java/com/flutter_webview_plugin/ObservableWebView.java

@@ -0,0 +1,49 @@
+package com.flutter_webview_plugin;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.webkit.WebView;
+
+public class ObservableWebView extends WebView {
+    private OnScrollChangedCallback mOnScrollChangedCallback;
+
+    public ObservableWebView(final Context context)
+    {
+        super(context);
+    }
+
+    public ObservableWebView(final Context context, final AttributeSet attrs)
+    {
+        super(context, attrs);
+    }
+
+    public ObservableWebView(final Context context, final AttributeSet attrs, final int defStyle)
+    {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onScrollChanged(final int l, final int t, final int oldl, final int oldt)
+    {
+        super.onScrollChanged(l, t, oldl, oldt);
+        if(mOnScrollChangedCallback != null) mOnScrollChangedCallback.onScroll(l, t, oldl, oldt);
+    }
+
+    public OnScrollChangedCallback getOnScrollChangedCallback()
+    {
+        return mOnScrollChangedCallback;
+    }
+
+    public void setOnScrollChangedCallback(final OnScrollChangedCallback onScrollChangedCallback)
+    {
+        mOnScrollChangedCallback = onScrollChangedCallback;
+    }
+
+    /**
+     * Impliment in the activity/fragment/view that you want to listen to the webview
+     */
+    public static interface OnScrollChangedCallback
+    {
+        public void onScroll(int l, int t, int oldl, int oldt);
+    }
+}