Add bringAppToFront param to popUpContextMenu method

Author: lijy91

packages/tray_manager/example/analysis_options.yaml

@@ -1 +1 @@
-include: package:mostly_reasonable_lints/flutter.yaml
+include: package:mostly_reasonable_lints/analysis_options.yaml

packages/tray_manager/example/lib/pages/home.dart

@@ -260,7 +260,7 @@ class _HomePageState extends State<HomePage> with TrayListener {
               trailing: Row(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-                  Text('Should bring app to foreground'),
+                  const Text('Should bring app to foreground'),
                   Switch(
                     value: bringToForeground,
                     onChanged: (value) {
@@ -270,8 +270,9 @@ class _HomePageState extends State<HomePage> with TrayListener {
                 ],
               ),
               onTap: () async {
-                await trayManager
-                    .popUpContextMenu(shouldForegroundOnContextMenu.value);
+                await trayManager.popUpContextMenu(
+                  bringAppToFront: shouldForegroundOnContextMenu.value,
+                );
               },
             );
           },
@@ -309,7 +310,9 @@ class _HomePageState extends State<HomePage> with TrayListener {
     if (kDebugMode) {
       print('onTrayIconMouseDown');
     }
-    trayManager.popUpContextMenu(shouldForegroundOnContextMenu.value);
+    trayManager.popUpContextMenu(
+      bringAppToFront: shouldForegroundOnContextMenu.value,
+    );
   }
 
   @override

packages/tray_manager/example/pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  mostly_reasonable_lints: ^0.1.1
+  mostly_reasonable_lints: ^0.1.2
 
 flutter:
   uses-material-design: true

packages/tray_manager/lib/src/tray_manager.dart

@@ -183,23 +183,12 @@ class TrayManager {
     await _channel.invokeMethod('setContextMenu', arguments);
   }
 
-  /// Pops up the context menu of the tray icon and can foreground the app if `true` is passed as an argument.
-  Future<void> popUpContextMenu([bool bringAppToForeground = false]) async {
-    if (bringAppToForeground) {
-      _popUpContextMenuAndForegroundApp();
-    } else {
-      _popUpContextMenuAndNotForegroundApp();
-    }
-  }
-
-  // Pops up the context menu of the tray icon and do not bring app to the foreground.
-  Future<void> _popUpContextMenuAndNotForegroundApp() async {
-    await _channel.invokeMethod('popUpContextMenuAndNotForegroundApp');
-  }
-
-  // Pops up the context menu of the tray icon and bring the app to the foreground.
-  Future<void> _popUpContextMenuAndForegroundApp() async {
-    await _channel.invokeMethod('popUpContextMenuAndForegroundApp');
+  /// Pops up the context menu of the tray icon.
+  Future<void> popUpContextMenu({bool bringAppToFront = false}) async {
+    final Map<String, dynamic> arguments = {
+      'bringAppToFront': bringAppToFront,
+    };
+    await _channel.invokeMethod('popUpContextMenu', arguments);
   }
 
   /// The bounds of this tray icon.

packages/tray_manager/windows/tray_manager_plugin.cpp

@@ -76,8 +76,7 @@ class TrayManagerPlugin : public flutter::Plugin {
       std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result);
   void TrayManagerPlugin::PopUpContextMenu(
       const flutter::MethodCall<flutter::EncodableValue>& method_call,
-      std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result,
-      bool bringAppToFront);
+      std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result);
   void TrayManagerPlugin::GetBounds(
       const flutter::MethodCall<flutter::EncodableValue>& method_call,
       std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result);
@@ -286,8 +285,13 @@ void TrayManagerPlugin::SetContextMenu(
 
 void TrayManagerPlugin::PopUpContextMenu(
     const flutter::MethodCall<flutter::EncodableValue>& method_call,
-    std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result,
-    bool bringAppToFront) {
+    std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {
+  const flutter::EncodableMap& args =
+      std::get<flutter::EncodableMap>(*method_call.arguments());
+
+  bool bringAppToFront =
+      std::get<bool>(args.at(flutter::EncodableValue("bringAppToFront")));
+
   HWND hWnd = GetMainWindow();
 
   double x, y;
@@ -354,12 +358,8 @@ void TrayManagerPlugin::HandleMethodCall(
     SetToolTip(method_call, std::move(result));
   } else if (method_call.method_name().compare("setContextMenu") == 0) {
     SetContextMenu(method_call, std::move(result));
-  } else if (method_call.method_name().compare(
-                 "popUpContextMenuAndNotForegroundApp") == 0) {
-    PopUpContextMenu(method_call, std::move(result), false);
-  } else if (method_call.method_name().compare(
-                 "popUpContextMenuAndForegroundApp") == 0) {
-    PopUpContextMenu(method_call, std::move(result), true);
+  } else if (method_call.method_name().compare("popUpContextMenu") == 0) {
+    PopUpContextMenu(method_call, std::move(result));
   } else if (method_call.method_name().compare("getBounds") == 0) {
     GetBounds(method_call, std::move(result));
   } else {