Merge pull request #1 from em-yhoshino/feature/close-for-develop

Add closeAllIfPossible()

Author: em-yhoshino

Diff for: flutter_custom_tabs/android/src/main/java/com/github/droibit/flutter/plugins/customtabs/CustomTabsPlugin.java

@@ -73,7 +73,9 @@ public void onDetachedFromActivity() {
     public void onMethodCall(@NonNull MethodCall call, @NonNull final MethodChannel.Result result) {
         if ("launch".equals(call.method)) {
             launch(((Map<String, Object>) call.arguments), result);
-        } else {
+        } if ("closeAllIfPossible".equals(call.method)) {
+            closeAllIfPossible(result);
+        }else {
             result.notImplemented();
         }
     }
@@ -98,4 +100,9 @@ private void launch(@NonNull Map<String, Object> args, @NonNull MethodChannel.Re
             result.error(CODE_LAUNCH_ERROR, e.getMessage(), null);
         }
     }
+
+    @SuppressWarnings({"unchecked", "ConstantConditions"})
+    private void closeAllIfPossible(@NonNull MethodChannel.Result result) {
+        result.success(null);
+    }
 }

Diff for: flutter_custom_tabs/ios/Classes/CustomTabsPlugin.swift

@@ -6,6 +6,8 @@ private let keyURL = "url"
 private let keyOption = "safariVCOption"
 
 public class CustomTabsPlugin: NSObject, FlutterPlugin {
+    private var dismissStack = [() -> Void]()
+
     public static func register(with registrar: FlutterPluginRegistrar) {
         let channel = FlutterMethodChannel(
             name: "plugins.flutter.droibit.github.io/custom_tabs",
@@ -22,6 +24,8 @@ public class CustomTabsPlugin: NSObject, FlutterPlugin {
             let url = arguments[keyURL] as! String
             let option = arguments[keyOption] as! [String: Any]
             present(withURL: url, option: option, result: result)
+        case "closeAllIfPossible":
+            dismissAllIfPossible(result: result)
         default:
             result(FlutterMethodNotImplemented)
         }
@@ -31,6 +35,9 @@ public class CustomTabsPlugin: NSObject, FlutterPlugin {
         if #available(iOS 9.0, *) {
             if let topViewController = UIWindow.keyWindow?.topViewController() {
                 let safariViewController = SFSafariViewController.make(url: URL(string: url)!, option: option)
+                dismissStack.append({ [weak safariViewController] in
+                    safariViewController?.dismiss(animated: true)
+                })
                 topViewController.present(safariViewController, animated: true) {
                     result(nil)
                 }
@@ -39,6 +46,17 @@ public class CustomTabsPlugin: NSObject, FlutterPlugin {
             result(FlutterMethodNotImplemented)
         }
     }
+
+    private func dismissAllIfPossible(result: @escaping FlutterResult) {
+        if #available(iOS 9.0, *) {
+            while let task = dismissStack.popLast() {
+                task()
+            }
+            result(nil)
+        } else {
+            result(FlutterMethodNotImplemented)
+        }
+    }
 }
 
 private extension UIWindow {

Diff for: flutter_custom_tabs/lib/src/launcher.dart

@@ -91,3 +91,7 @@ void _applyStatusBarBrightnessTemporally(
         previousAutomaticSystemUiAdjustment;
   }
 }
+
+Future<void> closeAllIfPossible() async {
+  await CustomTabsPlatform.instance.closeAllIfPossible();
+}

Diff for: flutter_custom_tabs/pubspec.yaml

@@ -10,8 +10,17 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_custom_tabs_platform_interface: ^1.0.1
-  flutter_custom_tabs_web: ^1.0.0
+  flutter_custom_tabs_platform_interface:
+    git:
+      url: https://github.com/snkrdunk/flutter_custom_tabs.git
+      ref: develop
+      path: flutter_custom_tabs_platform_interface
+  flutter_custom_tabs_web:
+    git:
+      url: https://github.com/snkrdunk/flutter_custom_tabs.git
+      ref: develop
+      path: flutter_custom_tabs_web
+
   meta: ^1.3.0
 
 dev_dependencies:

Diff for: flutter_custom_tabs/test/launcher_test.dart

@@ -159,6 +159,14 @@ void main() {
     await launchResult;
     expect(binding.renderView.automaticSystemUiAdjustment, isTrue);
   });
+
+  test('closeAllIfPossible', () async {
+    when(mock.closeAllIfPossible()).thenAnswer((_) async => null);
+
+    await closeAllIfPossible();
+
+    verify(mock.closeAllIfPossible());
+  });
 }
 
 class _MockCustomTabsPlatform extends Mock
@@ -182,4 +190,15 @@ class _MockCustomTabsPlatform extends Mock
       returnValue: Future.value(null),
     );
   }
+
+  @override
+  Future<void> closeAllIfPossible() async {
+    return super.noSuchMethod(
+      Invocation.method(
+        #closeAllIfPossible,
+        {},
+      ),
+      returnValue: Future.value(null),
+    );
+  }
 }

Diff for: flutter_custom_tabs_platform_interface/lib/src/custom_tabs_platform.dart

@@ -37,4 +37,9 @@ abstract class CustomTabsPlatform extends PlatformInterface {
   }) {
     throw UnimplementedError('launch() has not been implemented.');
   }
+
+  /// Close all the launched implementation by platform if possible.
+  Future<void> closeAllIfPossible() {
+    throw UnimplementedError('closeAllIfPossible() has not been implemented.');
+  }
 }

Diff for: flutter_custom_tabs_platform_interface/lib/src/method_channel_custom_tabs.dart

@@ -22,4 +22,9 @@ class MethodChannelCustomTabs extends CustomTabsPlatform {
     };
     return _channel.invokeMethod('launch', args);
   }
+
+  @override
+  Future<void> closeAllIfPossible() {
+    return _channel.invokeMethod('closeAllIfPossible');
+  }
 }

Diff for: flutter_custom_tabs_platform_interface/test/src/method_channel_custom_tabs_test.dart

@@ -57,4 +57,14 @@ void main() {
       ],
     );
   });
+
+  test('closeAllIfPossible invoke method "closeAllIfPossible"', () async {
+    await customTabs.closeAllIfPossible();
+    expect(
+      log,
+      <Matcher>[
+        isMethodCall('closeAllIfPossible', arguments: null),
+      ],
+    );
+  });
 }

Diff for: flutter_custom_tabs_web/lib/flutter_custom_tabs_web.dart

@@ -23,4 +23,7 @@ class CustomTabsPlugin extends CustomTabsPlatform {
     final plugin = UrlLauncherPlatform.instance as UrlLauncherPlugin;
     return plugin.launch(urlString).then((_) => null);
   }
+
+  @override
+  Future<void> closeAllIfPossible() {}
 }

Diff for: flutter_custom_tabs_web/pubspec.yaml

@@ -12,7 +12,11 @@ dependencies:
     sdk: flutter
   flutter_web_plugins:
     sdk: flutter
-  flutter_custom_tabs_platform_interface: ^1.0.0
+  flutter_custom_tabs_platform_interface:
+    git:
+      url: https://github.com/snkrdunk/flutter_custom_tabs.git
+      ref: develop
+      path: flutter_custom_tabs_platform_interface
   meta: ^1.3.0
   url_launcher_web: ^2.0.1
   url_launcher_platform_interface: ^2.0.3