flet-easy 0.3.0.dev7__tar.gz → 0.3.0.dev9__tar.gz

{flet_easy-0.3.0.dev7 → flet_easy-0.3.0.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-easy
-Version: 0.3.0.dev7
+Version: 0.3.0.dev9
 Summary: ⚡Flet-Easy is a user-friendly add-on package for Flet, offering a cleaner code structure with numerous customizable features like JWT, routers, decorators, middleware and more.
 Project-URL: Homepage, https://github.com/Daxexs
 Project-URL: Repository, https://github.com/Daxexs/flet-easy

{flet_easy-0.3.0.dev7 → flet_easy-0.3.0.dev9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flet-easy"
-version = "0.3.0.dev7"
+version = "0.3.0.dev9"
 description = "⚡Flet-Easy is a user-friendly add-on package for Flet, offering a cleaner code structure with numerous customizable features like JWT, routers, decorators, middleware and more."
 authors = [{ name = "Daxexs", email = "Daxexsdev@gmail.com" }]
 

{flet_easy-0.3.0.dev7 → flet_easy-0.3.0.dev9}/src/flet_easy/route.py

@@ -1,10 +1,18 @@
 import re
 from collections import deque
 from inspect import iscoroutinefunction
-from re import M, Pattern, compile, escape
+from re import Pattern, compile, escape
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
-from flet import ControlEvent, KeyboardEvent, Page, RouteChangeEvent, View, ViewPopEvent
+from flet import (
+    ControlEvent,
+    KeyboardEvent,
+    Page,
+    PagePlatform,
+    RouteChangeEvent,
+    View,
+    ViewPopEvent,
+)
 
 from flet_easy.datasy import Datasy
 from flet_easy.exceptions import LoginRequiredError, MidlewareError, RouteError
@@ -40,7 +48,6 @@ class FletEasyX:
         self.__history_pages: Dict[str, View] = {}
         self.__view_404 = page_404_fs
         self.__automatically_imply_leading = False
-        self.__close_pop_route = False
 
         self.__page: Page = None
         self._page_404: Pagesy = None
@@ -78,11 +85,6 @@ class FletEasyX:
             self.__pagesy = None
 
     def __view_pop(self, e: ViewPopEvent):
-        if self.__close_pop_route:
-            self.__page.views.remove(self.__page.views[0])
-        import flet as ft
-
-        self.__page.open(ft.SnackBar(ft.Text(self.__page.views)))
         self._data.go_back()()
 
     async def __on_keyboard(self, e: KeyboardEvent):
@@ -216,16 +218,23 @@ class FletEasyX:
 
     def __manage_dynamic_appbar(self, route: str) -> None:
         """Manage the appbar automatically_imply_leading parameter"""
+
         if route == self.__route_init:
-            self.__close_pop_route = True
+            if (
+                self.__page.web
+                or self.__page.pwa
+                or self.__page.platform == PagePlatform.ANDROID
+                or self.__page.platform == PagePlatform.IOS
+                or self.__page.platform == PagePlatform.ANDROID_TV
+            ):
+                self.__page.views.clear()
+
             self._data.history_routes.clear()
             appbar = getattr(self._data.view, "appbar", None)
 
             if appbar and getattr(appbar, "automatically_imply_leading", None):
                 appbar.automatically_imply_leading = False
         else:
-            self.__close_pop_route = False
-
             if self.__automatically_imply_leading:
                 appbar = getattr(self._data.view, "appbar", None)
 

{flet_easy-0.3.0.dev7 → flet_easy-0.3.0.dev9}/tests/cache-pages/pyproject.toml

@@ -2,7 +2,7 @@
 name = "flet-app"
 version = "0.1.0"
 license = "MIT"
-dependencies = ["flet", "flet-easy==0.3.0.dev6"]
+dependencies = ["flet", "flet-easy==0.3.0.dev8"]
 
 [[project.authors]]
 name = "Daxexs"

{flet_easy-0.3.0.dev7 → flet_easy-0.3.0.dev9}/tests/cache-pages/witch-main.py

@@ -14,7 +14,7 @@ def config(page: ft.Page):
     page.theme = ft.Theme(
         page_transitions=ft.PageTransitionsTheme(
             windows=ft.PageTransitionTheme.NONE,
-            #android=ft.PageTransitionTheme.NONE,
+            # android=ft.PageTransitionTheme.NONE,
             ios=ft.PageTransitionTheme.NONE,
             macos=ft.PageTransitionTheme.NONE,
             linux=ft.PageTransitionTheme.NONE,

{flet_easy-0.3.0.dev7 → flet_easy-0.3.0.dev9}/tests/cache-pages/without-main.py

@@ -32,6 +32,11 @@ def config_view(data: fs.Datasy):
 
     appbar = ft.AppBar(
         # automatically_imply_leading=False,
+        leading=ft.IconButton(
+            icon=ft.icons.ARROW_BACK_ROUNDED,
+            icon_color=ft.Colors.WHITE,
+            on_click=data.go_back(),
+        ),
         bgcolor=ft.Colors.BLACK45,
         actions=[
             ft.IconButton(
@@ -113,7 +118,7 @@ def test_page(data: fs.Datasy):
 
     return ft.View(
         controls=[
-            ft.Text("Counter 2 - (cache disabled)", size=50),
+            ft.Text("Counter 2 ", size=50),
             Counter(page.update, ft.Colors.BLUE),
         ],
         appbar=appbar,

{flet_easy-0.3.0.dev7 → flet_easy-0.3.0.dev9}/tests/flet-app/pyproject.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 license = "MIT"
 dependencies = [
     "flet==0.27.5",
-    "flet-easy[jwt]==0.3.0.dev4",
+    "flet-easy[jwt]",
     "sqlmodel==0.0.24",
 ]
 

{flet_easy-0.3.0.dev7 → flet_easy-0.3.0.dev9}/tests/flet-app/src/views/index.py

@@ -36,9 +36,20 @@ async def index_page(data: fs.Datasy):
     view.appbar.automatically_imply_leading = True
     return ft.View(
         controls=[
-            ft.Text("Home page"),
-            ft.FilledButton("Go keyboard", on_click=data.go("/counter/use-keyboard/10")),
-            Drawer(text="Show_drawer", drawer=view.drawer),
+            ft.Container(
+                bgcolor=ft.colors.GREEN_400,
+                padding=50,
+                content=ft.Column(
+                    controls=[
+                        ft.Text("Home page"),
+                        ft.FilledButton(
+                            "Go keyboard", on_click=data.go("/counter/use-keyboard/10")
+                        ),
+                        Drawer(text="Show_drawer", drawer=view.drawer),
+                    ],
+                    horizontal_alignment=ft.CrossAxisAlignment.CENTER,
+                ),
+            )
         ],
         vertical_alignment=ft.MainAxisAlignment.CENTER,
         horizontal_alignment=ft.CrossAxisAlignment.CENTER,

{flet_easy-0.3.0.dev7 → flet_easy-0.3.0.dev9}/tests/v3.py

@@ -25,6 +25,13 @@ def view_append(page: ft.Page):
                         "Visit Store",
                         on_click=lambda _: page.go(route="/store", skip_route_change_event=True),
                     ),
+                    ft.Text("1 Home"),
+                    ft.Container(
+                        content=ft.Text("1 This is a store page"),
+                        alignment=ft.alignment.center,
+                        padding=ft.padding.all(50),
+                        bgcolor=ft.colors.BLUE,
+                    ),
                 ],
             )
         )
@@ -41,6 +48,13 @@ def view_append(page: ft.Page):
                     ft.ElevatedButton(
                         "Go Home", on_click=lambda _: page.go("/", skip_route_change_event=True)
                     ),
+                    ft.Text("Store"),
+                    ft.Container(
+                        content=ft.Text("This is a store page"),
+                        alignment=ft.alignment.center,
+                        padding=ft.padding.all(50),
+                        bgcolor=ft.colors.RED,
+                    ),
                 ],
             )
         )
@@ -48,10 +62,19 @@ def view_append(page: ft.Page):
 
 async def main(page: ft.Page):
     page.title = "Routes Example"
+    page.theme = ft.Theme(
+        page_transitions=ft.PageTransitionsTheme(
+            windows=ft.PageTransitionTheme.NONE,
+            android=ft.PageTransitionTheme.NONE,
+            ios=ft.PageTransitionTheme.NONE,
+            macos=ft.PageTransitionTheme.NONE,
+            linux=ft.PageTransitionTheme.NONE,
+        ),
+    )
     page.views.clear()
 
     def route_change(route):
-        # page.views.clear()
+        page.views.clear()
         # = asyncio.get_event_loop()
         view_append(page)
 
@@ -59,7 +82,7 @@ async def main(page: ft.Page):
 
     def view_pop(view):
         # page.views.clear()
-        page.views.pop()
+        # page.views.pop()
         print("views", page.views)
         top_view = page.views[-1]
         page.go(top_view.route)

{flet_easy-0.3.0.dev7 → flet_easy-0.3.0.dev9}/uv.lock

@@ -481,7 +481,7 @@ wheels = [
 
 [[package]]
 name = "flet-easy"
-version = "0.3.0.dev4"
+version = "0.3.0.dev8"
 source = { editable = "." }
 
 [package.optional-dependencies]
@@ -735,6 +735,7 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a4/e9/07570eef5155efdea7602a5cca84bc406415928bdd109158df41236493a3/greenlet-3.2.1-cp39-cp39-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1a750f1046994b9e038b45ae237d68153c29a3a783075211fb1414a180c8324b", size = 579081, upload_time = "2025-04-22T14:26:01.22Z" },
     { url = "https://files.pythonhosted.org/packages/e0/a8/3d51ada057317e86e2b052fded6288030f6d1ca36de6077b352a72c32c70/greenlet-3.2.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:374ffebaa5fbd10919cd599e5cf8ee18bae70c11f9d61e73db79826c8c93d6f9", size = 1108305, upload_time = "2025-04-22T14:59:04.583Z" },
     { url = "https://files.pythonhosted.org/packages/c8/33/78745dfdceb4cf10fb831c33f5a4c2a1125026dfa1beac3a2df912c8ac61/greenlet-3.2.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8b89e5d44f55372efc6072f59ced5ed1efb7b44213dab5ad7e0caba0232c6545", size = 1132382, upload_time = "2025-04-22T14:28:15.723Z" },
+    { url = "https://files.pythonhosted.org/packages/19/8f/98a478e9285b82046d3167c30b4d04385bec441493c2155c18c701c5879b/greenlet-3.2.1-cp39-cp39-win32.whl", hash = "sha256:b7503d6b8bbdac6bbacf5a8c094f18eab7553481a1830975799042f26c9e101b", size = 277712, upload_time = "2025-04-22T15:09:57.479Z" },
     { url = "https://files.pythonhosted.org/packages/37/c2/eb1bc32182063e145a28678d73c79e6915c1c43c35abdb7baa2b31cf3aca/greenlet-3.2.1-cp39-cp39-win_amd64.whl", hash = "sha256:e98328b8b8f160925d6b1c5b1879d8e64f6bd8cf11472b7127d579da575b77d9", size = 294835, upload_time = "2025-04-22T15:06:06.809Z" },
 ]