Merge branch 'main' into manual-roll-master-to-c246ecd

Author: ditman

packages/pigeon/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 19.0.2
+
+* [kotlin] Adds the `@JvmOverloads` to the `HostApi` setUp method. This prevents the calling Java code from having to provide an empty `String` as Kotlin provides it by default  
+
 ## 19.0.1
 
 * [dart] Updates `PigeonInstanceMangerApi` to use the shared api channel code.

packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt

@@ -118,6 +118,7 @@ interface ExampleHostApi {
     /** The codec used by ExampleHostApi. */
     val codec: MessageCodec<Any?> by lazy { ExampleHostApiCodec }
     /** Sets up an instance of `ExampleHostApi` to handle messages through the `binaryMessenger`. */
+    @JvmOverloads
     fun setUp(
         binaryMessenger: BinaryMessenger,
         api: ExampleHostApi?,

packages/pigeon/lib/generator_tools.dart

@@ -13,7 +13,7 @@ import 'ast.dart';
 /// The current version of pigeon.
 ///
 /// This must match the version in pubspec.yaml.
-const String pigeonVersion = '19.0.1';
+const String pigeonVersion = '19.0.2';
 
 /// Prefix for all local variables in methods.
 ///

packages/pigeon/lib/kotlin_generator.dart

@@ -430,6 +430,7 @@ class KotlinGenerator extends StructuredGenerator<KotlinOptions> {
         });
         indent.writeln(
             '/** Sets up an instance of `$apiName` to handle messages through the `binaryMessenger`. */');
+        indent.writeln('@JvmOverloads');
         indent.write(
             'fun setUp(binaryMessenger: BinaryMessenger, api: $apiName?, messageChannelSuffix: String = "") ');
         indent.addScoped('{', '}', () {

packages/pigeon/pubspec.yaml

@@ -2,7 +2,7 @@ name: pigeon
 description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
 repository: https://github.com/flutter/packages/tree/main/packages/pigeon
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22
-version: 19.0.1 # This must match the version in lib/generator_tools.dart
+version: 19.0.2 # This must match the version in lib/generator_tools.dart
 
 environment:
   sdk: ^3.2.0

packages/pigeon/test/kotlin_generator_test.dart

@@ -231,6 +231,10 @@ void main() {
     final String code = sink.toString();
     expect(code, contains('interface Api'));
     expect(code, contains('fun doSomething(input: Input): Output'));
+    expect(code, contains('''
+    @JvmOverloads
+    fun setUp(binaryMessenger: BinaryMessenger, api: Api?, messageChannelSuffix: String = "") {
+    '''));
     expect(code, contains('channel.setMessageHandler'));
     expect(code, contains('''
         if (api != null) {

packages/url_launcher/url_launcher/CHANGELOG.md

@@ -1,5 +1,7 @@
-## NEXT
+## 6.3.0
 
+* Adds `BrowserConfiguration` parameter, to configure in-app browser views, such as Android Custom Tabs or SFSafariViewController.
+* Adds `showTitle` to `BrowserConfiguration`, to allow showing webpage titles in in-app browser views.
 * Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
 
 ## 6.2.6

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

@@ -74,6 +74,16 @@ class _MyHomePageState extends State<MyHomePage> {
     }
   }
 
+  Future<void> _launchInAppWithBrowserOptions(Uri url) async {
+    if (!await launchUrl(
+      url,
+      mode: LaunchMode.inAppBrowserView,
+      browserConfiguration: const BrowserConfiguration(showTitle: true),
+    )) {
+      throw Exception('Could not launch $url');
+    }
+  }
+
   Future<void> _launchAsInAppWebViewWithCustomHeaders(Uri url) async {
     if (!await launchUrl(
       url,
@@ -220,6 +230,13 @@ class _MyHomePageState extends State<MyHomePage> {
                 child: const Text('Launch in app + close after 5 seconds'),
               ),
               const Padding(padding: EdgeInsets.all(16.0)),
+              ElevatedButton(
+                onPressed: () => setState(() {
+                  _launched = _launchInAppWithBrowserOptions(toLaunch);
+                }),
+                child: const Text('Launch in app with title displayed'),
+              ),
+              const Padding(padding: EdgeInsets.all(16.0)),
               Link(
                 uri: Uri.parse(
                     'https://pub.dev/documentation/url_launcher/latest/link/link-library.html'),

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

@@ -8,14 +8,24 @@ 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)
+/// [InAppBrowserConfiguration].
+InAppBrowserConfiguration convertBrowserConfiguration(
+    BrowserConfiguration config) {
+  return InAppBrowserConfiguration(
+    showTitle: config.showTitle,
+  );
+}
+
 /// Converts an (app-facing) [LaunchMode] to a (platform interface)
 /// [PreferredLaunchMode].
 PreferredLaunchMode convertLaunchMode(LaunchMode mode) {

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

@@ -55,3 +55,15 @@ class WebViewConfiguration {
   /// Not all browsers support this, so it is not guaranteed to be honored.
   final Map<String, String> headers;
 }
+
+/// Additional configuration options for [LaunchMode.inAppBrowserView]
+@immutable
+class BrowserConfiguration {
+  /// Creates a new InAppBrowserConfiguration with given settings.
+  const BrowserConfiguration({this.showTitle = false});
+
+  /// Whether or not to show the webpage title.
+  ///
+  /// May not be supported on all platforms.
+  final bool showTitle;
+}