IconValue renamed to IconData

Author: FeodorFitsner

.appveyor.yml

@@ -213,7 +213,7 @@ for:
 
       - cd client
       - set RELEASE_DIR=build\windows\x64\runner\Release
-      - flutter build windows --build-name=%APPVEYOR_BUILD_VERSION%
+      - flutter build windows --no-tree-shake-icons --build-name=%APPVEYOR_BUILD_VERSION%
 
       - copy "%WINDIR%\system32\msvcp140.dll" %RELEASE_DIR%
       - copy "%WINDIR%\system32\vcruntime140.dll" %RELEASE_DIR%
@@ -277,7 +277,7 @@ for:
     build_script:
       # Flutter macOS client
       - pushd client
-      - flutter build macos --build-name=$APPVEYOR_BUILD_VERSION
+      - flutter build macos --no-tree-shake-icons --build-name=$APPVEYOR_BUILD_VERSION
       - tar -czvf flet-macos.tar.gz -C build/macos/Build/Products/Release Flet.app
       - mkdir -p $flet_sdk_root/packages/flet-desktop/src/flet_desktop/app
       - cp flet-macos.tar.gz $flet_sdk_root/packages/flet-desktop/src/flet_desktop/app
@@ -357,7 +357,7 @@ for:
             patch_flet_desktop_package_name "flet-desktop-light"
             artifact_suffix="-light"
           fi
-      - flutter build linux --build-name=$APPVEYOR_BUILD_VERSION
+      - flutter build linux --no-tree-shake-icons --build-name=$APPVEYOR_BUILD_VERSION
       - mv build/linux/$build_arch/release/bundle build/linux/$build_arch/release/flet
       - tar -czvf flet-linux$artifact_suffix-$ARCH.tar.gz -C build/linux/$build_arch/release flet
       - mkdir -p $flet_sdk_root/packages/flet-desktop/src/flet_desktop/app
@@ -412,7 +412,7 @@ for:
     build_script:
       # Flutter Web client
       - pushd client
-      - flutter build web --wasm
+      - flutter build web --wasm --no-tree-shake-icons
       - cp -R build/web $flet_sdk_root/packages/flet-web/src/flet_web
       # fix on mobile Safari: https://github.com/flutter/flutter/issues/145111#issuecomment-2714599139
       - ls "$(dirname "$(command -v flutter)")/cache/flutter_web_sdk/flutter_js"

client/lib/main.dart

@@ -6,7 +6,7 @@ import 'package:flet_audio/flet_audio.dart' as flet_audio;
 import 'package:flet_audio_recorder/flet_audio_recorder.dart'
     as flet_audio_recorder;
 import 'package:flet_charts/flet_charts.dart' as flet_charts;
-import 'package:flet_datatable2/flet_datatable2.dart' as flet_datatable2;
+//import 'package:flet_datatable2/flet_datatable2.dart' as flet_datatable2;
 import "package:flet_flashlight/flet_flashlight.dart" as flet_flashlight;
 import 'package:flet_geolocator/flet_geolocator.dart' as flet_geolocator;
 import 'package:flet_lottie/flet_lottie.dart' as flet_lottie;
@@ -45,7 +45,7 @@ void main([List<String>? args]) async {
     flet_rive.Extension(),
     flet_webview.Extension(),
     flet_flashlight.Extension(),
-    flet_datatable2.Extension(),
+    //flet_datatable2.Extension(),
     flet_charts.Extension(),
   ];
 

client/pubspec.lock

@@ -161,14 +161,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
-  data_table_2:
-    dependency: transitive
-    description:
-      name: data_table_2
-      sha256: b8dd157e4efe5f2beef092c9952a254b2192cf76a26ad1c6aa8b06c8b9d665da
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.0"
   dbus:
     dependency: transitive
     description:
@@ -308,15 +300,6 @@ packages:
       url: "https://github.com/flet-dev/flet-charts.git"
     source: git
     version: "0.1.0"
-  flet_datatable2:
-    dependency: "direct main"
-    description:
-      path: "src/flutter/flet_datatable2"
-      ref: v1
-      resolved-ref: "98c2b38801ddc131e30d2082b4fc9271201384a8"
-      url: "https://github.com/flet-dev/flet-datatable2.git"
-    source: git
-    version: "0.1.0"
   flet_flashlight:
     dependency: "direct main"
     description:

