Billpay/app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This commit fixes #1 and brings other improvements

Browse Source
This commit is contained in:
Aman Ahmed Zahir 2024-04-21 07:52:10 +00:00
parent 887dfcc088
commit e94762b85c
8 changed files with 167 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
apps/apps.py
View File

@ -68,7 +68,9 @@ def Apps(page: ft.Page):
height=60, height=60,
border_radius=10, border_radius=10,
ink=True, ink=True,
on_click=None, on_click=lambda _: page.go(
'/apps/dhiraagu',
),
), ),
ft.Container( ft.Container(
content=ft.Text( content=ft.Text(
@ -95,7 +97,9 @@ def Apps(page: ft.Page):
height=60, height=60,
border_radius=10, border_radius=10,
ink=True, ink=True,
on_click=None, on_click=lambda _: page.go(
'/apps/dhiraagu',
),
), ),
ft.Container( ft.Container(
content=ft.Text( content=ft.Text(
@ -122,7 +126,9 @@ def Apps(page: ft.Page):
height=60, height=60,
border_radius=10, border_radius=10,
ink=True, ink=True,
on_click=None, on_click=lambda _: page.go(
'/apps/dhiraagu',
),
), ),
ft.Container( ft.Container(
content=ft.Text( content=ft.Text(
@ -149,7 +155,9 @@ def Apps(page: ft.Page):
height=60, height=60,
border_radius=10, border_radius=10,
ink=True, ink=True,
on_click=None, on_click=lambda _: page.go(
'/apps/dhiraagu',
),
), ),
ft.Container( ft.Container(
content=ft.Text( content=ft.Text(
@ -217,7 +225,9 @@ def Apps(page: ft.Page):
height=60, height=60,
border_radius=10, border_radius=10,
ink=True, ink=True,
on_click=None, on_click=lambda _: page.go(
'/apps/dhiraagu',
),
), ),
ft.Container( ft.Container(
content=ft.Text( content=ft.Text(
@ -244,7 +254,9 @@ def Apps(page: ft.Page):
height=60, height=60,
border_radius=10, border_radius=10,
ink=True, ink=True,
on_click=None, on_click=lambda _: page.go(
'/apps/dhiraagu',
),
), ),
ft.Container( ft.Container(
content=ft.Text( content=ft.Text(
@ -271,7 +283,9 @@ def Apps(page: ft.Page):
height=60, height=60,
border_radius=10, border_radius=10,
ink=True, ink=True,
on_click=None, on_click=lambda _: page.go(
'/apps/dhiraagu',
),
), ),
ft.Container( ft.Container(
content=ft.Text( content=ft.Text(
@ -298,7 +312,9 @@ def Apps(page: ft.Page):
height=60, height=60,
border_radius=10, border_radius=10,
ink=True, ink=True,
on_click=None, on_click=lambda _: page.go(
'/apps/dhiraagu',
),
), ),
ft.Container( ft.Container(
content=ft.Text( 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( return AppView(
'/apps', '/apps',
[ [

52
modules/home.py
View File

@ -43,6 +43,8 @@ def Home(page: ft.Page):
border_radius=10, border_radius=10,
content=ft.Row( content=ft.Row(
[ [
ft.Column(
controls=[
ft.Container( ft.Container(
content=ft.Icon( content=ft.Icon(
ft.icons.APPS, ft.icons.APPS,
@ -58,6 +60,18 @@ def Home(page: ft.Page):
ink=True, ink=True,
on_click=lambda _: page.go('/apps'), on_click=lambda _: page.go('/apps'),
), ),
ft.Container(
content=ft.Text(
'Apps',
text_align=ft.TextAlign.CENTER,
),
alignment=ft.alignment.center,
width=80,
),
],
),
ft.Column(
controls=[
ft.Container( ft.Container(
content=ft.Icon( content=ft.Icon(
ft.icons.HISTORY, ft.icons.HISTORY,
@ -75,6 +89,18 @@ def Home(page: ft.Page):
'Clickable with Ink clicked!', 'Clickable with Ink clicked!',
), ),
), ),
ft.Container(
content=ft.Text(
'History',
text_align=ft.TextAlign.CENTER,
),
alignment=ft.alignment.center,
width=80,
),
],
),
ft.Column(
controls=[
ft.Container( ft.Container(
content=ft.Icon( content=ft.Icon(
ft.icons.LIST, ft.icons.LIST,
@ -92,6 +118,18 @@ def Home(page: ft.Page):
'Clickable with Ink clicked!', 'Clickable with Ink clicked!',
), ),
), ),
ft.Container(
content=ft.Text(
'Misc.',
text_align=ft.TextAlign.CENTER,
),
alignment=ft.alignment.center,
width=80,
),
],
),
ft.Column(
controls=[
ft.Container( ft.Container(
content=ft.Icon( content=ft.Icon(
ft.icons.SETTINGS, ft.icons.SETTINGS,
@ -105,7 +143,19 @@ def Home(page: ft.Page):
height=60, height=60,
border_radius=10, border_radius=10,
ink=True, ink=True,
on_click=lambda _: page.go('/settings'), 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, alignment=ft.MainAxisAlignment.CENTER,

2
modules/settings/appSettings/__init__.py
View File

@ -9,5 +9,5 @@ __all__ = [
'MedianetSettings', 'MedianetSettings',
'MwscSettings', 'MwscSettings',
'OoredooSettings', 'OoredooSettings',
'StelcoSettings' 'StelcoSettings',
] ]

3
modules/settings/appSettings/dhiraagu_settings.py
View File

@ -17,7 +17,6 @@ def Settings(page: ft.Page):
config.save('apps', 'dhiraagu', '1') config.save('apps', 'dhiraagu', '1')
page.update() page.update()
generalSettings = ft.Container( generalSettings = ft.Container(
content=ft.Column( content=ft.Column(
controls=[ controls=[
@ -27,7 +26,7 @@ def Settings(page: ft.Page):
ft.Switch( ft.Switch(
label=' Enable this module', label=' Enable this module',
on_change=_on_enable_change, on_change=_on_enable_change,
value=False value=False,
), ),
), ),
padding=10, padding=10,

3
modules/settings/appSettings/medianet_settings.py
View File

@ -17,7 +17,6 @@ def Settings(page: ft.Page):
config.save('apps', 'medianet', '1') config.save('apps', 'medianet', '1')
page.update() page.update()
generalSettings = ft.Container( generalSettings = ft.Container(
content=ft.Column( content=ft.Column(
controls=[ controls=[
@ -27,7 +26,7 @@ def Settings(page: ft.Page):
ft.Switch( ft.Switch(
label=' Enable this module', label=' Enable this module',
on_change=_on_enable_change, on_change=_on_enable_change,
value=False value=False,
), ),
), ),
padding=10, padding=10,

3
modules/settings/appSettings/mwsc_settings.py
View File

@ -17,7 +17,6 @@ def Settings(page: ft.Page):
config.save('apps', 'mwsc', '1') config.save('apps', 'mwsc', '1')
page.update() page.update()
generalSettings = ft.Container( generalSettings = ft.Container(
content=ft.Column( content=ft.Column(
controls=[ controls=[
@ -27,7 +26,7 @@ def Settings(page: ft.Page):
ft.Switch( ft.Switch(
label=' Enable this module', label=' Enable this module',
on_change=_on_enable_change, on_change=_on_enable_change,
value=False value=False,
), ),
), ),
padding=10, padding=10,

3
modules/settings/appSettings/ooredoo_settings.py
View File

@ -17,7 +17,6 @@ def Settings(page: ft.Page):
config.save('apps', 'ooredoo', '1') config.save('apps', 'ooredoo', '1')
page.update() page.update()
generalSettings = ft.Container( generalSettings = ft.Container(
content=ft.Column( content=ft.Column(
controls=[ controls=[
@ -27,7 +26,7 @@ def Settings(page: ft.Page):
ft.Switch( ft.Switch(
label=' Enable this module', label=' Enable this module',
on_change=_on_enable_change, on_change=_on_enable_change,
value=False value=False,
), ),
), ),
padding=10, padding=10,

3
modules/settings/appSettings/stelco_settings.py
View File

@ -17,7 +17,6 @@ def Settings(page: ft.Page):
config.save('apps', 'stelco', '1') config.save('apps', 'stelco', '1')
page.update() page.update()
generalSettings = ft.Container( generalSettings = ft.Container(
content=ft.Column( content=ft.Column(
controls=[ controls=[
@ -27,7 +26,7 @@ def Settings(page: ft.Page):
ft.Switch( ft.Switch(
label=' Enable this module', label=' Enable this module',
on_change=_on_enable_change, on_change=_on_enable_change,
value=False value=False,
), ),
), ),
padding=10, padding=10,