Merge pull request #159 from droibit/feature/refactoring

Refactor message converters and messages
droibit · Dec 6, 2023 · 17b1c77 · 17b1c77
2 parents fb72ddc + 4e72c24
commit 17b1c77
Show file tree

Hide file tree

Showing 24 changed files with 23 additions and 35 deletions.
diff --git a/flutter_custom_tabs_android/example/lib/main.dart b/flutter_custom_tabs_android/example/lib/main.dart
@@ -188,4 +188,4 @@ Future<void> _launchInExternalBrowser() async {
   } catch (e) {
     debugPrint(e.toString());
   }
-}
+}
diff --git a/flutter_custom_tabs_android/lib/src/custom_tabs_plugin_android.dart b/flutter_custom_tabs_android/lib/src/custom_tabs_plugin_android.dart
@@ -1,7 +1,6 @@
 import 'package:flutter_custom_tabs_platform_interface/flutter_custom_tabs_platform_interface.dart';
 
-import 'message_converters.dart';
-import 'messages.g.dart';
+import 'messages/messages.dart';
 import 'types/types.dart';
 
 /// The Android implementation of [CustomTabsPlatform].

diff --git a/flutter_custom_tabs_android/lib/src/messages/messages.dart b/flutter_custom_tabs_android/lib/src/messages/messages.dart
@@ -0,0 +1,2 @@
+export 'messages.g.dart';
+export 'type_conversion.dart';
diff --git a/...stom_tabs_android/lib/src/messages.g.dart → ..._android/lib/src/messages/messages.g.dart b/...stom_tabs_android/lib/src/messages.g.dart → ..._android/lib/src/messages/messages.g.dart
diff --git a/...s_android/lib/src/message_converters.dart → ...oid/lib/src/messages/type_conversion.dart b/...s_android/lib/src/message_converters.dart → ...oid/lib/src/messages/type_conversion.dart
@@ -2,8 +2,8 @@ import 'dart:math';
 
 import 'package:flutter/painting.dart';
 
-import 'types/types.dart';
 import 'messages.g.dart';
+import '../types/types.dart';
 
 extension CustomTabsOptionsConverter on CustomTabsOptions {
   CustomTabsOptionsMessage toMessage() {

diff --git a/flutter_custom_tabs_android/pigeons/messages.dart b/flutter_custom_tabs_android/pigeons/messages.dart
@@ -7,7 +7,7 @@ import 'package:pigeon/pigeon.dart';
     className: 'Messages',
     package: 'com.github.droibit.flutter.plugins.customtabs',
   ),
-  dartOut: 'lib/src/messages.g.dart',
+  dartOut: 'lib/src/messages/messages.g.dart',
 ))
 @HostApi()
 abstract class CustomTabsApi {

diff --git a/flutter_custom_tabs_android/test/custom_tabs_plugin_android_test.dart b/flutter_custom_tabs_android/test/custom_tabs_plugin_android_test.dart
@@ -1,9 +1,8 @@
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/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 CustomTabsPluginAndroid customTabs;

diff --git a/flutter_custom_tabs_android/test/messages.dart b/flutter_custom_tabs_android/test/messages.dart
diff --git a/flutter_custom_tabs_android/test/types/custom_tabs_animations_test.dart b/flutter_custom_tabs_android/test/types/custom_tabs_animations_test.dart
@@ -1,8 +1,7 @@
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   group('CustomTabsAnimations', () {
     test('toMessage() returns empty message when animation values are null',

diff --git a/flutter_custom_tabs_android/test/types/custom_tabs_browser_test.dart b/flutter_custom_tabs_android/test/types/custom_tabs_browser_test.dart
@@ -1,8 +1,7 @@
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   test('toMessage() returns empty message when option values are null', () {
     const configuration = CustomTabsBrowserConfiguration();

diff --git a/flutter_custom_tabs_android/test/types/custom_tabs_close_button_test.dart b/flutter_custom_tabs_android/test/types/custom_tabs_close_button_test.dart
@@ -1,8 +1,7 @@
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   group('CustomTabsCloseButton', () {
     test('toMessage() returns empty message when option values are null', () {

diff --git a/flutter_custom_tabs_android/test/types/custom_tabs_color_schemes_test.dart b/flutter_custom_tabs_android/test/types/custom_tabs_color_schemes_test.dart
@@ -1,10 +1,9 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/painting.dart';
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   group('CustomTabsColorSchemes', () {
     test('toMessage() returns empty message when option values are null', () {

diff --git a/flutter_custom_tabs_android/test/types/custom_tabs_options_test.dart b/flutter_custom_tabs_android/test/types/custom_tabs_options_test.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/painting.dart';
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   group('CustomTabsOptions', () {
     test('toMessage() returns empty message when option values are null', () {

diff --git a/flutter_custom_tabs_android/test/types/partial_custom_tabs_test.dart b/flutter_custom_tabs_android/test/types/partial_custom_tabs_test.dart
@@ -1,8 +1,7 @@
 import 'package:flutter_custom_tabs_android/flutter_custom_tabs_android.dart';
+import 'package:flutter_custom_tabs_android/src/messages/messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../messages.dart';
-
 void main() {
   group('PartialCustomTabsConfiguration', () {
     test('toMessage() returns expected message with default values', () {

diff --git a/flutter_custom_tabs_ios/example/lib/main.dart b/flutter_custom_tabs_ios/example/lib/main.dart
@@ -153,4 +153,4 @@ Future<void> _launchInExternalBrowser() async {
   } catch (e) {
     debugPrint(e.toString());
   }
-}
+}
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
@@ -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
@@ -0,0 +1,2 @@
+export 'messages.g.dart';
+export 'type_conversion.dart';
diff --git a/...r_custom_tabs_ios/lib/src/messages.g.dart → ...tabs_ios/lib/src/messages/messages.g.dart b/...r_custom_tabs_ios/lib/src/messages.g.dart → ...tabs_ios/lib/src/messages/messages.g.dart
diff --git a/..._tabs_ios/lib/src/message_converters.dart → ...ios/lib/src/messages/type_conversion.dart b/..._tabs_ios/lib/src/message_converters.dart → ...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
@@ -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
@@ -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
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
@@ -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
@@ -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', () {
-Original file line number
+Diff line change
@@ Expand Up / @@ -188,4 +188,4 @@ Future<void> _launchInExternalBrowser() async { @@
       } catch (e) {
         debugPrint(e.toString());
       }
-    }
+    }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export 'messages.g.dart';
		export 'type_conversion.dart';