From 4e72c24439ac6ab4099bbbd9c28f28d60496bf96 Mon Sep 17 00:00:00 2001 From: Shinya Kumagai Date: Wed, 6 Dec 2023 23:36:37 +0900 Subject: [PATCH] Refactor message converters and messages in `flutter_custom_tabs_ios` --- flutter_custom_tabs_ios/example/lib/main.dart | 2 +- flutter_custom_tabs_ios/lib/src/custom_tabs_plugin_ios.dart | 5 ++--- flutter_custom_tabs_ios/lib/src/messages/messages.dart | 2 ++ .../lib/src/{ => messages}/messages.g.dart | 0 .../type_conversion.dart} | 2 +- flutter_custom_tabs_ios/pigeons/messages.dart | 2 +- .../test/custom_tabs_plugin_ios_ios_test.dart | 3 +-- flutter_custom_tabs_ios/test/messages.dart | 2 -- .../test/types/safari_view_controller_options_test.dart | 3 +-- .../test/types/sheet_presentation_controller_test.dart | 3 +-- 10 files changed, 10 insertions(+), 14 deletions(-) create mode 100644 flutter_custom_tabs_ios/lib/src/messages/messages.dart rename flutter_custom_tabs_ios/lib/src/{ => messages}/messages.g.dart (100%) rename flutter_custom_tabs_ios/lib/src/{message_converters.dart => messages/type_conversion.dart} (97%) delete mode 100644 flutter_custom_tabs_ios/test/messages.dart diff --git a/flutter_custom_tabs_ios/example/lib/main.dart b/flutter_custom_tabs_ios/example/lib/main.dart index 120ce76c..50e741d3 100644 --- a/flutter_custom_tabs_ios/example/lib/main.dart +++ b/flutter_custom_tabs_ios/example/lib/main.dart @@ -153,4 +153,4 @@ Future _launchInExternalBrowser() async { } catch (e) { debugPrint(e.toString()); } -} \ No newline at end of file +} diff --git a/flutter_custom_tabs_ios/lib/src/custom_tabs_plugin_ios.dart b/flutter_custom_tabs_ios/lib/src/custom_tabs_plugin_ios.dart index 45ec1978..edc2044e 100644 --- a/flutter_custom_tabs_ios/lib/src/custom_tabs_plugin_ios.dart +++ b/flutter_custom_tabs_ios/lib/src/custom_tabs_plugin_ios.dart @@ -1,8 +1,7 @@ import 'package:flutter_custom_tabs_platform_interface/flutter_custom_tabs_platform_interface.dart'; -import 'message_converters.dart'; -import 'messages.g.dart'; -import 'types/safari_view_controller_options.dart'; +import 'messages/messages.dart'; +import 'types/types.dart'; /// The iOS implementation of [CustomTabsPlatform]. /// diff --git a/flutter_custom_tabs_ios/lib/src/messages/messages.dart b/flutter_custom_tabs_ios/lib/src/messages/messages.dart new file mode 100644 index 00000000..ab72bc0a --- /dev/null +++ b/flutter_custom_tabs_ios/lib/src/messages/messages.dart @@ -0,0 +1,2 @@ +export 'messages.g.dart'; +export 'type_conversion.dart'; diff --git a/flutter_custom_tabs_ios/lib/src/messages.g.dart b/flutter_custom_tabs_ios/lib/src/messages/messages.g.dart similarity index 100% rename from flutter_custom_tabs_ios/lib/src/messages.g.dart rename to flutter_custom_tabs_ios/lib/src/messages/messages.g.dart diff --git a/flutter_custom_tabs_ios/lib/src/message_converters.dart b/flutter_custom_tabs_ios/lib/src/messages/type_conversion.dart similarity index 97% rename from flutter_custom_tabs_ios/lib/src/message_converters.dart rename to flutter_custom_tabs_ios/lib/src/messages/type_conversion.dart index 7ea34d8a..c275b247 100644 --- a/flutter_custom_tabs_ios/lib/src/message_converters.dart +++ b/flutter_custom_tabs_ios/lib/src/messages/type_conversion.dart @@ -1,7 +1,7 @@ import 'package:flutter/painting.dart'; -import 'types/types.dart'; import 'messages.g.dart'; +import '../types/types.dart'; extension SafariViewControllerOptionsConverter on SafariViewControllerOptions { SafariViewControllerOptionsMessage toMessage() { diff --git a/flutter_custom_tabs_ios/pigeons/messages.dart b/flutter_custom_tabs_ios/pigeons/messages.dart index 0f4c9b9b..7d650893 100644 --- a/flutter_custom_tabs_ios/pigeons/messages.dart +++ b/flutter_custom_tabs_ios/pigeons/messages.dart @@ -2,7 +2,7 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon(PigeonOptions( swiftOut: 'ios/Classes/messages.g.swift', - dartOut: 'lib/src/messages.g.dart', + dartOut: 'lib/src/messages/messages.g.dart', )) @HostApi() abstract class CustomTabsApi { diff --git a/flutter_custom_tabs_ios/test/custom_tabs_plugin_ios_ios_test.dart b/flutter_custom_tabs_ios/test/custom_tabs_plugin_ios_ios_test.dart index d305ba90..bccc187e 100644 --- a/flutter_custom_tabs_ios/test/custom_tabs_plugin_ios_ios_test.dart +++ b/flutter_custom_tabs_ios/test/custom_tabs_plugin_ios_ios_test.dart @@ -1,9 +1,8 @@ import 'package:flutter_custom_tabs_ios/flutter_custom_tabs_ios.dart'; +import 'package:flutter_custom_tabs_ios/src/messages/messages.dart'; import 'package:flutter_custom_tabs_platform_interface/flutter_custom_tabs_platform_interface.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'messages.dart'; - void main() { late _MockCustomTabsApi api; late CustomTabsPluginIOS customTabs; diff --git a/flutter_custom_tabs_ios/test/messages.dart b/flutter_custom_tabs_ios/test/messages.dart deleted file mode 100644 index ef05c8c7..00000000 --- a/flutter_custom_tabs_ios/test/messages.dart +++ /dev/null @@ -1,2 +0,0 @@ -export 'package:flutter_custom_tabs_ios/src/message_converters.dart'; -export 'package:flutter_custom_tabs_ios/src/messages.g.dart'; diff --git a/flutter_custom_tabs_ios/test/types/safari_view_controller_options_test.dart b/flutter_custom_tabs_ios/test/types/safari_view_controller_options_test.dart index 459c5e8a..56d4f596 100644 --- a/flutter_custom_tabs_ios/test/types/safari_view_controller_options_test.dart +++ b/flutter_custom_tabs_ios/test/types/safari_view_controller_options_test.dart @@ -1,9 +1,8 @@ import 'package:flutter/painting.dart'; import 'package:flutter_custom_tabs_ios/flutter_custom_tabs_ios.dart'; +import 'package:flutter_custom_tabs_ios/src/messages/messages.dart'; import 'package:flutter_test/flutter_test.dart'; -import '../messages.dart'; - void main() { group('SafariViewControllerOptions', () { test('toMessage() returns empty message when option values are null', () { diff --git a/flutter_custom_tabs_ios/test/types/sheet_presentation_controller_test.dart b/flutter_custom_tabs_ios/test/types/sheet_presentation_controller_test.dart index 30d056d9..72ae3690 100644 --- a/flutter_custom_tabs_ios/test/types/sheet_presentation_controller_test.dart +++ b/flutter_custom_tabs_ios/test/types/sheet_presentation_controller_test.dart @@ -1,8 +1,7 @@ import 'package:flutter_custom_tabs_ios/flutter_custom_tabs_ios.dart'; +import 'package:flutter_custom_tabs_ios/src/messages/messages.dart'; import 'package:flutter_test/flutter_test.dart'; -import '../messages.dart'; - void main() { group('SheetPresentationControllerConfiguration', () { test('toMessage() returns expected message with default values', () {