Wrap browser customization values in another configuration object

packages/url_launcher/url_launcher/example/lib/main.dart

@@ -72,7 +72,7 @@ class _MyHomePageState extends State<MyHomePage> {
     if (!await launchUrl(
       url,
       mode: LaunchMode.inAppWebView,
-      webViewConfiguration: const WebViewConfiguration(showTitle: true),
+      browserConfiguration: const BrowserConfiguration(showTitle: true),
     )) {
       throw Exception('Could not launch $url');
     }

packages/url_launcher/url_launcher/lib/src/type_conversion.dart

@@ -8,11 +8,20 @@ import 'types.dart';
 
 /// Converts an (app-facing) [WebViewConfiguration] to a (platform interface)
 /// [InAppWebViewConfiguration].
-InAppWebViewConfiguration convertConfiguration(WebViewConfiguration config) {
+InAppWebViewConfiguration convertWebViewConfiguration(
+    WebViewConfiguration config) {
   return InAppWebViewConfiguration(
     enableJavaScript: config.enableJavaScript,
     enableDomStorage: config.enableDomStorage,
     headers: config.headers,
+  );
+}
+
+/// Converts an (app-facing) [BrowserConfiguration] to a (platform interface)
+/// [InApp].
+InAppBrowserConfiguration convertBrowserConfiguration(
+    BrowserConfiguration config) {
+  return InAppBrowserConfiguration(
     showTitle: config.showTitle,
   );
 }

packages/url_launcher/url_launcher/lib/src/types.dart

@@ -32,7 +32,6 @@ class WebViewConfiguration {
     this.enableJavaScript = true,
     this.enableDomStorage = true,
     this.headers = const <String, String>{},
-    this.showTitle = false,
   });
 
   /// Whether or not JavaScript is enabled for the web content.
@@ -52,6 +51,14 @@ class WebViewConfiguration {
   /// [Browser.EXTRA_HEADERS](https://developer.android.com/reference/android/provider/Browser#EXTRA_HEADERS)
   /// Not all browsers support this, so it is not guaranteed to be honored.
   final Map<String, String> headers;
+}
+
+/// Additional configuration options for [LaunchMode.inAppWebView]
+// TODO(alex): replace this when the pr lands
+@immutable
+class BrowserConfiguration {
+  /// Creates a new InAppBrowserConfiguration with given settings.
+  const BrowserConfiguration({this.showTitle = false});
 
   /// Whether or not to show the webpage title when using Chrome Custom Tabs.
   ///

packages/url_launcher/url_launcher/lib/src/url_launcher_string.dart

@@ -34,7 +34,7 @@ Future<bool> launchUrlString(
     urlString,
     LaunchOptions(
       mode: convertLaunchMode(mode),
-      webViewConfiguration: convertConfiguration(webViewConfiguration),
+      webViewConfiguration: convertWebViewConfiguration(webViewConfiguration),
       webOnlyWindowName: webOnlyWindowName,
     ),
   );

packages/url_launcher/url_launcher/lib/src/url_launcher_uri.dart

@@ -43,6 +43,7 @@ Future<bool> launchUrl(
   Uri url, {
   LaunchMode mode = LaunchMode.platformDefault,
   WebViewConfiguration webViewConfiguration = const WebViewConfiguration(),
+  BrowserConfiguration browserConfiguration = const BrowserConfiguration(),
   String? webOnlyWindowName,
 }) async {
   if (mode == LaunchMode.inAppWebView &&
@@ -54,7 +55,8 @@ Future<bool> launchUrl(
     url.toString(),
     LaunchOptions(
       mode: convertLaunchMode(mode),
-      webViewConfiguration: convertConfiguration(webViewConfiguration),
+      webViewConfiguration: convertWebViewConfiguration(webViewConfiguration),
+      browserConfiguration: convertBrowserConfiguration(browserConfiguration),
       webOnlyWindowName: webOnlyWindowName,
     ),
   );

packages/url_launcher/url_launcher/test/mocks/mock_url_launcher_platform.dart

@@ -102,7 +102,7 @@ class MockUrlLauncher extends Fake
     expect(options.webViewConfiguration.enableJavaScript, enableJavaScript);
     expect(options.webViewConfiguration.enableDomStorage, enableDomStorage);
     expect(options.webViewConfiguration.headers, headers);
-    expect(options.webViewConfiguration.showTitle, showTitle);
+    expect(options.browserConfiguration.showTitle, showTitle);
     expect(options.webOnlyWindowName, webOnlyWindowName);
     launchCalled = true;
     return response!;

packages/url_launcher/url_launcher/test/src/url_launcher_uri_test.dart

@@ -202,10 +202,11 @@ void main() {
         )
         ..setResponse(true);
       expect(
-          await launchUrl(url,
-              mode: LaunchMode.inAppWebView,
-              webViewConfiguration:
-                  const WebViewConfiguration(showTitle: true)),
+          await launchUrl(
+            url,
+            mode: LaunchMode.inAppWebView,
+            browserConfiguration: const BrowserConfiguration(showTitle: true),
+          ),
           isTrue);
     });
 

packages/url_launcher/url_launcher_android/android/src/main/java/io/flutter/plugins/urllauncher/Messages.java

@@ -100,19 +100,6 @@ public void setHeaders(@NonNull Map<String, String> setterArg) {
       this.headers = setterArg;
     }
 
-    private @NonNull Boolean showTitle;
-
-    public @NonNull Boolean getShowTitle() {
-      return showTitle;
-    }
-
-    public void setShowTitle(@NonNull Boolean setterArg) {
-      if (setterArg == null) {
-        throw new IllegalStateException("Nonnull field \"showTitle\" is null.");
-      }
-      this.showTitle = setterArg;
-    }
-
     /** Constructor is non-public to enforce null safety; use Builder. */
     WebViewOptions() {}
 
@@ -139,30 +126,21 @@ public static final class Builder {
         return this;
       }
 
-      private @Nullable Boolean showTitle;
-
-      public @NonNull Builder setShowTitle(@NonNull Boolean setterArg) {
-        this.showTitle = setterArg;
-        return this;
-      }
-
       public @NonNull WebViewOptions build() {
         WebViewOptions pigeonReturn = new WebViewOptions();
         pigeonReturn.setEnableJavaScript(enableJavaScript);
         pigeonReturn.setEnableDomStorage(enableDomStorage);
         pigeonReturn.setHeaders(headers);
-        pigeonReturn.setShowTitle(showTitle);
         return pigeonReturn;
       }
     }
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<Object>(4);
+      ArrayList<Object> toListResult = new ArrayList<Object>(3);
       toListResult.add(enableJavaScript);
       toListResult.add(enableDomStorage);
       toListResult.add(headers);
-      toListResult.add(showTitle);
       return toListResult;
     }
 
