flet-easy 0.3.0.dev4__tar.gz → 0.3.0.dev6__tar.gz

{flet_easy-0.3.0.dev4 → flet_easy-0.3.0.dev6}/PKG-INFO

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

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

@@ -382,9 +382,6 @@ class Datasy:
                 if index is not None:
                     self.view.navigation_bar.selected_index = index
 
-                if len(self.history_routes) == 0:
-                    self.page.views.clear()
-
                 self.__go(route)
             else:
                 print("-> I can't go back! there is no history. ")

{flet_easy-0.3.0.dev4 → flet_easy-0.3.0.dev6}/src/flet_easy/route.py

@@ -39,6 +39,8 @@ class FletEasyX:
         self._pages = deque()
         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
@@ -76,6 +78,8 @@ class FletEasyX:
             self.__pagesy = None
 
     def __view_pop(self, e: ViewPopEvent):
+        if self.__close_pop_route:
+            self.__page.views.clear()
         self._data.go_back()()
 
     async def __on_keyboard(self, e: KeyboardEvent):
@@ -123,13 +127,17 @@ class FletEasyX:
         """Add the `View` configuration, to reuse on every page."""
         self._data.view = self.__check_async(self._view_data, self._data, result=True)
 
+        if self._data.view:
+            self.__automatically_imply_leading = getattr(
+                self._data.view.appbar, "automatically_imply_leading", True
+            )
+
         if self.__route_login is not None:
             self._data._create_login()
 
     def _add_configuration_start(self, page: Page):
         """Add general settings to the pages."""
         self.__page = page
-        self.__page.views.clear()
         self.__config_datasy()
 
         """ Add view configuration """
@@ -165,6 +173,8 @@ class FletEasyX:
         """Add a new page and update it."""
 
         # To make the page change faster.
+        self.__manage_dynamic_appbar(route)
+
         if len(self.__page.views) > 1:
             self.__page.views.pop()
 
@@ -201,6 +211,24 @@ class FletEasyX:
             for middleware in pagesy._middlewares_request:
                 self.__check_async(middleware.after_request)
 
