Delegate creation of IconData to extensions

Author: FeodorFitsner

packages/flet/lib/src/controls/icon_button.dart

@@ -125,7 +125,7 @@ class _IconButtonControlState extends State<IconButtonControl>
       Widget? iconWidget;
       if (icon is Control) {
         iconWidget = ControlWidget(control: icon);
-      } else if (icon is String) {
+      } else if (icon is int) {
         iconWidget = Icon(
           widget.control.getIconData("icon"),
           color: iconColor,
@@ -138,7 +138,7 @@ class _IconButtonControlState extends State<IconButtonControl>
 
       if (selectedIcon is Control) {
         selectedIconWidget = ControlWidget(control: selectedIcon);
-      } else if (selectedIcon is String) {
+      } else if (selectedIcon is int) {
         selectedIconWidget = Icon(
           widget.control.getIconData("selected_icon"),
           color: selectedIconColor,

packages/flet/lib/src/controls/navigation_drawer.dart

@@ -68,14 +68,14 @@ class _NavigationDrawerControlState extends State<NavigationDrawerControl> {
                 ? ControlWidget(
                     control: icon,
                   )
-                : Icon(parseIconData(icon)),
+                : Icon(parseIconData(icon, widget.control.backend)),
             label: Text(dest.getString("label", "")!),
             selectedIcon: selectedIcon is Control
                 ? ControlWidget(
                     control: selectedIcon,
                   )
                 : selectedIcon is int
-                    ? Icon(parseIconData(selectedIcon))
+                    ? Icon(parseIconData(selectedIcon, widget.control.backend))
                     : null,
           );
         } else {

packages/flet/lib/src/extensions/control.dart

@@ -50,7 +50,7 @@ extension WidgetFromControl on Control {
       if (c == null) return null;
       c.notifyParent = notifyParent;
       return ControlWidget(key: key, control: c);
-    } else if (icon is String) {
+    } else if (icon is int) {
       return Icon(getIconData(propertyName), color: color);
     }
     return null;

packages/flet/lib/src/flet_core_extension.dart

@@ -370,6 +370,26 @@ class FletCoreExtension extends FletExtension {
     }
   }
 
+  @override
+  IconData? createIconData(iconCode) {
+    int setId = (iconCode >> 16) & 0xFF;
+    int codePoint = iconCode & 0xFFFF;
+    String? fontFamily;
+    String? fontPackage;
+
+    if (setId == 1) {
+      fontFamily = "MaterialIcons";
+    } else if (setId == 2) {
+      fontFamily = "CupertinoIcons";
+      fontPackage = "cupertino_icons";
+    } else {
+      return null;
+    }
+
+    return IconData(codePoint,
+        fontFamily: fontFamily, fontPackage: fontPackage);
+  }
+
   @override
   void ensureInitialized() {}
 }

packages/flet/lib/src/flet_extension.dart

@@ -4,6 +4,8 @@ import 'flet_service.dart';
 import 'models/control.dart';
 
 abstract class FletExtension {
+  void ensureInitialized() {}
+
   Widget? createWidget(Key? key, Control control) {
     return null;
   }
@@ -12,5 +14,7 @@ abstract class FletExtension {
     return null;
   }
 
-  void ensureInitialized() {}
+  IconData? createIconData(int iconCode) {
+    return null;
+  }
 }

packages/flet/lib/src/services/tester.dart

@@ -62,7 +62,7 @@ class TesterService extends FletService {
 
       case "find_by_icon":
         var iconCode = args["icon"];
-        var icon = parseIconData(iconCode);
+        var icon = parseIconData(iconCode, control.backend);
         if (icon == null) {
           throw Exception("Icon not found: $iconCode");
         }

packages/flet/lib/src/utils/icons.dart

@@ -1,46 +1,44 @@
 import 'package:flutter/material.dart';
 
+import '../flet_backend.dart';
 import '../models/control.dart';
 import 'material_state.dart';
 
-IconData? parseIconData(int? value, [IconData? defaultValue]) {
+IconData? parseIconData(int? value, FletBackend backend,
+    [IconData? defaultValue]) {
   if (value == null) return defaultValue;
 
-  int setId = (value >> 16) & 0xFF;
-  int codePoint = value & 0xFFFF;
-  String? fontFamily;
-  String? fontPackage;
-
-  if (setId == 1) {
-    fontFamily = "MaterialIcons";
-  } else if (setId == 2) {
-    fontFamily = "CupertinoIcons";
-    fontPackage = "cupertino_icons";
+  for (var extension in backend.extensions) {
+    var iconData = extension.createIconData(value);
+    if (iconData != null) {
+      return iconData;
+    }
   }
 
-  return IconData(codePoint, fontFamily: fontFamily, fontPackage: fontPackage);
+  return null;
 }
 
 WidgetStateProperty<Icon?>? parseWidgetStateIcon(
   dynamic value,
+  FletBackend backend,
   ThemeData theme, {
   Icon? defaultIcon,
   WidgetStateProperty<Icon?>? defaultValue,
 }) {
   if (value == null) return defaultValue;
   return getWidgetStateProperty<Icon?>(
-      value, (jv) => Icon(parseIconData(jv as int)), defaultIcon);
+      value, (jv) => Icon(parseIconData(jv as int, backend)), defaultIcon);
 }
 
 extension IconParsers on Control {
   IconData? getIconData(String propertyName, [IconData? defaultValue]) {
-    return parseIconData(get(propertyName), defaultValue);
+    return parseIconData(get(propertyName), backend, defaultValue);
   }
 
   WidgetStateProperty<Icon?>? getWidgetStateIcon(
       String propertyName, ThemeData theme,
       {Icon? defaultIcon, WidgetStateProperty<Icon?>? defaultValue}) {
-    return parseWidgetStateIcon(get(propertyName), theme,
+    return parseWidgetStateIcon(get(propertyName), backend, theme,
         defaultIcon: defaultIcon, defaultValue: defaultValue);
   }
 }

packages/flet/lib/src/utils/theme.dart

@@ -5,6 +5,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import '../flet_backend.dart';
 import '../models/control.dart';
 import '../utils/transforms.dart';
 import 'alignment.dart';
@@ -159,7 +160,7 @@ ThemeData parseTheme(
     checkboxTheme: parseCheckboxTheme(value?["checkbox_theme"], theme),
     radioTheme: parseRadioTheme(value?["radio_theme"], theme),
     badgeTheme: parseBadgeTheme(value?["badge_theme"], theme),
-    switchTheme: parseSwitchTheme(value?["switch_theme"], theme),
+    switchTheme: parseSwitchTheme(value?["switch_theme"], theme, context),
     dividerTheme: parseDividerTheme(value?["divider_theme"], theme),
     snackBarTheme: parseSnackBarTheme(value?["snackbar_theme"], theme),
     bannerTheme: parseBannerTheme(value?["banner_theme"], theme),
@@ -192,8 +193,8 @@ ThemeData parseTheme(
     filledButtonTheme:
         parseFilledButtonTheme(value?["filled_button_theme"], theme),
     iconButtonTheme: parseIconButtonTheme(value?["icon_button_theme"], theme),
-    segmentedButtonTheme:
-        parseSegmentedButtonTheme(value?["segmented_button_theme"], theme),
+    segmentedButtonTheme: parseSegmentedButtonTheme(
+        value?["segmented_button_theme"], theme, context),
     iconTheme: parseIconTheme(value?["icon_theme"], theme),
     timePickerTheme: parseTimePickerTheme(value?["time_picker_theme"], theme),
   );
@@ -659,7 +660,8 @@ BadgeThemeData? parseBadgeTheme(Map<dynamic, dynamic>? value, ThemeData theme,
   );
 }
 
-SwitchThemeData? parseSwitchTheme(Map<dynamic, dynamic>? value, ThemeData theme,
+SwitchThemeData? parseSwitchTheme(
+    Map<dynamic, dynamic>? value, ThemeData theme, BuildContext context,
     [SwitchThemeData? defaultValue]) {
   if (value == null) return defaultValue;
 
@@ -668,7 +670,8 @@ SwitchThemeData? parseSwitchTheme(Map<dynamic, dynamic>? value, ThemeData theme,
     trackColor: parseWidgetStateColor(value["track_color"], theme),
     overlayColor: parseWidgetStateColor(value["overlay_color"], theme),
     splashRadius: parseDouble(value["splash_radius"]),
-    thumbIcon: parseWidgetStateIcon(value["thumb_icon"], theme),
+    thumbIcon: parseWidgetStateIcon(
+        value["thumb_icon"], FletBackend.of(context), theme),
     trackOutlineColor:
         parseWidgetStateColor(value["track_outline_color"], theme),
     trackOutlineWidth: parseWidgetStateDouble(value["track_outline_width"]),
@@ -1087,10 +1090,11 @@ NavigationBarThemeData? parseNavigationBarTheme(
 }
 
 SegmentedButtonThemeData? parseSegmentedButtonTheme(
-    Map<dynamic, dynamic>? value, ThemeData theme,
+    Map<dynamic, dynamic>? value, ThemeData theme, BuildContext context,
     [SegmentedButtonThemeData? defaultValue]) {
   if (value == null) return defaultValue;
-  var selectedIcon = parseIconData(value["selected_icon"]);
+  var selectedIcon =
+      parseIconData(value["selected_icon"], FletBackend.of(context));
 
   return theme.segmentedButtonTheme.copyWith(
     selectedIcon: selectedIcon != null ? Icon(selectedIcon) : null,
@@ -1388,9 +1392,10 @@ extension ThemeParsers on Control {
     return parseBadgeTheme(get(propertyName), theme, defaultValue);
   }
 
-  SwitchThemeData? getSwitchTheme(String propertyName, ThemeData theme,
+  SwitchThemeData? getSwitchTheme(
+      String propertyName, ThemeData theme, BuildContext context,
       [SwitchThemeData? defaultValue]) {
-    return parseSwitchTheme(get(propertyName), theme, defaultValue);
+    return parseSwitchTheme(get(propertyName), theme, context, defaultValue);
   }
 
   DividerThemeData? getDividerTheme(String propertyName, ThemeData theme,
@@ -1479,9 +1484,10 @@ extension ThemeParsers on Control {
   }
 
   SegmentedButtonThemeData? getSegmentedButtonTheme(
-      String propertyName, ThemeData theme,
+      String propertyName, ThemeData theme, BuildContext context,
       [SegmentedButtonThemeData? defaultValue]) {
-    return parseSegmentedButtonTheme(get(propertyName), theme, defaultValue);
+    return parseSegmentedButtonTheme(
+        get(propertyName), theme, context, defaultValue);
   }
 
   IconThemeData? getIconTheme(String propertyName, ThemeData theme,

sdk/python/packages/flet/integration_tests/test_finders.py

@@ -1,7 +1,8 @@
 import apps.finders as app
+import pytest
+
 import flet as ft
 import flet.testing as ftt
-import pytest
 
 
 @pytest.mark.parametrize(