Merge pull request 'Unifty-Apps' (#1) from Unifty-Apps into main

Reviewed-on: #1

.gitignore

@@ -165,3 +165,4 @@ storage/
 # Custom
 ingredients.json
 checklist.md
+.vscode/

pyproject.toml

@@ -18,7 +18,7 @@ org = "codes.kalar"
 
 # project display name that is used as an app title on Android and iOS home screens,
 # shown in window titles and about app dialogs on desktop.
-product = "shopping"
+product = "Meal Picker"
 
 # company name to display in about app dialogs
 company = "Nick Kalar"

src/MealBuilder.py

@@ -4,6 +4,11 @@ import flet as ft
 
 meal_json = read_json()
 
+def get_meal_names():
+    meal_list = list(meal_json.keys())
+    meal_list.sort()
+    return meal_list
+
 def is_number(s):
     try:
         float(s)
@@ -73,7 +78,7 @@ def builder(page):
         def show_new_meal(self):
             self.new_meal = {}
             selector_body.controls = [
-                ft.TextField(label="Meal", value=""),
+                ft.TextField(label="Meal", value="", autofocus=True),
                 ft.ListView(controls=[ft.Row(self.create_new_ingredient_row(), 
                             alignment=ft.MainAxisAlignment.SPACE_EVENLY,
                             width=300,
@@ -123,7 +128,7 @@ def builder(page):
         def show_meal_details(self, selector_body, page):
             expanded_meal = []
             
-            meal_name = selector_body.controls[0].value
+            meal_name = selector_body.controls[0].controls[0].value
 
             for details in meal_json[meal_name].items():
                 expanded_meal.append(
@@ -154,8 +159,17 @@ def builder(page):
     
         def show_meal_selection(self, selector_body, page):
             self.get_meal_radios()
-            selector_body.controls = [self.get_meal_radios_group(),
+            selector_body.controls = [ft.ListView(
-                        ft.ElevatedButton(text="Update Meal", on_click=lambda e: self.show_meal_details(selector_body, page)),
+                        controls=[
+                                self.get_meal_radios_group(),
+                            ],
+                        expand=True,
+                        spacing=5,
+                        padding=5,
+                        auto_scroll=False,
+                        ),
+                        ft.ElevatedButton(text="Update Meal", 
+                                          on_click=lambda e: self.show_meal_details(selector_body, page)),
                         ft.ElevatedButton(text="Add Meal", on_click=lambda e: self.show_new_meal())
                         ]
 
@@ -165,9 +179,6 @@ def builder(page):
 
             return selector_body
 
-    def get_meal_names():
-        return list(meal_json.keys())
-
         
 
     meal = Meal()
@@ -179,12 +190,11 @@ def builder(page):
         expand = False,
     )
 
-
+    page.controls[0].content = meal.show_meal_selection(selector_body, page)
-    page.add(ft.Container(
+    page.update()
-        content = meal.show_meal_selection(selector_body, page)
-    ))
     
     # TODO add functionality to add ingredients to a meal
     # TODO (Possible) add functionality to delete meals and/or ingredients
 
-ft.app(builder)
+if __name__ == "__main__":
+    ft.app(builder)

src/MealSelector.py

@@ -1,4 +1,5 @@
 from FileHandler import read_json, combine_ingredients, write_checklist
+
 import flet as ft
 
 selected_meals = {}
@@ -23,7 +24,8 @@ def selector(page: ft.Page):
 
     submit_button = ft.ElevatedButton(text="Make Shopping List", on_click=update_meal_selection)
     
-    page.add(
+    page.controls[0].content = ft.Column(
+                            controls = [
                                 ft.ListView(
                                     controls=meal_list,
                                     expand=True,
@@ -31,6 +33,11 @@ def selector(page: ft.Page):
                                     padding=10,
                                 ),
                                 submit_button,
+                            ],
+                            height = 500,
+                            expand = False,
                         )
+    page.update()
 
-ft.app(selector)
+if __name__ == "__main__":
+    ft.app(selector)

src/main.py

@@ -1,26 +1,16 @@
 import flet as ft
+from MealBuilder import builder
+from MealSelector import selector
+from models.MenuBar import create_menubar
 
 
 def main(page: ft.Page):
-    counter = ft.Text("0", size=50, data=0)
+    page.appbar = create_menubar(page, selector, builder)
 
-    def increment_click(e):
+    page.add(ft.Pagelet(
-        counter.data += 1
+            content = ft.Text("Welcome to Meal Picker! Please select an option from the menu above to get started.")
-        counter.value = str(counter.data)
-        counter.update()
-
-    page.floating_action_button = ft.FloatingActionButton(
-        icon=ft.Icons.ADD, on_click=increment_click
-    )
-    page.add(
-        ft.SafeArea(
-            ft.Container(
-                counter,
-                alignment=ft.alignment.center,
-            ),
-            expand=True,
         )    
     )
 
-
+if __name__ == "__main__":
-ft.app(main)
+    ft.app(main)

src/models/MenuBar.py

@@ -0,0 +1,17 @@
+import flet as ft
+
+def create_menubar(page: ft.Page, selector, builder):
+    menu = ft.AppBar(
+        title=ft.Text("Meal Picker"),
+        bgcolor=ft.Colors.GREEN_700,
+        center_title=False,
+        actions=[
+            ft.PopupMenuButton(
+                items=[
+                    ft.PopupMenuItem(text="Meal Selector", on_click=lambda e: selector(page)),
+                    ft.PopupMenuItem(text="Meal Builder", on_click=lambda e: builder(page)),
+                ]
+            )
+        ]
+    )
+    return menu