This commit fixes #1 and brings other improvements
This commit is contained in:
parent
887dfcc088
commit
e94762b85c
58
apps/apps.py
58
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',
|
||||
[
|
||||
|
170
modules/home.py
170
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,
|
||||
|
@ -9,5 +9,5 @@ __all__ = [
|
||||
'MedianetSettings',
|
||||
'MwscSettings',
|
||||
'OoredooSettings',
|
||||
'StelcoSettings'
|
||||
]
|
||||
'StelcoSettings',
|
||||
]
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user