From e94762b85c58c6a275e50918fa8f91c9407ac3ee Mon Sep 17 00:00:00 2001 From: CustomIcon Date: Sun, 21 Apr 2024 07:52:10 +0000 Subject: [PATCH] This commit fixes #1 and brings other improvements --- apps/apps.py | 58 +++++- modules/home.py | 170 +++++++++++------- modules/settings/appSettings/__init__.py | 4 +- .../settings/appSettings/dhiraagu_settings.py | 3 +- .../settings/appSettings/medianet_settings.py | 3 +- modules/settings/appSettings/mwsc_settings.py | 3 +- .../settings/appSettings/ooredoo_settings.py | 3 +- .../settings/appSettings/stelco_settings.py | 3 +- 8 files changed, 167 insertions(+), 80 deletions(-) diff --git a/apps/apps.py b/apps/apps.py index a481158..a83a714 100644 --- a/apps/apps.py +++ b/apps/apps.py @@ -68,7 +68,9 @@ def Apps(page: ft.Page): height=60, border_radius=10, ink=True, - on_click=None, + on_click=lambda _: page.go( + '/apps/dhiraagu', + ), ), ft.Container( content=ft.Text( @@ -95,7 +97,9 @@ def Apps(page: ft.Page): height=60, border_radius=10, ink=True, - on_click=None, + on_click=lambda _: page.go( + '/apps/dhiraagu', + ), ), ft.Container( content=ft.Text( @@ -122,7 +126,9 @@ def Apps(page: ft.Page): height=60, border_radius=10, ink=True, - on_click=None, + on_click=lambda _: page.go( + '/apps/dhiraagu', + ), ), ft.Container( content=ft.Text( @@ -149,7 +155,9 @@ def Apps(page: ft.Page): height=60, border_radius=10, ink=True, - on_click=None, + on_click=lambda _: page.go( + '/apps/dhiraagu', + ), ), ft.Container( content=ft.Text( @@ -217,7 +225,9 @@ def Apps(page: ft.Page): height=60, border_radius=10, ink=True, - on_click=None, + on_click=lambda _: page.go( + '/apps/dhiraagu', + ), ), ft.Container( content=ft.Text( @@ -244,7 +254,9 @@ def Apps(page: ft.Page): height=60, border_radius=10, ink=True, - on_click=None, + on_click=lambda _: page.go( + '/apps/dhiraagu', + ), ), ft.Container( content=ft.Text( @@ -271,7 +283,9 @@ def Apps(page: ft.Page): height=60, border_radius=10, ink=True, - on_click=None, + on_click=lambda _: page.go( + '/apps/dhiraagu', + ), ), ft.Container( content=ft.Text( @@ -298,7 +312,9 @@ def Apps(page: ft.Page): height=60, border_radius=10, ink=True, - on_click=None, + on_click=lambda _: page.go( + '/apps/dhiraagu', + ), ), ft.Container( content=ft.Text( @@ -390,6 +406,32 @@ def Apps(page: ft.Page): ), ), ) + if not AppRow.controls: + AppRow.controls.append( + ft.Container( + content=ft.Card( + content=ft.Container( + content=ft.Container( + ft.Text( + 'Add a module from settings to see shortcuts here.', + text_align=ft.TextAlign.CENTER, + ), + ), + padding=10, + on_click=None, + ), + ), + ), + ) + if not appList.content.controls: + appList.content.controls.append( + ft.Text( + 'Add a module from settings to see shortcuts here.', + text_align=ft.TextAlign.CENTER, + ), + ) + appList.alignment = ft.alignment.center + appList.expand = True return AppView( '/apps', [ diff --git a/modules/home.py b/modules/home.py index 359caf1..375e703 100644 --- a/modules/home.py +++ b/modules/home.py @@ -43,69 +43,119 @@ def Home(page: ft.Page): border_radius=10, content=ft.Row( [ - ft.Container( - content=ft.Icon( - ft.icons.APPS, - color=ft.colors.WHITE, - ), - margin=10, - padding=10, - alignment=ft.alignment.center, - bgcolor=ft.colors.GREY_700, - width=60, - height=60, - border_radius=10, - ink=True, - on_click=lambda _: page.go('/apps'), + ft.Column( + controls=[ + ft.Container( + content=ft.Icon( + ft.icons.APPS, + color=ft.colors.WHITE, + ), + margin=10, + padding=10, + alignment=ft.alignment.center, + bgcolor=ft.colors.GREY_700, + width=60, + height=60, + border_radius=10, + ink=True, + on_click=lambda _: page.go('/apps'), + ), + ft.Container( + content=ft.Text( + 'Apps', + text_align=ft.TextAlign.CENTER, + ), + alignment=ft.alignment.center, + width=80, + ), + ], ), - ft.Container( - content=ft.Icon( - ft.icons.HISTORY, - color=ft.colors.WHITE, - ), - margin=10, - padding=10, - alignment=ft.alignment.center, - bgcolor=ft.colors.GREY_700, - width=60, - height=60, - border_radius=10, - ink=True, - on_click=lambda e: print( - 'Clickable with Ink clicked!', - ), + ft.Column( + controls=[ + ft.Container( + content=ft.Icon( + ft.icons.HISTORY, + color=ft.colors.WHITE, + ), + margin=10, + padding=10, + alignment=ft.alignment.center, + bgcolor=ft.colors.GREY_700, + width=60, + height=60, + border_radius=10, + ink=True, + on_click=lambda e: print( + 'Clickable with Ink clicked!', + ), + ), + ft.Container( + content=ft.Text( + 'History', + text_align=ft.TextAlign.CENTER, + ), + alignment=ft.alignment.center, + width=80, + ), + ], ), - ft.Container( - content=ft.Icon( - ft.icons.LIST, - color=ft.colors.WHITE, - ), - margin=10, - padding=10, - alignment=ft.alignment.center, - bgcolor=ft.colors.GREY_700, - width=60, - height=60, - border_radius=10, - ink=True, - on_click=lambda e: print( - 'Clickable with Ink clicked!', - ), + ft.Column( + controls=[ + ft.Container( + content=ft.Icon( + ft.icons.LIST, + color=ft.colors.WHITE, + ), + margin=10, + padding=10, + alignment=ft.alignment.center, + bgcolor=ft.colors.GREY_700, + width=60, + height=60, + border_radius=10, + ink=True, + on_click=lambda e: print( + 'Clickable with Ink clicked!', + ), + ), + ft.Container( + content=ft.Text( + 'Misc.', + text_align=ft.TextAlign.CENTER, + ), + alignment=ft.alignment.center, + width=80, + ), + ], ), - ft.Container( - content=ft.Icon( - ft.icons.SETTINGS, - color=ft.colors.WHITE, - ), - margin=10, - padding=10, - alignment=ft.alignment.center, - bgcolor=ft.colors.GREY_700, - width=60, - height=60, - border_radius=10, - ink=True, - on_click=lambda _: page.go('/settings'), + ft.Column( + controls=[ + ft.Container( + content=ft.Icon( + ft.icons.SETTINGS, + color=ft.colors.WHITE, + ), + margin=10, + padding=10, + alignment=ft.alignment.center, + bgcolor=ft.colors.GREY_700, + width=60, + height=60, + border_radius=10, + ink=True, + on_click=lambda _: page.go( + '/settings', + ), + ), + ft.Container( + content=ft.Text( + 'Settings', + text_align=ft.TextAlign.CENTER, + ), + alignment=ft.alignment.center, + width=80, + ), + ], ), ], alignment=ft.MainAxisAlignment.CENTER, diff --git a/modules/settings/appSettings/__init__.py b/modules/settings/appSettings/__init__.py index 3990ae2..2db9fe3 100644 --- a/modules/settings/appSettings/__init__.py +++ b/modules/settings/appSettings/__init__.py @@ -9,5 +9,5 @@ __all__ = [ 'MedianetSettings', 'MwscSettings', 'OoredooSettings', - 'StelcoSettings' -] \ No newline at end of file + 'StelcoSettings', +] diff --git a/modules/settings/appSettings/dhiraagu_settings.py b/modules/settings/appSettings/dhiraagu_settings.py index 475e3b4..588f4ae 100644 --- a/modules/settings/appSettings/dhiraagu_settings.py +++ b/modules/settings/appSettings/dhiraagu_settings.py @@ -17,7 +17,6 @@ def Settings(page: ft.Page): config.save('apps', 'dhiraagu', '1') page.update() - generalSettings = ft.Container( content=ft.Column( controls=[ @@ -27,7 +26,7 @@ def Settings(page: ft.Page): ft.Switch( label=' Enable this module', on_change=_on_enable_change, - value=False + value=False, ), ), padding=10, diff --git a/modules/settings/appSettings/medianet_settings.py b/modules/settings/appSettings/medianet_settings.py index eb9ba70..d52e451 100644 --- a/modules/settings/appSettings/medianet_settings.py +++ b/modules/settings/appSettings/medianet_settings.py @@ -17,7 +17,6 @@ def Settings(page: ft.Page): config.save('apps', 'medianet', '1') page.update() - generalSettings = ft.Container( content=ft.Column( controls=[ @@ -27,7 +26,7 @@ def Settings(page: ft.Page): ft.Switch( label=' Enable this module', on_change=_on_enable_change, - value=False + value=False, ), ), padding=10, diff --git a/modules/settings/appSettings/mwsc_settings.py b/modules/settings/appSettings/mwsc_settings.py index 3f4dd64..b576a82 100644 --- a/modules/settings/appSettings/mwsc_settings.py +++ b/modules/settings/appSettings/mwsc_settings.py @@ -17,7 +17,6 @@ def Settings(page: ft.Page): config.save('apps', 'mwsc', '1') page.update() - generalSettings = ft.Container( content=ft.Column( controls=[ @@ -27,7 +26,7 @@ def Settings(page: ft.Page): ft.Switch( label=' Enable this module', on_change=_on_enable_change, - value=False + value=False, ), ), padding=10, diff --git a/modules/settings/appSettings/ooredoo_settings.py b/modules/settings/appSettings/ooredoo_settings.py index 4bdbe05..3c0f624 100644 --- a/modules/settings/appSettings/ooredoo_settings.py +++ b/modules/settings/appSettings/ooredoo_settings.py @@ -17,7 +17,6 @@ def Settings(page: ft.Page): config.save('apps', 'ooredoo', '1') page.update() - generalSettings = ft.Container( content=ft.Column( controls=[ @@ -27,7 +26,7 @@ def Settings(page: ft.Page): ft.Switch( label=' Enable this module', on_change=_on_enable_change, - value=False + value=False, ), ), padding=10, diff --git a/modules/settings/appSettings/stelco_settings.py b/modules/settings/appSettings/stelco_settings.py index 12eb94f..8bd7f5b 100644 --- a/modules/settings/appSettings/stelco_settings.py +++ b/modules/settings/appSettings/stelco_settings.py @@ -17,7 +17,6 @@ def Settings(page: ft.Page): config.save('apps', 'stelco', '1') page.update() - generalSettings = ft.Container( content=ft.Column( controls=[ @@ -27,7 +26,7 @@ def Settings(page: ft.Page): ft.Switch( label=' Enable this module', on_change=_on_enable_change, - value=False + value=False, ), ), padding=10,