flet 0.70.0.dev6444__tar.gz → 0.70.0.dev6482__tar.gz

{flet-0.70.0.dev6444 → flet-0.70.0.dev6482}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet
-Version: 0.70.0.dev6444
+Version: 0.70.0.dev6482
 Summary: Flet for Python - easily build interactive multi-platform apps in Python
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0

{flet-0.70.0.dev6444 → flet-0.70.0.dev6482}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flet"
-version = "0.70.0.dev6444"
+version = "0.70.0.dev6482"
 description = "Flet for Python - easily build interactive multi-platform apps in Python"
 authors = [{name = "Appveyor Systems Inc.", email = "hello@flet.dev"}]
 license = "Apache-2.0"

{flet-0.70.0.dev6444 → flet-0.70.0.dev6482}/src/flet/components/observable.py

@@ -147,10 +147,9 @@ class Observable:
             object.__setattr__(self, name, value)
             return
         value = self._wrap_if_collection(name, value)
-        had = hasattr(self, name)
-        old = object.__getattribute__(self, name) if had else None
+        old = object.__getattribute__(self, name) if hasattr(self, name) else None
+        object.__setattr__(self, name, value)
         if not value_equal(old, value):
-            object.__setattr__(self, name, value)
             self._notify(name)
 
     def __delattr__(self, name: str):

{flet-0.70.0.dev6444 → flet-0.70.0.dev6482}/src/flet/controls/colors.py

@@ -55,13 +55,15 @@ import random
 from enum import Enum
 from typing import TYPE_CHECKING, Optional, Union
 
+from flet.utils.deprecated_enum import DeprecatedEnumMeta
+
 if TYPE_CHECKING:
     from flet.controls.types import ColorValue
 
 __all__ = ["Colors"]
 
 
-class Colors(str, Enum):
+class Colors(str, Enum, metaclass=DeprecatedEnumMeta):
     def __eq__(self, other):
         if isinstance(other, str):
             return self.value.lower() == other.lower()
@@ -198,12 +200,12 @@ class Colors(str, Enum):
     AMBER_ACCENT_400 = "amberaccent400"
     AMBER_ACCENT_700 = "amberaccent700"
     BLACK = "black"
-    BLACK12 = "black12"
-    BLACK26 = "black26"
-    BLACK38 = "black38"
-    BLACK45 = "black45"
-    BLACK54 = "black54"
-    BLACK87 = "black87"
+    BLACK_12 = "black12"
+    BLACK_26 = "black26"
+    BLACK_38 = "black38"
+    BLACK_45 = "black45"
+    BLACK_54 = "black54"
+    BLACK_87 = "black87"
     BLUE = "blue"
     BLUE_100 = "blue100"
     BLUE_200 = "blue200"
@@ -463,14 +465,14 @@ class Colors(str, Enum):
     TEAL_ACCENT_700 = "tealaccent700"
     TRANSPARENT = "transparent"
     WHITE = "white"
-    WHITE10 = "white10"
-    WHITE12 = "white12"
-    WHITE24 = "white24"
-    WHITE30 = "white30"
-    WHITE38 = "white38"
-    WHITE54 = "white54"
-    WHITE60 = "white60"
-    WHITE70 = "white70"
+    WHITE_10 = "white10"
+    WHITE_12 = "white12"
+    WHITE_24 = "white24"
+    WHITE_30 = "white30"
+    WHITE_38 = "white38"
+    WHITE_54 = "white54"
+    WHITE_60 = "white60"
+    WHITE_70 = "white70"
     YELLOW = "yellow"
     YELLOW_100 = "yellow100"
     YELLOW_200 = "yellow200"
@@ -487,3 +489,27 @@ class Colors(str, Enum):
     YELLOW_ACCENT_200 = "yellowaccent200"
     YELLOW_ACCENT_400 = "yellowaccent400"
     YELLOW_ACCENT_700 = "yellowaccent700"
