this commit fixes #2 and adds other improvements to #3

modules/settings/appSettings/dhiraagu_settings.py

@@ -9,8 +9,7 @@ def Settings(page: ft.Page):
     )
     settingsContainer.controls.append(ft.Text('General'))
 
-    def _on_enable_change(e):
-        print(config.getint('apps', 'dhiraagu'))
+    def _on_enable_change(e: ft.ControlEvent):
         if config.getint('apps', 'dhiraagu'):
             config.save('apps', 'dhiraagu', '0')
         else:
@@ -41,6 +40,67 @@ def Settings(page: ft.Page):
     settingsContainer.controls.append(
         generalSettings,
     )
+    settingsContainer.controls.append(
+        ft.Divider(),
+    )
+
+    # main settings
+    settingsContainer.controls.append(ft.Text('Account'))
+    loginForm = ft.Column()
+    phoneInput = ft.Container(
+        content=ft.TextField(
+            config.get('dhiraagu', 'phone'),
+            label='Phone',
+            adaptive=True,
+        ),
+        padding=10,
+    )
+    loginForm.controls.append(phoneInput)
+
+    otpInput = ft.Container(
+        content=ft.TextField(
+            config.get('dhiraagu', 'otp'),
+            label='OTP',
+            adaptive=True,
+        ),
+        padding=10,
+    )
+    loginForm.controls.append(otpInput)
+    sendOTP = ft.CupertinoButton(
+        content=ft.Text('SEND OTP'),
+        opacity_on_click=0.3,
+        on_click=lambda e: print('clicked!'),
+    )
+
+    if config.get('dhiraagu', 'token'):
+        phoneInput.disabled = True
+        otpInput.disabled = True
+        sendOTP.disabled = True
+        log = ft.CupertinoButton(
+            content=ft.Text('LOG OUT'),
+            opacity_on_click=0.3,
+            on_click=lambda e: print('clicked!'),
+        )
+    else:
+        log = ft.CupertinoButton(
+            content=ft.Text('LOG IN'),
+            opacity_on_click=0.3,
+            on_click=lambda e: print('clicked!'),
+        )
+    buttons = ft.Row(
+        controls=[
+            sendOTP,
+        ],
+    )
+    buttons.controls.append(
+        log,
+    )
+    loginForm.controls.append(
+        buttons,
+    )
+    settingsContainer.controls.append(
+        loginForm,
+    )
     return AppView(
         '/settings/dhiraagu',
         [

modules/settings/appSettings/medianet_settings.py

@@ -9,8 +9,7 @@ def Settings(page: ft.Page):
     )
     settingsContainer.controls.append(ft.Text('General'))
 
-    def _on_enable_change(e):
-        print(config.getint('apps', 'medianet'))
+    def _on_enable_change(e: ft.ControlEvent):
         if config.getint('apps', 'medianet'):
             config.save('apps', 'medianet', '0')
         else:

modules/settings/appSettings/mwsc_settings.py

@@ -2,6 +2,8 @@ import flet as ft
 from utils import AppView, Title
 from ..functions import config
 
+ft.Control
+
 
 def Settings(page: ft.Page):
     settingsContainer = ft.ListView(
@@ -9,8 +11,7 @@ def Settings(page: ft.Page):
     )
     settingsContainer.controls.append(ft.Text('General'))
 
-    def _on_enable_change(e):
-        print(config.getint('apps', 'mwsc'))
+    def _on_enable_change(e: ft.ControlEvent):
         if config.getint('apps', 'mwsc'):
             config.save('apps', 'mwsc', '0')
         else:

modules/settings/appSettings/ooredoo_settings.py

@@ -9,8 +9,7 @@ def Settings(page: ft.Page):
     )
     settingsContainer.controls.append(ft.Text('General'))
 
-    def _on_enable_change(e):
-        print(config.getint('apps', 'ooredoo'))
+    def _on_enable_change(e: ft.ControlEvent):
         if config.getint('apps', 'ooredoo'):
             config.save('apps', 'ooredoo', '0')
         else:

modules/settings/appSettings/stelco_settings.py

@@ -9,8 +9,7 @@ def Settings(page: ft.Page):
     )
     settingsContainer.controls.append(ft.Text('General'))
 
-    def _on_enable_change(e):
-        print(config.getint('apps', 'stelco'))
+    def _on_enable_change(e: ft.ControlEvent):
         if config.getint('apps', 'stelco'):
             config.save('apps', 'stelco', '0')
         else:

modules/settings/functions/theme.py

@@ -1,5 +1,4 @@
 import flet as ft
-from .config import config
 
 
 class Theme:
@@ -9,5 +8,4 @@ class Theme:
     def change(self, theme: ft.ThemeMode = None):
         if theme:
             self.page.theme_mode = theme
-        print(theme)
         self.page.update()

modules/settings/settings.py

@@ -9,7 +9,7 @@ def Settings(page: ft.Page):
     )
     settingsContainer.controls.append(ft.Text('General'))
 
-    def _on_name_change(e):
+    def _on_name_change(e: ft.ControlEvent):
         newName = ft.CupertinoTextField(value=config.get('general', 'name'))
         dlg = ft.CupertinoAlertDialog(
             modal=True,
@@ -45,7 +45,7 @@ def Settings(page: ft.Page):
         dlg.open = True
         page.update()
 
-    def _on_phone_change(e):
+    def _on_phone_change(e: ft.ControlEvent):
         newPhone = ft.CupertinoTextField(value=config.get('general', 'phone'))
         dlg = ft.CupertinoAlertDialog(
             modal=True,
@@ -81,7 +81,7 @@ def Settings(page: ft.Page):
         dlg.open = True
         page.update()
 
-    def _on_email_change(e):
+    def _on_email_change(e: ft.ControlEvent):
         newEmail = ft.CupertinoTextField(value=config.get('general', 'email'))
         dlg = ft.CupertinoAlertDialog(
             modal=True,
@@ -117,7 +117,7 @@ def Settings(page: ft.Page):
         dlg.open = True
         page.update()
 
-    def _on_nid_change(e):
+    def _on_nid_change(e: ft.ControlEvent):
         newNID = ft.CupertinoTextField(value=config.get('general', 'nid'))
         dlg = ft.CupertinoAlertDialog(
             modal=True,
@@ -385,7 +385,7 @@ def Settings(page: ft.Page):
     settingsContainer.controls.append(ft.Divider())
     settingsContainer.controls.append(ft.Text('Theme'))
 
-    def _on_theme_change(e):
+    def _on_theme_change(e: ft.ControlEvent):
         if page.theme_mode == ft.ThemeMode.LIGHT:
             e.value = False
             config.save('general', 'theme', 'dark')