client/pubspec.yaml

@@ -94,11 +94,11 @@ dependencies:
       url: https://github.com/flet-dev/flet-flashlight.git
       ref: v1
       path: src/flutter/flet_flashlight
-  flet_datatable2:
-    git:
-      url: https://github.com/flet-dev/flet-datatable2.git
-      ref: v1
-      path: src/flutter/flet_datatable2
+  # flet_datatable2:
+  #   git:
+  #     url: https://github.com/flet-dev/flet-datatable2.git
+  #     ref: v1
+  #     path: src/flutter/flet_datatable2
 
   flet_charts:
     git:

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

@@ -28,7 +28,7 @@ class CupertinoContextMenuActionControl extends StatelessWidget {
             Navigator.of(context).pop(); // Close the context menu
           }
         },
-        trailingIcon: control.getIcon("trailing_icon"),
+        trailingIcon: control.getIconData("trailing_icon"),
         child: content);
   }
 }

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

@@ -55,7 +55,7 @@ class _CupertinoNavigationBarControlState
           return BottomNavigationBarItem(
               tooltip: !dest.disabled ? dest.getString("tooltip") : null,
               backgroundColor: dest.getColor("bgcolor", context),
-              icon: dest.buildWidget("icon") ?? Icon(dest.getIcon("icon")),
+              icon: dest.buildWidget("icon") ?? Icon(dest.getIconData("icon")),
               activeIcon: dest.buildIconOrWidget("selected_icon"),
               label: dest.getString("label", "")!);
         }).toList());

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

@@ -28,9 +28,9 @@ class _DatePickerControlState extends State<DatePickerControl> {
     var value = widget.control.getDateTime("value");
     var currentDate = widget.control.getDateTime("current_date");
     var switchToCalendarEntryModeIcon =
-        widget.control.getIcon("switch_to_calendar_icon");
+        widget.control.getIconData("switch_to_calendar_icon");
     var switchToInputEntryModeIcon =
-        widget.control.getIcon("switch_to_input_icon");
+        widget.control.getIconData("switch_to_input_icon");
 
     void onClosed(DateTime? dateValue) {
       widget.control.updateProperties({"_open": false}, python: false);

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

@@ -20,7 +20,7 @@ class IconControl extends StatelessWidget {
     return ConstrainedControl(
         control: control,
         child: Icon(
-          control.getIcon("name"),
+          control.getIconData("name"),
           size: control.getDouble("size"),
           color: control.getColor("color", context),
           blendMode: control.getBlendMode("blend_mode"),

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

@@ -127,7 +127,7 @@ class _IconButtonControlState extends State<IconButtonControl>
         iconWidget = ControlWidget(control: icon);
       } else if (icon is String) {
         iconWidget = Icon(
-          widget.control.getIcon("icon"),
+          widget.control.getIconData("icon"),
           color: iconColor,
         );
       } else if (content != null) {
@@ -140,7 +140,7 @@ class _IconButtonControlState extends State<IconButtonControl>
         selectedIconWidget = ControlWidget(control: selectedIcon);
       } else if (selectedIcon is String) {
         selectedIconWidget = Icon(
-          widget.control.getIcon("selected_icon"),
+          widget.control.getIconData("selected_icon"),
           color: selectedIconColor,
         );
       }

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

@@ -15,11 +15,11 @@ class NavigationBarDestinationControl extends StatelessWidget {
   Widget build(BuildContext context) {
     debugPrint("NavigationBarDestination build: ${control.id}");
 
-    var selectedIcon = control.getIcon("selected_icon");
+    var selectedIcon = control.getIconData("selected_icon");
     var child = NavigationDestination(
         enabled: !control.disabled,
         tooltip: !control.disabled ? control.getString("tooltip") : null,
-        icon: control.buildWidget("icon") ?? Icon(control.getIcon("icon")),
+        icon: control.buildWidget("icon") ?? Icon(control.getIconData("icon")),
         selectedIcon: control.buildWidget("selected_icon") ??
             (selectedIcon != null ? Icon(selectedIcon) : null),
         label: control.getString("label", "")!);