Delete all toMap methods for options since they are no longer used

flutter_custom_tabs/test/launcher_lite_test.dart

@@ -41,13 +41,11 @@ void main() {
     }
   });
 
-  test('launchUrl() launch with complete options', () async {
+  test('launchUrl() launch with options', () async {
     final url = Uri.parse('http://example.com/');
     const prefersDeepLink = true;
     const options = LaunchOptions(
-      barColor: Color(0xFFFFFFFF),
-      onBarColor: Color(0xFFFFFFFE),
-      appBarFixed: true,
+      appBarFixed: false,
     );
     mock.setLaunchExpectations(
       url: url.toString(),

flutter_custom_tabs/test/launcher_test.dart

@@ -55,32 +55,14 @@ void main() {
     }
   });
 
-  test('launchUrl() launch with basic options', () async {
+  test('launchUrl() launch with options', () async {
     final url = Uri.parse('http://example.com/');
     const prefersDeepLink = true;
     const customTabsOptions = CustomTabsOptions(
-      colorSchemes: CustomTabsColorSchemes(
-        defaultPrams: CustomTabsColorSchemeParams(
-          toolbarColor: Color(0xFFFFEBEE),
-        ),
-      ),
       urlBarHidingEnabled: true,
-      shareState: CustomTabsShareState.off,
-      showTitle: true,
-      instantAppsEnabled: false,
-      animations: CustomTabsAnimations(
-        startEnter: '_startEnter',
-        startExit: '_startExit',
-        endEnter: '_endEnter',
-        endExit: '_endExit',
-      ),
     );
     const safariVCOptions = SafariViewControllerOptions(
-      preferredBarTintColor: Color(0xFFFFEBEE),
-      preferredControlTintColor: Color(0xFFFFFFFF),
       barCollapsingEnabled: true,
-      entersReaderIfAvailable: false,
-      dismissButtonStyle: SafariViewControllerDismissButtonStyle.close,
     );
     mock.setLaunchExpectations(
       url: url.toString(),

flutter_custom_tabs/test/mocks/mock_custom_tabs_platform.dart

@@ -1,3 +1,4 @@
+import 'package:flutter_custom_tabs/flutter_custom_tabs.dart';
 import 'package:flutter_custom_tabs_platform_interface/flutter_custom_tabs_platform_interface.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
@@ -7,17 +8,17 @@ class MockCustomTabsPlatform extends Fake
     implements CustomTabsPlatform {
   String? url;
   bool? prefersDeepLink;
-  PlatformOptions? customTabsOptions;
-  PlatformOptions? safariVCOptions;
+  CustomTabsOptions? customTabsOptions;
+  SafariViewControllerOptions? safariVCOptions;
 
   bool launchUrlCalled = false;
   bool closeAllIfPossibleCalled = false;
 
   void setLaunchExpectations({
     required String url,
     bool? prefersDeepLink,
-    PlatformOptions? customTabsOptions,
-    PlatformOptions? safariVCOptions,
+    CustomTabsOptions? customTabsOptions,
+    SafariViewControllerOptions? safariVCOptions,
   }) {
     this.url = url;
     this.prefersDeepLink = prefersDeepLink;
@@ -34,8 +35,23 @@ class MockCustomTabsPlatform extends Fake
   }) async {
     expect(urlString, url);
     expect(prefersDeepLink, this.prefersDeepLink);
-    expect(customTabsOptions?.toMap(), this.customTabsOptions?.toMap());
-    expect(safariVCOptions?.toMap(), this.safariVCOptions?.toMap());
+
+    if (customTabsOptions is CustomTabsOptions) {
+      expect(
+        customTabsOptions.urlBarHidingEnabled,
+        this.customTabsOptions!.urlBarHidingEnabled,
+      );
+    } else {
+      expect(customTabsOptions, isNull);
+    }
+    if (safariVCOptions is SafariViewControllerOptions) {
+      expect(
+        safariVCOptions.barCollapsingEnabled,
+        this.safariVCOptions!.barCollapsingEnabled,
+      );
+    } else {
+      expect(safariVCOptions, isNull);
+    }
     launchUrlCalled = true;
   }
 

flutter_custom_tabs_android/lib/src/message_converters.dart

@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:flutter/painting.dart';
 
 import 'types/types.dart';
@@ -78,11 +80,14 @@ extension CustomTabsColorSchemeParamsConverter on CustomTabsColorSchemeParams {
 extension PartialCustomTabsConfigurationConverter
     on PartialCustomTabsConfiguration {
   PartialCustomTabsConfigurationMessage toMessage() {
-    return PartialCustomTabsConfigurationMessage(
+    final message = PartialCustomTabsConfigurationMessage(
       initialHeight: initialHeight,
       activityHeightResizeBehavior: activityHeightResizeBehavior.rawValue,
-      cornerRadius: cornerRadius,
     );
+    if (cornerRadius != null) {
+      message.cornerRadius = min(cornerRadius!, 16);
+    }
+    return message;
   }
 }
 

flutter_custom_tabs_android/lib/src/types/custom_tabs_animations.dart

@@ -31,20 +31,6 @@ class CustomTabsAnimations {
 
   /// Resource ID of the exit "exit" animation for the custom tab.
   final String? endExit;
-
-  @internal
-  Map<String, String> toMap() {
-    final dest = <String, String>{};
-    if (startEnter != null && startExit != null) {
-      dest['startEnter'] = startEnter!;
-      dest['startExit'] = startExit!;
-    }
-    if (endEnter != null && endExit != null) {
-      dest['endEnter'] = endEnter!;
-      dest['endExit'] = endExit!;
-    }
-    return dest;
-  }
 }
 
 /// Build-in enter and exit animations for Custom Tabs.

flutter_custom_tabs_android/lib/src/types/custom_tabs_browser.dart

@@ -23,14 +23,4 @@ class CustomTabsBrowserConfiguration {
 
   /// Extra HTTP request headers.
   final Map<String, String>? headers;
-
-  @internal
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      if (prefersDefaultBrowser != null)
-        'prefersDefaultBrowser': prefersDefaultBrowser!,
-      if (fallbackCustomTabs != null) 'fallbackCustomTabs': fallbackCustomTabs,
-      if (headers != null) 'headers': headers,
-    };
-  }
 }

flutter_custom_tabs_android/lib/src/types/custom_tabs_close_button.dart

@@ -13,14 +13,6 @@ class CustomTabsCloseButton {
 
   /// The position of the close button on the custom tab.
   final CustomTabsCloseButtonPosition? position;
-
-  @internal
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      if (icon != null) 'icon': icon,
-      if (position != null) 'position': position!.rawValue,
-    };
-  }
 }
 
 /// The position of the close button on the custom tab.

flutter_custom_tabs_android/lib/src/types/custom_tabs_color_schemes.dart

@@ -40,17 +40,6 @@ class CustomTabsColorSchemes {
   /// If there is no [CustomTabsColorSchemeParams] for the current scheme,
   /// or a particular field of it is null, Custom Tabs will fall back to the defaults provided via [defaultPrams].
   final CustomTabsColorSchemeParams? defaultPrams;
-
-  @internal
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      if (colorScheme != null) 'colorScheme': colorScheme!.rawValue,
-      if (lightParams != null) 'lightColorSchemeParams': lightParams!.toMap(),
-      if (darkParams != null) 'darkColorSchemeParams': darkParams!.toMap(),
-      if (defaultPrams != null)
-        'defaultColorSchemeParams': defaultPrams!.toMap()
-    };
-  }
 }
 
 /// Desired color scheme on a custom tab.
@@ -92,19 +81,6 @@ class CustomTabsColorSchemeParams {
 
   /// Navigation bar divider color.
   final Color? navigationBarDividerColor;
-
-  @internal
-  Map<String, String> toMap() {
-    return <String, String>{
-      if (toolbarColor != null)
-        'toolbarColor': '#${toolbarColor!.value.toRadixString(16)}',
-      if (navigationBarColor != null)
-        'navigationBarColor': '#${navigationBarColor!.value.toRadixString(16)}',
-      if (navigationBarDividerColor != null)
-        'navigationBarDividerColor':
-            '#${navigationBarDividerColor!.value.toRadixString(16)}',
-    };
-  }
 }
 
 extension BrightnessToColorScheme on Brightness {

flutter_custom_tabs_android/lib/src/types/custom_tabs_options.dart

@@ -71,10 +71,6 @@ class CustomTabsOptions implements PlatformOptions {
 
   /// The configuration for Partial Custom Tabs.
   final PartialCustomTabsConfiguration? partial;
-
-  /// Converts the [CustomTabsOptions] instance into a [Map] instance for serialization.
-  @override
-  Map<String, dynamic> toMap() => {};
 }
 
 /// The share state that should be applied to the custom tab.

flutter_custom_tabs_android/lib/src/types/partial_custom_tabs.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:meta/meta.dart';
 
 /// The configuration for [Partial Custom Tabs](https://developer.chrome.com/docs/android/custom-tabs/guide-partial-custom-tabs/).
@@ -24,16 +22,6 @@ class PartialCustomTabsConfiguration {
   ///
   /// *The maximum corner radius is 16dp(lp).
   final int? cornerRadius;
-
-  @internal
-  Map<String, dynamic> toMap() {
-    final dest = <String, dynamic>{
-      'initialHeightDp': initialHeight,
-      'activityHeightResizeBehavior': activityHeightResizeBehavior.rawValue,
-      if (cornerRadius != null) 'cornerRadiusDp': min(cornerRadius!, 16)
-    };
-    return dest;
-  }
 }
 
 /// Desired height behavior for the custom tab.

flutter_custom_tabs_android/test/custom_tabs_plugin_android_test.dart

@@ -18,7 +18,7 @@ void main() {
     expect(CustomTabsPlatform.instance, isA<CustomTabsPluginAndroid>());
   });
 
-  test('launch() invoke method "launch" with CustomTabsOptions', () async {
+  test('launch() invoke method "launch" with valid options', () async {
     const url = 'http://example.com/';
     const prefersDeepLink = true;
     const options = CustomTabsOptions(
@@ -41,18 +41,14 @@ void main() {
   test('launch() invoke method "launch" with invalid options', () async {
     const url = 'http://example.com/';
     const prefersDeepLink = true;
-    const options = _Options(
-      urlBarHidingEnabled: true,
-    );
     api.setLaunchExpectations(
       url: url,
       prefersDeepLink: prefersDeepLink,
-      options: options,
     );
 
     await customTabs.launch(
-      'http://example.com/',
-      prefersDeepLink: false,
+      url,
+      prefersDeepLink: prefersDeepLink,
       customTabsOptions: const _Options(
         urlBarHidingEnabled: true,
       ),
@@ -113,10 +109,4 @@ class _Options implements PlatformOptions {
   const _Options({
     this.urlBarHidingEnabled,
   });
-
-  @override
-  Map<String, dynamic> toMap() => {
-        if (urlBarHidingEnabled != null)
-          'urlBarHidingEnabled': urlBarHidingEnabled,
-      };
 }

flutter_custom_tabs_ios/lib/src/types/safari_view_controller_options.dart

@@ -60,28 +60,6 @@ class SafariViewControllerOptions implements PlatformOptions {
 
   /// The page sheet configuration.
   final SheetPresentationControllerConfiguration? pageSheet;
-
-  /// Converts the [SafariViewControllerOptions] instance into a [Map] instance for serialization.
-  @override
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      if (preferredBarTintColor != null)
-        'preferredBarTintColor':
-            '#${preferredBarTintColor!.value.toRadixString(16)}',
-      if (preferredControlTintColor != null)
-        'preferredControlTintColor':
-            '#${preferredControlTintColor!.value.toRadixString(16)}',
-      if (barCollapsingEnabled != null)
-        'barCollapsingEnabled': barCollapsingEnabled,
-      if (entersReaderIfAvailable != null)
-        'entersReaderIfAvailable': entersReaderIfAvailable,
-      if (modalPresentationStyle != null)
-        'modalPresentationStyle': modalPresentationStyle!.rawValue,
-      if (dismissButtonStyle != null)
-        'dismissButtonStyle': dismissButtonStyle!.rawValue,
-      if (pageSheet != null) 'pageSheet': pageSheet!.toMap(),
-    };
-  }
 }
 
 /// Dismiss button style on the navigation bar of [SFSafariViewController](https://developer.apple.com/documentation/safariservices/sfsafariviewcontroller).

flutter_custom_tabs_ios/lib/src/types/sheet_presentation_controller.dart

@@ -35,26 +35,6 @@ class SheetPresentationControllerConfiguration {
 
   /// The corner radius that the sheet attempts to present with.
   final double? preferredCornerRadius;
-
-  @internal
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'detents': detents.map((e) => e.rawValue).toList(),
-      if (largestUndimmedDetentIdentifier != null)
-        'largestUndimmedDetentIdentifier':
-            largestUndimmedDetentIdentifier!.rawValue,
-      if (prefersScrollingExpandsWhenScrolledToEdge != null)
-        'prefersScrollingExpandsWhenScrolledToEdge':
-            prefersScrollingExpandsWhenScrolledToEdge,
-      if (prefersGrabberVisible != null)
-        'prefersGrabberVisible': prefersGrabberVisible,
-      if (prefersEdgeAttachedInCompactHeight != null)
-        'prefersEdgeAttachedInCompactHeight':
-            prefersEdgeAttachedInCompactHeight,
-      if (preferredCornerRadius != null)
-        'preferredCornerRadius': preferredCornerRadius,
-    };
-  }
 }
 
 /// An object that represents a height where a sheet naturally rests.