From 61f1f6a711fd9e1f4b4f25d8725dc7d5e786814d Mon Sep 17 00:00:00 2001 From: Nicholas Kalar Date: Mon, 24 Nov 2025 21:10:13 -0500 Subject: [PATCH 1/5] Updated for unifying --- src/MealBuilder.py | 34 ++++++++++++++++++++++------------ src/MealSelector.py | 27 +++++++++++++++++---------- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/src/MealBuilder.py b/src/MealBuilder.py index 1bbafec..73c781b 100644 --- a/src/MealBuilder.py +++ b/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(), - ft.ElevatedButton(text="Update Meal", on_click=lambda e: self.show_meal_details(selector_body, page)), + selector_body.controls = [ft.ListView( + 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()) ] @@ -164,9 +178,6 @@ def builder(page): page.update() return selector_body - - def get_meal_names(): - return list(meal_json.keys()) @@ -179,12 +190,11 @@ def builder(page): expand = False, ) - - page.add(ft.Container( - content = meal.show_meal_selection(selector_body, page) - )) + page.controls[0].content = meal.show_meal_selection(selector_body, page) + page.update() # TODO add functionality to add ingredients to a meal # TODO (Possible) add functionality to delete meals and/or ingredients -ft.app(builder) \ No newline at end of file +if __name__ == "__main__": + ft.app(builder) \ No newline at end of file diff --git a/src/MealSelector.py b/src/MealSelector.py index b0f8502..75ab051 100644 --- a/src/MealSelector.py +++ b/src/MealSelector.py @@ -1,4 +1,5 @@ from FileHandler import read_json, combine_ingredients, write_checklist + import flet as ft selected_meals = {} @@ -23,14 +24,20 @@ def selector(page: ft.Page): submit_button = ft.ElevatedButton(text="Make Shopping List", on_click=update_meal_selection) - page.add( - ft.ListView( - controls=meal_list, - expand=True, - spacing=10, - padding=10, - ), - submit_button, - ) + page.controls[0].content = ft.Column( + controls = [ + ft.ListView( + controls=meal_list, + expand=True, + spacing=10, + padding=10, + ), + submit_button, + ], + height = 500, + expand = False, + ) + page.update() -ft.app(selector) \ No newline at end of file +if __name__ == "__main__": + ft.app(selector) \ No newline at end of file From 66011974a33432d7215fc6f60dfc178f554ee75b Mon Sep 17 00:00:00 2001 From: Nicholas Kalar Date: Mon, 24 Nov 2025 21:10:35 -0500 Subject: [PATCH 2/5] Added app bar to select apps --- src/main.py | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/src/main.py b/src/main.py index c603ebe..0184155 100644 --- a/src/main.py +++ b/src/main.py @@ -1,26 +1,29 @@ import flet as ft +from MealBuilder import builder +from MealSelector import selector def main(page: ft.Page): - counter = ft.Text("0", size=50, data=0) - - def increment_click(e): - counter.data += 1 - 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, - ) + main_appbar = 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)), + ] + ) + ] ) + page.appbar = main_appbar -ft.app(main) + page.add(ft.Pagelet( + content = ft.Text("Welcome to Meal Picker! Please select an option from the menu above to get started.") + ) + ) + +if __name__ == "__main__": + ft.app(main) \ No newline at end of file From 2d5d44cd214610846f041a9aae0aed9958b9efa5 Mon Sep 17 00:00:00 2001 From: Nicholas Kalar Date: Mon, 24 Nov 2025 21:10:51 -0500 Subject: [PATCH 3/5] Renamed product --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8164964..f5867b4 100644 --- a/pyproject.toml +++ b/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" From ca3d0f8090147e3d6277646d2fd40e799c3ade1c Mon Sep 17 00:00:00 2001 From: Nicholas Kalar Date: Mon, 24 Nov 2025 21:17:35 -0500 Subject: [PATCH 4/5] Moved menubar to own file --- src/main.py | 17 ++--------------- src/models/MenuBar.py | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 src/models/MenuBar.py diff --git a/src/main.py b/src/main.py index 0184155..0427407 100644 --- a/src/main.py +++ b/src/main.py @@ -1,24 +1,11 @@ import flet as ft from MealBuilder import builder from MealSelector import selector +from models.MenuBar import create_menubar def main(page: ft.Page): - main_appbar = 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)), - ] - ) - ] - ) - - page.appbar = main_appbar + page.appbar = create_menubar(page, selector, builder) page.add(ft.Pagelet( content = ft.Text("Welcome to Meal Picker! Please select an option from the menu above to get started.") diff --git a/src/models/MenuBar.py b/src/models/MenuBar.py new file mode 100644 index 0000000..1b0c780 --- /dev/null +++ b/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 \ No newline at end of file From 027b24507575ddc35dc183b42cfa0a23261f79f2 Mon Sep 17 00:00:00 2001 From: Nicholas Kalar Date: Mon, 24 Nov 2025 21:17:45 -0500 Subject: [PATCH 5/5] updated gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b027bff..8e4cdee 100644 --- a/.gitignore +++ b/.gitignore @@ -164,4 +164,5 @@ storage/ # Custom ingredients.json -checklist.md \ No newline at end of file +checklist.md +.vscode/ \ No newline at end of file