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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-easy
-Version: 0.3.0.dev5
+Version: 0.3.0.dev7
 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.dev5 → flet_easy-0.3.0.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flet-easy"
-version = "0.3.0.dev5"
+version = "0.3.0.dev7"
 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.dev5 → flet_easy-0.3.0.dev7}/src/flet_easy/route.py

@@ -1,7 +1,7 @@
 import re
 from collections import deque
 from inspect import iscoroutinefunction
-from re import Pattern, compile, escape
+from re import M, Pattern, compile, escape
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 from flet import ControlEvent, KeyboardEvent, Page, RouteChangeEvent, View, ViewPopEvent
@@ -40,6 +40,7 @@ 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
@@ -77,6 +78,11 @@ 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):
@@ -211,17 +217,20 @@ 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
             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
 
-        elif self.__automatically_imply_leading:
-            appbar = getattr(self._data.view, "appbar", None)
+            if self.__automatically_imply_leading:
+                appbar = getattr(self._data.view, "appbar", None)
 
-            if appbar:
-                appbar.automatically_imply_leading = True
+                if appbar:
+                    appbar.automatically_imply_leading = True
 
     def __reload_datasy(
         self,

{flet_easy-0.3.0.dev5 → flet_easy-0.3.0.dev7}/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.dev4"]
+dependencies = ["flet", "flet-easy==0.3.0.dev6"]
 
 [[project.authors]]
 name = "Daxexs"
@@ -18,7 +18,7 @@ BUILD_VERSION = "0.1.0"
 
 
 [tool.flet.app]
-module = "witch-main"
+module = "without-main"
 path = "."
 #exclude = ["assets"]
 

{flet_easy-0.3.0.dev5 → flet_easy-0.3.0.dev7}/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,
@@ -133,10 +133,10 @@ async def test2_page(data: fs.Datasy):
     appbar = data.view.appbar
 
     data.dynamic_control(appbar, func_update=lambda e: setattr(e, "title", ft.Text("Test 3")))
-    data.dynamic_control(
+    """ data.dynamic_control(
         appbar,
         func_update=lambda e: setattr(e, "automatically_imply_leading", False),
-    )
+    ) """
 
     return ft.View(
         controls=[

{flet_easy-0.3.0.dev5 → flet_easy-0.3.0.dev7}/tests/cache-pages/without-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,