feat!: Refactor Badge Control to a Dataclass; create new Control.badge property (#4077)

* Wrap control in _badge

* Update create_control.dart

* parseBadge function

* Update badge_util.dart

* Create badge_util.py

* Update badge_util.py

* String badge works

* renamed budge to badge_old

* renamed badge_util to badge

* renamed Badge to BadgeOld

* renamed Badgeutil to Badge

* Update badge.dart

* Update badge.py

* Update badge.dart

* offset

* alignment

* bgcolor

* large_size

* padding

* small_size and label

* text_color

* text_style

* cleanup

* badge property for controls

* added badge property to controls

also fixed tooltip for Semantics

* badge property for controls

* badge to NavigationDestination, NavigationDrawerDestination, NavigationRailDestination

* deleted old badge files

* removed badge from NavigationDestination, NavigationBarDestination, NavigationRailDestination

* Optional removed from BadgeValue

Author: InesaFitsner

client/pubspec.lock

@@ -1354,10 +1354,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.4"
+    version: "14.2.5"
   volume_controller:
     dependency: transitive
     description:

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

@@ -1,6 +1,7 @@
 import 'dart:math';
 
 import 'package:collection/collection.dart';
+import 'package:flet/src/utils/badge.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
@@ -19,7 +20,6 @@ import 'alert_dialog.dart';
 import 'animated_switcher.dart';
 import 'auto_complete.dart';
 import 'autofill_group.dart';
-import 'badge.dart';
 import 'banner.dart';
 import 'barchart.dart';
 import 'bottom_app_bar.dart';
@@ -261,14 +261,6 @@ Widget createWidget(
     case "divider":
       return DividerControl(
           key: key, parent: parent, control: controlView.control);
-    case "badge":
-      return BadgeControl(
-          key: key,
-          parent: parent,
-          control: controlView.control,
-          children: controlView.children,
-          parentDisabled: parentDisabled,
-          parentAdaptive: parentAdaptive);
     case "selectionarea":
       return SelectionAreaControl(
           key: key,
@@ -1026,21 +1018,24 @@ Widget baseControl(
 Widget constrainedControl(
     BuildContext context, Widget widget, Control? parent, Control control) {
   return _expandable(
-      _positionedControl(
-          context,
-          _aspectRatio(
-              _offsetControl(
-                  context,
-                  _scaledControl(
+      _badge(
+          _positionedControl(
+              context,
+              _aspectRatio(
+                  _offsetControl(
                       context,
-                      _rotatedControl(
+                      _scaledControl(
                           context,
-                          _sizedControl(
-                              _directionality(
-                                  _tooltip(
-                                      _opacity(
-                                          context, widget, parent, control),
-                                      Theme.of(context),
+                          _rotatedControl(
+                              context,
+                              _sizedControl(
+                                  _directionality(
+                                      _tooltip(
+                                          _opacity(
+                                              context, widget, parent, control),
+                                          Theme.of(context),
+                                          parent,
+                                          control),
                                       parent,
                                       control),
                                   parent,
@@ -1055,6 +1050,7 @@ Widget constrainedControl(
                   control),
               parent,
               control),
+          Theme.of(context),
           parent,
           control),
       parent,
@@ -1091,7 +1087,13 @@ Widget _opacity(
 Widget _tooltip(
     Widget widget, ThemeData theme, Control? parent, Control control) {
   var tooltip = parseTooltip(control, "tooltip", widget, theme);
-  return tooltip != null ? tooltip : widget;
+  return tooltip ?? widget;
+}
+
+Widget _badge(
+    Widget widget, ThemeData theme, Control? parent, Control control) {
+  var badge = parseBadge(control, "badge", widget, theme);
+  return badge ?? widget;
 }
 
 Widget _aspectRatio(Widget widget, Control? parent, Control control) {

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

@@ -0,0 +1,38 @@
+import 'dart:convert';
+
+import 'package:flet/flet.dart';
+import 'package:flutter/material.dart';
+
+Badge? parseBadge(
+    Control control, String propName, Widget widget, ThemeData theme) {
+  var v = control.attrString(propName, null);
+  if (v == null) {
+    return null;
+  }
+  final j = json.decode(v);
+  return badgeFromJSON(j, widget, theme);
+}
+
+Badge? badgeFromJSON(dynamic j, Widget widget, ThemeData theme) {
+  if (j == null) {
+    return null;
+  } else if (j is String) {
+    return Badge(label: Text(j), child: widget);
+  }
+
+  String? label = j["text"];
+
+  return Badge(
+    label: label != null ? Text(label) : null,
+    isLabelVisible: parseBool(j["label_visible"]) ?? true,
+    offset: offsetFromJson(j["offset"]),
+    alignment: alignmentFromJson(j["alignment"]),
+    backgroundColor: parseColor(theme, j["bgcolor"]),
+    largeSize: parseDouble(j["large_size"]),
+    padding: edgeInsetsFromJson(j["padding"]),
+    smallSize: parseDouble(j["small_size"]),
+    textColor: parseColor(theme, j["text_color"]),
+    textStyle: textStyleFromJson(theme, j["text_style"]),
+    child: widget,
+  );
+}