Implement PR feedback from interface PR

packages/webview_flutter/webview_flutter_android/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 2.1.0
 
-* Implemented new `runJavaScript` and `runJavaScriptForResult` methods in platform interface.
+* Implemented new `runJavascript` and `runJavascriptReturningResult` methods in platform interface.
 
 ## 2.0.15
 

packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java

@@ -123,7 +123,7 @@ public void onProgressChanged(WebView view, int progress) {
     if (params.containsKey(JS_CHANNEL_NAMES_FIELD)) {
       List<String> names = (List<String>) params.get(JS_CHANNEL_NAMES_FIELD);
       if (names != null) {
-        registerJavaScriptChannelNames(names);
+        registerJavascriptChannelNames(names);
       }
     }
 
@@ -149,7 +149,7 @@ public void onProgressChanged(WebView view, int progress) {
    *
    * <ul>
    *   <li>always enable the DOM storage API;
-   *   <li>always allow JavaScript to automatically open windows;
+   *   <li>always allow Javascript to automatically open windows;
    *   <li>always allow support for multiple windows;
    *   <li>always use the {@link FlutterWebChromeClient} as web Chrome client.
    * </ul>
@@ -244,17 +244,17 @@ public void onMethodCall(MethodCall methodCall, Result result) {
         currentUrl(result);
         break;
       case "evaluateJavascript":
-      case "runJavaScriptForResult":
-        evaluateJavaScript(methodCall, result, true);
+      case "runJavascriptReturningResult":
+        evaluateJavascript(methodCall, result, true);
         break;
-      case "runJavaScript":
-        evaluateJavaScript(methodCall, result, false);
+      case "runJavascript":
+        evaluateJavascript(methodCall, result, false);
         break;
       case "addJavascriptChannels":
-        addJavaScriptChannels(methodCall, result);
+        addJavascriptChannels(methodCall, result);
         break;
       case "removeJavascriptChannels":
-        removeJavaScriptChannels(methodCall, result);
+        removeJavascriptChannels(methodCall, result);
         break;
       case "clearCache":
         clearCache(result);
@@ -329,11 +329,11 @@ private void updateSettings(MethodCall methodCall, Result result) {
   }
 
   @TargetApi(Build.VERSION_CODES.KITKAT)
-  private void evaluateJavaScript(
+  private void evaluateJavascript(
       MethodCall methodCall, final Result result, final boolean returnValue) {
     String jsString = (String) methodCall.arguments;
     if (jsString == null) {
-      throw new UnsupportedOperationException("JavaScript string cannot be null");
+      throw new UnsupportedOperationException("Javascript string cannot be null");
     }
     webView.evaluateJavascript(
         jsString,
@@ -350,14 +350,14 @@ public void onReceiveValue(String value) {
   }
 
   @SuppressWarnings("unchecked")
-  private void addJavaScriptChannels(MethodCall methodCall, Result result) {
+  private void addJavascriptChannels(MethodCall methodCall, Result result) {
     List<String> channelNames = (List<String>) methodCall.arguments;
-    registerJavaScriptChannelNames(channelNames);
+    registerJavascriptChannelNames(channelNames);
     result.success(null);
   }
 
   @SuppressWarnings("unchecked")
-  private void removeJavaScriptChannels(MethodCall methodCall, Result result) {
+  private void removeJavascriptChannels(MethodCall methodCall, Result result) {
     List<String> channelNames = (List<String>) methodCall.arguments;
     for (String channelName : channelNames) {
       webView.removeJavascriptInterface(channelName);
@@ -452,7 +452,7 @@ private void updateJsMode(int mode) {
         webView.getSettings().setJavaScriptEnabled(true);
         break;
       default:
-        throw new IllegalArgumentException("Trying to set unknown JavaScript mode: " + mode);
+        throw new IllegalArgumentException("Trying to set unknown Javascript mode: " + mode);
     }
   }
 
@@ -465,10 +465,10 @@ private void updateAutoMediaPlaybackPolicy(int mode) {
     }
   }
 
-  private void registerJavaScriptChannelNames(List<String> channelNames) {
+  private void registerJavascriptChannelNames(List<String> channelNames) {
     for (String channelName : channelNames) {
       webView.addJavascriptInterface(
-          new JavaScriptChannel(methodChannel, channelName, platformThreadHandler), channelName);
+          new JavascriptChannel(methodChannel, channelName, platformThreadHandler), channelName);
     }
   }
 

packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/JavaScriptChannel.java

@@ -17,21 +17,21 @@
  * <p>Exposes a single method named `postMessage` to JavaScript, which sends a message over a method
  * channel to the Dart code.
  */
-class JavaScriptChannel {
+class JavascriptChannel {
   private final MethodChannel methodChannel;
-  private final String javaScriptChannelName;
+  private final String javascriptChannelName;
   private final Handler platformThreadHandler;
 
   /**
    * @param methodChannel the Flutter WebView method channel to which JS messages are sent
-   * @param javaScriptChannelName the name of the JavaScript channel, this is sent over the method
+   * @param javascriptChannelName the name of the JavaScript channel, this is sent over the method
    *     channel with each message to let the Dart code know which JavaScript channel the message
    *     was sent through
    */
-  JavaScriptChannel(
-      MethodChannel methodChannel, String javaScriptChannelName, Handler platformThreadHandler) {
+  JavascriptChannel(
+      MethodChannel methodChannel, String javascriptChannelName, Handler platformThreadHandler) {
     this.methodChannel = methodChannel;
-    this.javaScriptChannelName = javaScriptChannelName;
+    this.javascriptChannelName = javascriptChannelName;
     this.platformThreadHandler = platformThreadHandler;
   }
 
@@ -44,7 +44,7 @@ public void postMessage(final String message) {
           @Override
           public void run() {
             HashMap<String, String> arguments = new HashMap<>();
-            arguments.put("channel", javaScriptChannelName);
+            arguments.put("channel", javascriptChannelName);
             arguments.put("message", message);
             methodChannel.invokeMethod("javascriptChannelMessage", arguments);
           }

packages/webview_flutter/webview_flutter_android/android/src/test/java/io/flutter/plugins/webviewflutter/FlutterWebViewTest.java

@@ -72,7 +72,7 @@ public void createWebView_shouldCreateWebViewWithDefaultConfiguration() {
   }
 
   @Test(expected = UnsupportedOperationException.class)
-  public void evaluateJavaScript_shouldThrowForNullString() {
+  public void evaluateJavascript_shouldThrowForNullString() {
     try (MockedStatic<FlutterWebView> mockedFlutterWebView = mockStatic(FlutterWebView.class)) {
       // Setup
       mockedFlutterWebView
@@ -92,12 +92,12 @@ public void apply() throws Throwable {
           new FlutterWebView(mockContext, mockMethodChannel, new HashMap<String, Object>(), null);
 
       // Run
-      flutterWebView.onMethodCall(new MethodCall("runJavaScript", null), mockResult);
+      flutterWebView.onMethodCall(new MethodCall("runJavascript", null), mockResult);
     }
   }
 
   @Test
-  public void evaluateJavaScript_shouldReturnValueOnSuccessForReturnValue() {
+  public void evaluateJavascript_shouldReturnValueOnSuccessForReturnValue() {
     try (MockedStatic<FlutterWebView> mockedFlutterWebView = mockStatic(FlutterWebView.class)) {
       // Setup
       mockedFlutterWebView
@@ -112,25 +112,25 @@ public void evaluateJavaScript_shouldReturnValueOnSuccessForReturnValue() {
       doAnswer(
               invocation -> {
                 android.webkit.ValueCallback<String> callback = invocation.getArgument(1);
-                callback.onReceiveValue("Test JavaScript Result");
+                callback.onReceiveValue("Test Javascript Result");
                 return null;
               })
           .when(mockWebView)
-          .evaluateJavascript(eq("Test JavaScript String"), any());
+          .evaluateJavascript(eq("Test Javascript String"), any());
       FlutterWebView flutterWebView =
           new FlutterWebView(mockContext, mockMethodChannel, new HashMap<String, Object>(), null);
 
       // Run
       flutterWebView.onMethodCall(
-          new MethodCall("runJavaScriptForResult", "Test JavaScript String"), mockResult);
+          new MethodCall("runJavascriptReturningResult", "Test Javascript String"), mockResult);
 
       // Verify
-      verify(mockResult, times(1)).success("Test JavaScript Result");
+      verify(mockResult, times(1)).success("Test Javascript Result");
     }
   }
 
   @Test
-  public void evaluateJavaScript_shouldReturnNilOnSuccessForNoReturnValue() {
+  public void evaluateJavascript_shouldReturnNilOnSuccessForNoReturnValue() {
     try (MockedStatic<FlutterWebView> mockedFlutterWebView = mockStatic(FlutterWebView.class)) {
       // Setup
       mockedFlutterWebView
@@ -145,17 +145,17 @@ public void evaluateJavaScript_shouldReturnNilOnSuccessForNoReturnValue() {
       doAnswer(
               invocation -> {
                 android.webkit.ValueCallback<String> callback = invocation.getArgument(1);
-                callback.onReceiveValue("Test JavaScript Result");
+                callback.onReceiveValue("Test Javascript Result");
                 return null;
               })
           .when(mockWebView)
-          .evaluateJavascript(eq("Test JavaScript String"), any());
+          .evaluateJavascript(eq("Test Javascript String"), any());
       FlutterWebView flutterWebView =
           new FlutterWebView(mockContext, mockMethodChannel, new HashMap<String, Object>(), null);
 
       // Run
       flutterWebView.onMethodCall(
-          new MethodCall("runJavaScript", "Test JavaScript String"), mockResult);
+          new MethodCall("runJavascript", "Test Javascript String"), mockResult);
 
       // Verify
       verify(mockResult, times(1)).success(isNull());