Refactor platform handling in CLI commands

Replaces 'package_platform' and 'config_platform' with 'require_android_sdk' for device and emulator commands, simplifying platform checks. Updates desktop support logic to use system platform detection instead of config_platform. This improves clarity and maintainability of platform-specific initialization.

Author: FeodorFitsner

sdk/python/packages/flet-cli/src/flet_cli/commands/build_base.py

@@ -48,6 +48,8 @@ def __init__(self, parser: argparse.ArgumentParser) -> None:
         self.rel_out_dir = None
         self.assets_path = None
         self.target_platform = None
+        self.package_platform = None
+        self.config_platform = None
         self.flutter_dependencies = {}
         self.package_app_path = None
         self.template_data = None
@@ -600,6 +602,7 @@ def initialize_command(self):
 
         self.package_platform = self.platforms[self.target_platform]["package_platform"]
         self.config_platform = self.platforms[self.target_platform]["config_platform"]
+        self.require_android_sdk = self.package_platform == "Android"
 
         super().initialize_command()
 

sdk/python/packages/flet-cli/src/flet_cli/commands/devices.py

@@ -71,8 +71,7 @@ def handle(self, options: argparse.Namespace) -> None:
             self.cleanup(0)
 
     def initialize_command(self):
-        self.package_platform = ""
-        self.config_platform = ""
+        self.require_android_sdk = True
 
         super().initialize_command()
 

sdk/python/packages/flet-cli/src/flet_cli/commands/emulators.py

@@ -82,8 +82,7 @@ def handle(self, options: argparse.Namespace) -> None:
             self._list_emulators()
 
     def initialize_command(self):
-        self.package_platform = ""
-        self.config_platform = ""
+        self.require_android_sdk = True
 
         super().initialize_command()
 

sdk/python/packages/flet-cli/src/flet_cli/commands/flutter_base.py

@@ -50,8 +50,7 @@ def __init__(self, parser: argparse.ArgumentParser) -> None:
         self.dart_exe = None
         self.flutter_exe = None
         self.verbose = False
-        self.package_platform = None
-        self.config_platform = None
+        self.require_android_sdk = False
         self.skip_flutter_doctor = get_bool_env_var("FLET_CLI_SKIP_FLUTTER_DOCTOR")
         self.no_rich_output = no_rich_output
         self.current_platform = platform.system()
@@ -113,7 +112,7 @@ def initialize_command(self):
             console.log("Flutter executable:", self.flutter_exe, style=verbose2_style)
             console.log("Dart executable:", self.dart_exe, style=verbose2_style)
 
-        if self.package_platform == "Android":
+        if self.require_android_sdk:
             self.install_jdk()
             self.install_android_sdk()
 
@@ -160,7 +159,10 @@ def install_flutter(self):
         self.env["PATH"] = os.pathsep.join([os.path.join(flutter_dir, "bin"), path_env])
 
         # desktop mode
-        if self.config_platform in ["macos", "windows", "linux"]:
+        desktop_platform = platform.system().lower()
+        if desktop_platform == "darwin":
+            desktop_platform = "macos"
+        if desktop_platform in ["macos", "windows", "linux"]:
             if self.verbose > 0:
                 console.log(
                     "Ensure Flutter has desktop support enabled",
@@ -172,7 +174,7 @@ def install_flutter(self):
                     "config",
                     "--no-version-check",
                     "--suppress-analytics",
-                    f"--enable-{self.config_platform}-desktop",
+                    f"--enable-{desktop_platform}-desktop",
                 ],
                 cwd=os.getcwd(),
                 capture_output=self.verbose < 1,