+
+
+# TODO - remove in Flet 1.0
+_DEPRECATED_COLOR_ALIASES = {
+    "BLACK12": ("BLACK_12", "Use Colors.BLACK_12 instead."),
+    "BLACK26": ("BLACK_26", "Use Colors.BLACK_26 instead."),
+    "BLACK38": ("BLACK_38", "Use Colors.BLACK_38 instead."),
+    "BLACK45": ("BLACK_45", "Use Colors.BLACK_45 instead."),
+    "BLACK54": ("BLACK_54", "Use Colors.BLACK_54 instead."),
+    "BLACK87": ("BLACK_87", "Use Colors.BLACK_87 instead."),
+    "WHITE10": ("WHITE_10", "Use Colors.WHITE_10 instead."),
+    "WHITE12": ("WHITE_12", "Use Colors.WHITE_12 instead."),
+    "WHITE24": ("WHITE_24", "Use Colors.WHITE_24 instead."),
+    "WHITE30": ("WHITE_30", "Use Colors.WHITE_30 instead."),
+    "WHITE38": ("WHITE_38", "Use Colors.WHITE_38 instead."),
+    "WHITE54": ("WHITE_54", "Use Colors.WHITE_54 instead."),
+    "WHITE60": ("WHITE_60", "Use Colors.WHITE_60 instead."),
+    "WHITE70": ("WHITE_70", "Use Colors.WHITE_70 instead."),
+}
+
+Colors._deprecated_members_ = _DEPRECATED_COLOR_ALIASES
+
+for alias_name, (target_name, _) in _DEPRECATED_COLOR_ALIASES.items():
+    Colors._member_map_[alias_name] = getattr(Colors, target_name)

{flet-0.70.0.dev6444 → flet-0.70.0.dev6482}/src/flet/controls/material/bottom_app_bar.py

@@ -1,6 +1,7 @@
 from typing import Optional
 
 from flet.controls.base_control import control
+from flet.controls.border_radius import BorderRadiusValue
 from flet.controls.control import Control
 from flet.controls.layout_control import LayoutControl
 from flet.controls.padding import PaddingValue
