Unifty-Apps #1

Merged
NickKalar merged 5 commits from Unifty-Apps into main 2025-11-26 04:23:05 +00:00
2 changed files with 39 additions and 22 deletions
Showing only changes of commit 61f1f6a711 - Show all commits

View File

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

View File

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