@@ -174,7 +152,54 @@ ArrayList<Object> toList() {
       pigeonResult.setEnableDomStorage((Boolean) enableDomStorage);
       Object headers = list.get(2);
       pigeonResult.setHeaders((Map<String, String>) headers);
-      Object showTitle = list.get(3);
+      return pigeonResult;
+    }
+  }
+
+  /** Generated class from Pigeon that represents data sent in messages. */
+  public static final class BrowserOptions {
+    private @NonNull Boolean showTitle;
+
+    public @NonNull Boolean getShowTitle() {
+      return showTitle;
+    }
+
+    public void setShowTitle(@NonNull Boolean setterArg) {
+      if (setterArg == null) {
+        throw new IllegalStateException("Nonnull field \"showTitle\" is null.");
+      }
+      this.showTitle = setterArg;
+    }
+
+    /** Constructor is non-public to enforce null safety; use Builder. */
+    BrowserOptions() {}
+
+    public static final class Builder {
+
+      private @Nullable Boolean showTitle;
+
+      public @NonNull Builder setShowTitle(@NonNull Boolean setterArg) {
+        this.showTitle = setterArg;
+        return this;
+      }
+
+      public @NonNull BrowserOptions build() {
+        BrowserOptions pigeonReturn = new BrowserOptions();
+        pigeonReturn.setShowTitle(showTitle);
+        return pigeonReturn;
+      }
+    }
+
+    @NonNull
+    ArrayList<Object> toList() {
+      ArrayList<Object> toListResult = new ArrayList<Object>(1);
+      toListResult.add(showTitle);
+      return toListResult;
+    }
+
+    static @NonNull BrowserOptions fromList(@NonNull ArrayList<Object> list) {
+      BrowserOptions pigeonResult = new BrowserOptions();
+      Object showTitle = list.get(0);
       pigeonResult.setShowTitle((Boolean) showTitle);
       return pigeonResult;
     }
@@ -189,6 +214,8 @@ private UrlLauncherApiCodec() {}
     protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) {
       switch (type) {
         case (byte) 128:
+          return BrowserOptions.fromList((ArrayList<Object>) readValue(buffer));
+        case (byte) 129:
           return WebViewOptions.fromList((ArrayList<Object>) readValue(buffer));
         default:
           return super.readValueOfType(type, buffer);
@@ -197,8 +224,11 @@ protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) {
 
     @Override
     protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value) {
-      if (value instanceof WebViewOptions) {
+      if (value instanceof BrowserOptions) {
         stream.write(128);
+        writeValue(stream, ((BrowserOptions) value).toList());
+      } else if (value instanceof WebViewOptions) {
+        stream.write(129);
         writeValue(stream, ((WebViewOptions) value).toList());
       } else {
         super.writeValue(stream, value);
@@ -216,7 +246,10 @@ public interface UrlLauncherApi {
     Boolean launchUrl(@NonNull String url, @NonNull Map<String, String> headers);
     /** Opens the URL in an in-app WebView, returning true if it opens successfully. */
     @NonNull
-    Boolean openUrlInWebView(@NonNull String url, @NonNull WebViewOptions options);
+    Boolean openUrlInWebView(
+        @NonNull String url,
+        @NonNull WebViewOptions webViewOptions,
+        @NonNull BrowserOptions browserOptions);
     /** Closes the view opened by [openUrlInSafariViewController]. */
     void closeWebView();
 
@@ -289,9 +322,11 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable UrlLaunche
                 ArrayList<Object> wrapped = new ArrayList<Object>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
                 String urlArg = (String) args.get(0);
-                WebViewOptions optionsArg = (WebViewOptions) args.get(1);
+                WebViewOptions webViewOptionsArg = (WebViewOptions) args.get(1);
+                BrowserOptions browserOptionsArg = (BrowserOptions) args.get(2);
                 try {
-                  Boolean output = api.openUrlInWebView(urlArg, optionsArg);
+                  Boolean output =
+                      api.openUrlInWebView(urlArg, webViewOptionsArg, browserOptionsArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   ArrayList<Object> wrappedError = wrapError(exception);

packages/url_launcher/url_launcher_android/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncher.java

@@ -19,6 +19,7 @@
 import androidx.browser.customtabs.CustomTabsIntent;
 import io.flutter.plugins.urllauncher.Messages.UrlLauncherApi;
 import io.flutter.plugins.urllauncher.Messages.WebViewOptions;
+import io.flutter.plugins.urllauncher.Messages.BrowserOptions;
 import java.util.Locale;
 import java.util.Map;
 
@@ -95,16 +96,19 @@ void setActivity(@Nullable Activity activity) {
   }
 
   @Override
-  public @NonNull Boolean openUrlInWebView(@NonNull String url, @NonNull WebViewOptions options) {
+  public @NonNull Boolean openUrlInWebView(
+      @NonNull String url,
+      @NonNull WebViewOptions webViewOptions,
+      @NonNull BrowserOptions browserOptions) {
     ensureActivity();
     assert activity != null;
 
-    Bundle headersBundle = extractBundle(options.getHeaders());
+    Bundle headersBundle = extractBundle(webViewOptions.getHeaders());
 
     // Try to launch using Custom Tabs if they have the necessary functionality.
-    if (!containsRestrictedHeader(options.getHeaders())) {
+    if (!containsRestrictedHeader(webViewOptions.getHeaders())) {
       Uri uri = Uri.parse(url);
-      if (openCustomTab(activity, uri, headersBundle, options)) {
+      if (openCustomTab(activity, uri, headersBundle, browserOptions)) {
         return true;
       }
     }
@@ -114,8 +118,8 @@ void setActivity(@Nullable Activity activity) {
         WebViewActivity.createIntent(
             activity,
             url,
-            options.getEnableJavaScript(),
-            options.getEnableDomStorage(),
+            webViewOptions.getEnableJavaScript(),
+            webViewOptions.getEnableDomStorage(),
             headersBundle);
     try {
       activity.startActivity(launchIntent);
@@ -136,7 +140,7 @@ public static boolean openCustomTab(
       @NonNull Context context,
       @NonNull Uri uri,
       @NonNull Bundle headersBundle,
-      @NonNull WebViewOptions options) {
+      @NonNull BrowserOptions options) {
     CustomTabsIntent customTabsIntent =
         new CustomTabsIntent.Builder().setShowTitle(options.getShowTitle()).build();