@@ -23,12 +24,12 @@ class BottomAppBar(LayoutControl):
     ft.BottomAppBar(
         bgcolor=ft.Colors.SURFACE_CONTAINER_LOW,
         content=ft.Row(
+            alignment=ft.MainAxisAlignment.SPACE_AROUND,
             controls=[
                 ft.IconButton(ft.Icons.MENU),
                 ft.IconButton(ft.Icons.SEARCH),
                 ft.IconButton(ft.Icons.SETTINGS),
             ],
-            alignment=ft.MainAxisAlignment.SPACE_AROUND,
         ),
     )
     ```
@@ -43,31 +44,43 @@ class BottomAppBar(LayoutControl):
     """
     The fill color to use for this app bar.
 
-    Defaults to [`BottomAppBarTheme.bgcolor`][flet.], or if
-    that is `None`, falls back to [`ColorScheme.surface`][flet.].
+    If `None`, [`BottomAppBarTheme.bgcolor`][flet.] is used;
+    if that is also `None`, then defaults to [`ColorScheme.surface`][flet.].
     """
 
     shadow_color: Optional[ColorValue] = None
     """
     The color of the shadow below this app bar.
+
+    If `None`, [`BottomAppBarTheme.shadow_color`][flet.] is used;
+    if that is also `None`, then defaults to [`Colors.TRANSPARENT`][flet.].
     """
 
     padding: Optional[PaddingValue] = None
     """
     Empty space to inscribe inside a container decoration (background, border).
 
-    Defaults to [`BottomAppBarTheme.padding`][flet.], or if
-    that is `None`, falls back to `Padding.symmetric(vertical=12.0, horizontal=16.0)`.
+    If `None`, [`BottomAppBarTheme.padding`][flet.] is used;
+    if that is also `None`, then defaults to
+    `Padding.symmetric(vertical=12.0, horizontal=16.0)`.
     """
 
-    clip_behavior: ClipBehavior = ClipBehavior.NONE
+    clip_behavior: Optional[ClipBehavior] = None
     """
     Defines how the [`content`][(c).] of this app bar should be clipped.
+
+    If `None`, defaults to:
+    - [`ClipBehavior.ANTI_ALIAS`][flet.] if [`border_radius`][(c).]
+        is set and not equal to [`BorderRadius.all(0)`][flet.BorderRadius.all];
+    - Else [`ClipBehavior.NONE`][flet.].
     """
 
     shape: Optional[NotchShape] = None
     """
     The notch that is made for the floating action button.
+
+    If `None`, [`BottomAppBarTheme.shape`][flet.] is used;
+    if that is also `None`, then the shape will be rectangular with no notch.
     """
 
     notch_margin: Number = 4.0
@@ -75,15 +88,25 @@ class BottomAppBar(LayoutControl):
     The margin between the [`FloatingActionButton`][flet.] and this
     app bar's notch.
 
-    Can be visible only if [`shape`][(c).] is `None`.
+    Note:
+        Has effect only if [`shape`][(c).] is not `None`.
     """
 
     elevation: Optional[Number] = None
     """
-    This property controls the size of the shadow below this app bar.
+    The z-coordinate at which to place this bottom app bar relative to its
+    parent. It controls the size of the shadow below this app bar.
+
+    If `None`, [`BottomAppBarTheme.elevation`][flet.] is used;
+    if that is also `None`, then defaults to `3`.
 
     Raises:
-        ValueError: If [`elevation`][(c).] is negative.
+        ValueError: If it is less than `0`.
+    """
+
+    border_radius: Optional[BorderRadiusValue] = None
+    """
+    The border radius to apply when clipping and painting this app bar.
     """
 
     def before_update(self):

{flet-0.70.0.dev6444 → flet-0.70.0.dev6482}/src/flet/controls/material/floating_action_button.py

@@ -36,7 +36,7 @@ class FloatingActionButton(LayoutControl):
     The content of this button.
 
     Raises:
-        ValueError: If neither [`icon`][(c).] nor a valid [`content`][(c).]
+        ValueError: If neither [`icon`][(c).] nor a valid `content`
             (string or visible Control) is provided.
     """
 
@@ -95,7 +95,7 @@ class FloatingActionButton(LayoutControl):
     Defaults to `6`.
 
     Raises:
-        ValueError: If [`elevation`][(c).] is negative.
+        ValueError: If it is less than `0`.
     """
 
     disabled_elevation: Optional[Number] = None
@@ -105,7 +105,7 @@ class FloatingActionButton(LayoutControl):
     Defaults to the same value as `elevation`.
 
     Raises:
-        ValueError: If [`disabled_elevation`][(c).] is negative.
+        ValueError: If it is less than `0`.
     """
 
     focus_elevation: Optional[Number] = None
@@ -115,7 +115,7 @@ class FloatingActionButton(LayoutControl):
     Defaults to `8`.
 
     Raises:
-        ValueError: If [`focus_elevation`][(c).] is negative.
+        ValueError: If it is less than `0`.
     """
 
     highlight_elevation: Optional[Number] = None
@@ -125,7 +125,7 @@ class FloatingActionButton(LayoutControl):
     Defaults to `12`.
 
     Raises:
-        ValueError: If [`highlight_elevation`][(c).] is negative.
+        ValueError: If it is less than `0`.
     """
 
     hover_elevation: Optional[Number] = None
@@ -135,7 +135,7 @@ class FloatingActionButton(LayoutControl):
     Defaults to `8`.
 
     Raises:
-        ValueError: If [`hover_elevation`][(c).] is negative.
+        ValueError: If it is less than `0`.
     """
 
     hover_color: Optional[ColorValue] = None

{flet-0.70.0.dev6444 → flet-0.70.0.dev6482}/src/flet/utils/__init__.py

@@ -1,6 +1,7 @@
 from flet.utils.browser import open_in_browser
 from flet.utils.classproperty import classproperty
 from flet.utils.deprecated import deprecated, deprecated_class, deprecated_warning
+from flet.utils.deprecated_enum import DeprecatedEnumMeta
 from flet.utils.files import (
     cleanup_path,
     copy_tree,
@@ -35,27 +36,23 @@ from flet.utils.strings import random_string
 from flet.utils.vector import Vector
 
 __all__ = [
-    "open_in_browser",
+    "DeprecatedEnumMeta",
+    "Once",
+    "Vector",
+    "calculate_file_hash",
     "classproperty",
+    "cleanup_path",
+    "copy_tree",
     "deprecated",
     "deprecated_class",
     "deprecated_warning",
-    "cleanup_path",
-    "copy_tree",
-    "get_current_script_dir",
-    "is_within_directory",
-    "safe_tar_extractall",
-    "which",
     "from_dict",
-    "calculate_file_hash",
-    "sha1",
-    "to_json",
-    "get_free_tcp_port",
-    "get_local_ip",
-    "Once",
-    "patch_dataclass",
     "get_arch",
     "get_bool_env_var",
+    "get_current_script_dir",
+    "get_free_tcp_port",
+    "get_local_ip",
+    "get_param_count",
     "get_platform",
     "is_android",
     "is_asyncio",
@@ -67,8 +64,13 @@ __all__ = [
     "is_mobile",
     "is_pyodide",
     "is_windows",
-    "slugify",
+    "is_within_directory",
+    "open_in_browser",
+    "patch_dataclass",
     "random_string",
-    "Vector",
-    "get_param_count",
+    "safe_tar_extractall",
+    "sha1",
+    "slugify",
+    "to_json",
+    "which",
 ]

flet-0.70.0.dev6482/src/flet/utils/deprecated_enum.py

@@ -0,0 +1,40 @@
+from __future__ import annotations
+
+import warnings
+from enum import EnumMeta
+
+__all__ = ["DeprecatedEnumMeta"]
+
+
+class DeprecatedEnumMeta(EnumMeta):
+    """Enum metaclass that supports deprecation aliases.
+
+    Enums can declare `_deprecated_members_` as a mapping of alias name to a tuple
+    containing the canonical member name and a deprecation message. Accessing an alias
+    returns the canonical member while emitting a `DeprecationWarning`.
+    """
+
+    def _resolve_deprecated(cls, name: str):
+        deprecated = getattr(cls, "_deprecated_members_", {})
+        info = deprecated.get(name)
+        if not info:
+            return None
+        target_name, message = info
+        warnings.warn(
+            f"{cls.__name__}.{name} is deprecated. {message}",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return getattr(cls, target_name)
+
+    def __getattr__(cls, name: str):
+        member = cls._resolve_deprecated(name)
+        if member is not None:
+            return member
+        return super().__getattr__(name)
+
+    def __getitem__(cls, name: str):
+        member = cls._resolve_deprecated(name)
+        if member is not None:
+            return member
+        return super().__getitem__(name)

{flet-0.70.0.dev6444 → flet-0.70.0.dev6482}/src/flet/version.py

@@ -10,7 +10,7 @@ from flet.utils import is_mobile, is_windows, which
 DEFAULT_VERSION = "0.1.0"
 
 # will be replaced by CI
-version = "0.70.0.dev6444"
+version = "0.70.0.dev6482"
 
 
 def update_version():

{flet-0.70.0.dev6444 → flet-0.70.0.dev6482}/src/flet.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet
-Version: 0.70.0.dev6444
+Version: 0.70.0.dev6482
 Summary: Flet for Python - easily build interactive multi-platform apps in Python
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0

{flet-0.70.0.dev6444 → flet-0.70.0.dev6482}/src/flet.egg-info/SOURCES.txt

@@ -241,6 +241,7 @@ src/flet/utils/__init__.py
 src/flet/utils/browser.py
 src/flet/utils/classproperty.py
 src/flet/utils/deprecated.py
+src/flet/utils/deprecated_enum.py
 src/flet/utils/files.py
 src/flet/utils/from_dict.py
 src/flet/utils/hashing.py