Fix flet linting and directory structure

environment/configuration/requirements.txt

@@ -2,3 +2,4 @@ docopt
 matplotlib
 networkx[default]
 pyside6>=6.6
+flet==0.22.*

pyproject.toml

@@ -5,7 +5,7 @@ sections = "FUTURE,STDLIB,THIRDPARTY,AP,FIRSTPARTY,LOCALFOLDER"
 profile = "black"
 
 [tool.pylint]
-disable = "C0103, C0114, C0115, C0116, C0302, E0401, W0212, W0511, R0801"
+disable = "C0103, C0114, C0115, C0116, C0302, E0401, W0212, W0511, R0801, R0903, R0917"
 extension-pkg-allow-list = [
     "matplotlib",
     "PySide6",

source/package/adaptation_pathways/app/assets/fonts/Open_Sans/OFL.txt → source/package/pathways_app/assets/fonts/Open_Sans/OFL.txt

@@ -18,7 +18,7 @@ with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
 redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
+fonts, including any derivative works, can be bundled, embedded,
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
 however, cannot be released under any other type of license. The

source/package/pathways_app/controls/__init__.py

@@ -0,0 +1,3 @@
+"""
+Customized Flet controls
+"""

source/package/adaptation_pathways/app/controls/header.py → source/package/pathways_app/controls/header.py

@@ -1,28 +1,30 @@
+# pylint: disable=too-many-arguments
 import flet as ft
 import theme
 
+
 class Header(ft.Container):
     def __init__(
-        self, 
-        icon=None, 
-        text="", 
-        size=16, 
+        self,
+        icon=None,
+        text="",
+        size=16,
         expand=True,
         color=theme.colors.primary_dark,
-        padding=0, 
-        border_radius=0, 
+        padding=0,
+        border_radius=0,
         border: ft.Border | None = None,
-        bgcolor:str | None = None
+        bgcolor: str | None = None,
     ):
         super().__init__(
-            height=(size + 2*padding),
+            height=(size + 2 * padding),
             padding=padding,
             expand=expand,
             bgcolor=bgcolor,
             border_radius=border_radius,
-            border=border
+            border=border,
         )
-        
+
         header_text_style = ft.TextStyle(
             size=size,
             height=1,
@@ -35,16 +37,12 @@ def __init__(
                 expand=expand,
                 controls=[
                     ft.Image(icon, width=size, height=size, color=color),
-                    ft.Text(text, style=header_text_style)
-                ], 
-                spacing=4,            
-                vertical_alignment=ft.CrossAxisAlignment.CENTER
+                    ft.Text(text, style=header_text_style),
+                ],
+                spacing=4,
+                vertical_alignment=ft.CrossAxisAlignment.CENTER,
             )
         else:
-            self.content=ft.Row(
-                expand=True,
-                controls=[
-                    ft.Text(text, style=header_text_style)
-                ]
+            self.content = ft.Row(
+                expand=True, controls=[ft.Text(text, style=header_text_style)]
             )
-

source/package/adaptation_pathways/app/controls/panel.py → source/package/pathways_app/controls/panel.py

@@ -1,15 +1,16 @@
 import flet as ft
 import theme
 
+
 class Panel(ft.Container):
     def __init__(self, content=None):
         super().__init__(
-            expand=True,             
+            expand=True,
             margin=0,
-            padding=ft.padding.symmetric(8,8),
+            padding=ft.padding.symmetric(8, 8),
             bgcolor=theme.colors.primary_white,
-            border = ft.border.all(1, theme.colors.primary_light),
-            border_radius = theme.variables.small_radius,
+            border=ft.border.all(1, theme.colors.primary_light),
+            border_radius=theme.variables.small_radius,
             content=content,
         )
         # [
@@ -25,5 +26,5 @@ def __init__(self, content=None):
         #         right=0,
         #         top=0,
         #         bottom=0
-        #     ) 
+        #     )
         # ]

source/package/adaptation_pathways/app/controls/tabbed_panel.py → source/package/pathways_app/controls/tabbed_panel.py

@@ -1,34 +1,34 @@
 import flet as ft
 import theme
-import logging
 from controls.header import Header
 
+
 class TabbedPanel(ft.Column):
     selected_index: int = 0
     tab_buttons: list[ft.TextButton]
     content: ft.Container
 
-    def __init__(self, tabs: list[tuple[Header,ft.Control]], selected_index: int):
+    def __init__(self, tabs: list[tuple[Header, ft.Control]], selected_index: int):
         def get_tab_bgcolor(index: int):
-            return theme.colors.primary_white if self.selected_index == index else theme.colors.primary_lighter
+            if self.selected_index == index:
+                return theme.colors.primary_white
+            return theme.colors.primary_lighter
 
         def on_click(e):
-            self.selected_index=self.tab_buttons.index(e.control)
+            self.selected_index = self.tab_buttons.index(e.control)
             for [index, tab] in enumerate(self.tab_buttons):
-                tab.content.bgcolor=get_tab_bgcolor(index)
+                tab.content.bgcolor = get_tab_bgcolor(index)
                 tab.content.update()
-            self.content.content=tabs[self.selected_index][1]
-            self.content.content.update()      
+            self.content.content = tabs[self.selected_index][1]
+            self.content.content.update()
 
         super().__init__(
-            expand=True,
-            spacing=0,
-            horizontal_alignment=ft.CrossAxisAlignment.STRETCH
+            expand=True, spacing=0, horizontal_alignment=ft.CrossAxisAlignment.STRETCH
         )
 
-        self.selected_index=selected_index
+        self.selected_index = selected_index
 
-        self.tab_buttons=[
+        self.tab_buttons = [
             ft.TextButton(
                 expand=True,
                 content=ft.Container(
@@ -37,21 +37,22 @@ def on_click(e):
                     padding=10,
                     bgcolor=get_tab_bgcolor(index),
                     border_radius=ft.border_radius.only(
-                        top_left=theme.variables.small_radius, 
+                        top_left=theme.variables.small_radius,
                         top_right=theme.variables.small_radius,
                     ),
-                    border = ft.border.only(
+                    border=ft.border.only(
                         left=ft.BorderSide(1, theme.colors.primary_light),
                         right=ft.BorderSide(1, theme.colors.primary_light),
                         top=ft.BorderSide(1, theme.colors.primary_light),
                     ),
                 ),
                 style=ft.ButtonStyle(
-                    padding=0, 
+                    padding=0,
                     shape=ft.RoundedRectangleBorder(0),
                 ),
                 on_click=on_click,
-            ) for [index, tab] in enumerate(tabs)
+            )
+            for [index, tab] in enumerate(tabs)
         ]
 
         self.content = ft.Container(
@@ -66,7 +67,7 @@ def on_click(e):
             ),
             border_radius=ft.border_radius.only(
                 bottom_left=theme.variables.small_radius,
-                bottom_right=theme.variables.small_radius
+                bottom_right=theme.variables.small_radius,
             ),
         )
 
@@ -77,4 +78,3 @@ def on_click(e):
             ),
             self.content,
         ]
-