formatting and snackbar

pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "Meal Picker"
+name = "NoteNook"
 version = "0.1.0"
 description = "An app designed to build, store, and select meals for shopping purposes."
 readme = "README.md"
@@ -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 = "Meal Picker"
+product = "NoteNook"
 
 # company name to display in about app dialogs
 company = "Nick Kalar"

src/FileHandler.py

@@ -5,11 +5,13 @@ from dotenv import load_dotenv
 
 load_dotenv()
 
-file_path = os.getenv("FILE_PATH") + "/checklist.md" if os.getenv("FILE_PATH") else "./checklist.md"
+checklist_file_path = os.getenv("FILE_PATH") + "/checklist.md" if os.getenv("FILE_PATH") else "./checklist.md"
+
+ingredients_file_path = "./src/json/ingredients.json"
 
 def read_json() -> dict:
     try:
-        with open("./src/json/ingredients.json", "rt") as file:
+        with open(ingredients_file_path, "rt") as file:
             return json.load(file)
     except:
         print("Could not find or read file.")
@@ -17,7 +19,7 @@ def read_json() -> dict:
 
 def update_json(meals: dict) -> None:
     try:
-        with open("./src/json/ingredients.json", "w") as file:
+        with open(ingredients_file_path, "w") as file:
             json.dump(meals, file, indent=4)
     except Exception as e:
         print(f"Unable to write data to file. {e}")
@@ -44,7 +46,7 @@ def combine_ingredients(meals: dict) -> dict:
 
 def write_checklist(data: dict) -> None:
     try:
-        with open(file_path, 'w') as checklist:
+        with open(checklist_file_path, 'w') as checklist:
             for ingredient, details in data.items():
                 s = ingredient + " - " + str(details['quantity'])
                 if details['units'] != None:

src/MealBuilder.py

@@ -45,16 +45,16 @@ def builder(page):
 
         def create_ingredient_row(self, ingredient, details):
             row = []
-            row.append(ft.TextField(label="Ingredient", value=ingredient, on_change=self.update_ingredient))
-            row.append(ft.TextField(label="Quantity", value=details['quantity'], on_change=self.update_quantity))
-            row.append(ft.TextField(label="Units (optional)", value=details['units'], on_change=self.update_units))
+            row.append(ft.TextField(label="Ingredient", value=ingredient, on_change=self.update_ingredient, width=300))
+            row.append(ft.TextField(label="Quantity", value=details['quantity'], on_change=self.update_quantity, width=200))
+            row.append(ft.TextField(label="Units (optional)", value=details['units'], on_change=self.update_units, width=200))
             return row
 
         def create_new_ingredient_row(self):
             row = []
-            row.append(ft.TextField(label="Ingredient", value=""))
-            row.append(ft.TextField(label="Quantity", value=""))
-            row.append(ft.TextField(label="Units (optional)", value=""))
+            row.append(ft.TextField(label="Ingredient", value="", width=300))
+            row.append(ft.TextField(label="Quantity", value="", width=200))
+            row.append(ft.TextField(label="Units (optional)", value="", width=200))
             return row
     
         def update_ingredients(self, name):
@@ -78,26 +78,32 @@ def builder(page):
         def show_new_meal(self):
             self.new_meal = {}
             selector_body.controls = [
-                ft.TextField(label="Meal", value="", autofocus=True),
+                ft.TextField(label="Meal", value="", autofocus=True, width=720),
                 ft.ListView(controls=[ft.Row(self.create_new_ingredient_row(), 
-                            alignment=ft.MainAxisAlignment.SPACE_EVENLY,
-                            width=300,
-                            height=100,
+                            alignment=ft.MainAxisAlignment.START,
                             )],
                             expand=True,
-                            spacing=5,
-                            padding=5,
                             auto_scroll=False,
                         ),
-                ft.ElevatedButton(text="Add Ingredient", on_click=lambda e: self.append_new_ingredient_row(selector_body)),
-                ft.ElevatedButton(text="Add Meal", on_click=lambda e: self.add_new_meal(selector_body)),
-                ft.ElevatedButton(text="Back", on_click=lambda e: self.show_meal_selection(selector_body, page))
+                ft.Row(controls=[
+                    ft.ElevatedButton(text="Add Ingredient", on_click=lambda e: self.append_new_ingredient_row(selector_body)),
+                    ft.ElevatedButton(text="Add Meal", on_click=lambda e: self.add_new_meal(selector_body)),
+                    ft.ElevatedButton(text="Back", on_click=lambda e: self.show_meal_selection(selector_body, page))
+                    ]
+                )
+                
             ]
             
             page.title = "Add New Meal"
             page.update()
         
         def append_new_ingredient_row(self, selector_body):
