refactor: simplify app navigation

amwebexpert · Aug 27, 2023 · 3c1f5ae · 3c1f5ae
1 parent 218bd24
commit 3c1f5ae
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/libs/assets/app.json b/libs/assets/app.json
@@ -2,5 +2,5 @@
   "name": "Open Mindset",
   "description": "A native app powered by Python to help keep an open mindset",
   "version": "1.2.0",
-  "version_date": "2023-08-26"
+  "version_date": "2023-08-27"
 }
diff --git a/libs/main_app.kv b/libs/main_app.kv
@@ -14,6 +14,7 @@
         md_bg_color: app.theme_cls.primary_color
         pos_hint: {"top": 1}
         nav_drawer: nav_drawer
+        screen_manager: screen_manager
 
     MDNavigationLayout:
         MDScreenManager:

diff --git a/libs/main_app.py b/libs/main_app.py
@@ -31,7 +31,6 @@ class MainApp(MDApp, App):
     def __init__(self, **kwargs) -> None:
         super().__init__(**kwargs)
         self.service = PreferencesService()
-        self.screen_manager = None
         self.app_navigation_bar = None
         init_screen()
 
@@ -59,9 +58,7 @@ def init_theme(self) -> None:
             Preferences.THEME_PRIMARY_COLOR.name, default_value=PRIMARY_COLORS[0])
 
     def init_app_navigation(self, app_screen: AppScreen) -> None:
-        self.screen_manager = app_screen.ids['screen_manager']
         self.app_navigation_bar = app_screen.ids['app_navigation_bar']
-        self.app_navigation_bar.screen_manager = self.screen_manager
         self.app_navigation_bar.navigate_to("home")
 
     def on_start(self) -> None:

diff --git a/libs/utils/screen_utils.py b/libs/utils/screen_utils.py
@@ -37,11 +37,11 @@ def is_screen_sm() -> bool:
 def is_mobile_simulation() -> bool:
     return "MOBILE_SIMULATION" in os.environ
 
+def get_navigation_bar() -> AppNavigationBar:
+    return MDApp.get_running_app().app_navigation_bar
+
 def get_screen_manager() -> MDScreenManager:
-    return MDApp.get_running_app().screen_manager
+    return get_navigation_bar().screen_manager
 
 def get_screen(screen_name: str) -> MDScreen:
     return get_screen_manager().get_screen(screen_name)
-
-def get_navigation_bar() -> AppNavigationBar:
-    return MDApp.get_running_app().app_navigation_bar