+    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
+
+            if self.__automatically_imply_leading:
+                appbar = getattr(self._data.view, "appbar", None)
+
+                if appbar:
+                    appbar.automatically_imply_leading = True
+
     def __reload_datasy(
         self,
         pagesy: Pagesy,

{flet_easy-0.3.0.dev4 → flet_easy-0.3.0.dev6}/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.dev2"]
+dependencies = ["flet", "flet-easy==0.3.0.dev5"]
 
 [[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.dev4 → flet_easy-0.3.0.dev6}/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,
@@ -28,10 +28,10 @@ def config_view(data: fs.Datasy):
     def change_color(e: ft.ControlEvent):
         colors = [ft.Colors.RED, ft.Colors.GREEN, ft.Colors.BLUE, ft.Colors.YELLOW]
         appbar.bgcolor = random.choice(colors)
-        # e.control.parent.bgcolor = random.choice(colors)
         data.page.update()
 
     appbar = ft.AppBar(
+        # automatically_imply_leading=False,
         bgcolor=ft.Colors.BLACK45,
         actions=[
             ft.IconButton(
@@ -133,6 +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(
+        appbar,
+        func_update=lambda e: setattr(e, "automatically_imply_leading", False),
+    ) """
 
     return ft.View(
         controls=[

{flet_easy-0.3.0.dev4 → flet_easy-0.3.0.dev6}/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,
@@ -28,10 +28,10 @@ def config_view(data: fs.Datasy):
     def change_color(e: ft.ControlEvent):
         colors = [ft.Colors.RED, ft.Colors.GREEN, ft.Colors.BLUE, ft.Colors.YELLOW]
         appbar.bgcolor = random.choice(colors)
-        # e.control.parent.bgcolor = random.choice(colors)
         data.page.update()
 
     appbar = ft.AppBar(
+        # automatically_imply_leading=False,
         bgcolor=ft.Colors.BLACK45,
         actions=[
             ft.IconButton(
@@ -90,10 +90,7 @@ def index_page(data: fs.Datasy):
     page = data.page
     appbar = data.view.appbar
 
-    async def update_title(e: ft.AppBar):
-        e.title = ft.Text("Test 1")
-
-    data.dynamic_control(appbar, update_title)
+    appbar.title = ft.Text("Test 1")
 
     return ft.View(
         controls=[
@@ -132,7 +129,8 @@ async def test2_page(data: fs.Datasy):
     page = data.page
     appbar = data.view.appbar
 
-    data.dynamic_control(appbar, func_update=lambda e: setattr(e, "title", ft.Text("Test 3")))
+    appbar.title = ft.Text("Test 3")
+    # appbar.automatically_imply_leading = False
 
     return ft.View(
         controls=[

{flet_easy-0.3.0.dev4 → flet_easy-0.3.0.dev6}/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.dev3",
+    "flet-easy[jwt]==0.3.0.dev4",
     "sqlmodel==0.0.24",
 ]
 

{flet_easy-0.3.0.dev4 → flet_easy-0.3.0.dev6}/tests/flet-app/src/components/login.py

@@ -27,8 +27,8 @@ class Login(ft.Container):
                     prefix_icon=ft.Icons.TIMER,
                     helper_text="Seconds to logout automatically",
                 ),
-                ft.FilledButton("Login", on_click=self.login.check),
                 ft.TextButton("Register", on_click=data.go("/register")),
+                ft.FilledButton("Login", on_click=self.login.check),
             ],
             horizontal_alignment="center",
         )

{flet_easy-0.3.0.dev4 → flet_easy-0.3.0.dev6}/tests/flet-app/src/views/index.py

@@ -33,6 +33,7 @@ index = fs.AddPagesy(
 @index.page(route="/home", title="Flet-Easy")
 async def index_page(data: fs.Datasy):
     view = data.view
+    view.appbar.automatically_imply_leading = True
     return ft.View(
         controls=[
             ft.Text("Home page"),

{flet_easy-0.3.0.dev4 → flet_easy-0.3.0.dev6}/tests/v3.py

@@ -16,9 +16,7 @@ def view_append(page: ft.Page):
             ft.View(
                 "/",
                 [
-                    ft.AppBar(
-                        title=ft.Text(f"Flet app- {get_key(page)}"), bgcolor=ft.Colors.SURFACE
-                    ),
+                    ft.AppBar(title=ft.Text(f"Flet app- {get_key(page)}"), bgcolor=ft.Colors.RED),
                     # ft.AppBar(
                     #    title=ft.Text(f"Flet app- {page.run_task(get_key, page).result(5)}"),
                     #    bgcolor=ft.Colors.SURFACE,
@@ -35,7 +33,11 @@ def view_append(page: ft.Page):
             ft.View(
                 "/store",
                 [
-                    ft.AppBar(title=ft.Text("Store"), bgcolor=ft.Colors.SURFACE),
+                    ft.AppBar(
+                        automatically_imply_leading=False,
+                        title=ft.Text("Store"),
+                        bgcolor=ft.Colors.RED,
+                    ),
                     ft.ElevatedButton(
                         "Go Home", on_click=lambda _: page.go("/", skip_route_change_event=True)
                     ),
@@ -46,16 +48,19 @@ def view_append(page: ft.Page):
 
 async def main(page: ft.Page):
     page.title = "Routes Example"
+    page.views.clear()
 
     def route_change(route):
-        page.views.clear()
+        # page.views.clear()
         # = asyncio.get_event_loop()
         view_append(page)
 
         page.update()
 
     def view_pop(view):
+        # page.views.clear()
         page.views.pop()
+        print("views", page.views)
         top_view = page.views[-1]
         page.go(top_view.route)