+            # Don't add a new row if the last one is blank
+            if selector_body.controls[1].controls[-1].controls[0].value == "" or \
+                selector_body.controls[1].controls[-1].controls[1].value == "":
+                page.open(ft.SnackBar(ft.Text("Please fill in the current ingredient before adding a new one.")))
+                return
+            
             selector_body.controls[1].controls.append(ft.Row(self.create_new_ingredient_row(), 
                             alignment=ft.MainAxisAlignment.SPACE_EVENLY,
                             width=300,
@@ -108,6 +114,12 @@ def builder(page):
         def add_new_meal(self, selector_body):
             meal = selector_body.controls[0].value
             ing, qua, uni = [], [], []
+
+            if meal == "" or \
+            selector_body.controls[1].controls.controls[0].value == "" or \
+            selector_body.controls[1].controls.controls[1].value == "":
+                page.open(ft.SnackBar(ft.Text("Please fill out the meal information.")))
+                return
             
             for row in selector_body.controls[1].controls:
                 #skip blank row
@@ -127,6 +139,10 @@ def builder(page):
 
         def show_meal_details(self, selector_body, page):
             expanded_meal = []
+
+            if (selector_body.controls[0].controls[0].value == None):
+                page.open(ft.SnackBar(ft.Text("Please select a meal to update.")))
+                return
             
             meal_name = selector_body.controls[0].controls[0].value
 
@@ -134,8 +150,6 @@ def builder(page):
                 expanded_meal.append(
                     ft.Row(self.create_ingredient_row(details[0], details[1]), 
                             alignment=ft.MainAxisAlignment.SPACE_EVENLY,
-                            width=300,
-                            height=100,
                         )
                     )
                 
@@ -144,13 +158,16 @@ def builder(page):
                         ft.ListView(
                             controls=expanded_meal,
                             expand=True,
-                            spacing=5,
-                            padding=5,
+                            spacing=10,
+                            padding=10,
                             auto_scroll=False,
                             ),
-                        ft.ElevatedButton(text="Update Meal", on_click=lambda e: self.update_ingredients(selector_body.controls[0].value)),
-                        ft.ElevatedButton(text="Back", on_click=lambda e: self.show_meal_selection(selector_body, page)),
-                        ]
+                        ft.Row(controls=[
+                                ft.ElevatedButton(text="Save Changes", on_click=lambda e: self.update_ingredients(selector_body.controls[0].value)),
+                                ft.ElevatedButton(text="Back", on_click=lambda e: self.show_meal_selection(selector_body, page)),
+                            ]
+                        )
+                    ]
             if page.title == "Create and Edit Meals!":
                 page.title = f"Editing {meal_name}"
                 page.update()
@@ -164,14 +181,18 @@ def builder(page):
                                 self.get_meal_radios_group(),
                             ],
                         expand=True,
-                        spacing=5,
-                        padding=5,
+                        spacing=10,
+                        padding=10,
                         auto_scroll=False,
                         ),
-                        ft.ElevatedButton(text="Update Meal", 
+                        ft.Row(
+                            controls=[
+                                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())
+                            ]
+                        )
+                    ]
 
             if page.title != "Create and Edit Meals!":
                 page.title = f"Create and Edit Meals!"
@@ -186,7 +207,7 @@ def builder(page):
    
     selector_body = ft.Column(
         controls = [],
-        height = 500,
+        height = 700,
         expand = False,
     )
 

src/MealSelector.py

@@ -13,14 +13,22 @@ def selector(page: ft.Page):
                     selected_meals.pop(meal.label)
             else:
                 selected_meals[meal.label] = meal_json[meal.label]
-        print(selected_meals)
+        if selected_meals == {}:
+            page.open(ft.SnackBar(ft.Text("Please select at least one meal.")))
+            return
+
         write_checklist(combine_ingredients(selected_meals))
         
 
     page.title = "Select Some Meals"
     meal_list = []
     for name, _ in meal_json.items():
-        meal_list.append(ft.Checkbox(label=name))
+        meal_list.append(ft.Checkbox(
+                    label = name,
+                    active_color = '#6da0cd',
+                    
+                )
+            )
 
     submit_button = ft.ElevatedButton(text="Make Shopping List", on_click=update_meal_selection)
     
@@ -34,7 +42,7 @@ def selector(page: ft.Page):
                                 ),
                                 submit_button,
                             ],
-                            height = 500,
+                            height = 700,
                             expand = False,
                         )
     page.update()

src/main.py

@@ -5,12 +5,14 @@ from models.MenuBar import create_menubar
 
 
 def main(page: ft.Page):
+    page.window.width = 750
+    page.window.height = 900
+    page.window.top = 10
     page.appbar = create_menubar(page, selector, builder)
+    page.bgcolor = '#013328'
 
-    page.add(ft.Pagelet(
-            content = ft.Text("Welcome to Meal Picker! Please select an option from the menu above to get started.")
-        )    
-    )
+    page.add(ft.Pagelet(content=ft.Text()))
+    selector(page)
 
 if __name__ == "__main__":
     ft.app(main)

src/models/MenuBar.py

@@ -2,15 +2,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,
+        title=ft.Text("NoteNook"),
+        bgcolor='#CC8B65',
         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)),
-                ]
+                ],
+                icon = ft.Icons.FASTFOOD_OUTLINED,
+                icon_color = '#E3DCD2'
             )
         ]
     )