JannTer/frontend-dev
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add edit step + do recipe in main view, added carousel for recipe selection

Browse Source
This commit is contained in:
Jannes
2026-03-12 22:57:15 +01:00
parent 90257a62a0
commit d5dacb8fc4
21 changed files with 1052 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

211
frontend/views/recipes/edit_recipe.py
View File

@@ -1,11 +1,38 @@
from typing import Tuple
from PIL import ImageDraw, Image
from copy import deepcopy
from ..base import View
from ..button_interface import ButtonInterface
from ..list_select import ListItem, ListView
from .recipe_manager import RecipeManager
from .recipe import Recipe
from .recipe import Recipe, Step, StepType
def _make_step_item(step):
"""ListItem that renders a recipe step (icon + value)."""
def render(draw, pos, fill, **kw):
step.step_type.render(draw, pos, fill=fill, **kw)
font_size = kw.get('font_size', 10)
draw.text((pos[0] + font_size + 12, pos[1]), step.value_str, fill=fill, **kw)
return ListItem(render)
def _make_add_item():
"""ListItem that renders as a '+' add button."""
return ListItem(lambda draw, pos, fill, **kw: draw.text(pos, '+', fill=fill, **kw))
def _make_cancel_item():
"""ListItem that renders as 'Cancel'."""
return ListItem(lambda draw, pos, fill, **kw: draw.text(pos, 'Cancel', fill=fill, **kw))
def _make_save_item():
"""ListItem that renders as 'Save'."""
return ListItem(lambda draw, pos, fill, **kw: draw.text(pos, 'Save', fill=fill, **kw))
class EditRecipe(View, ButtonInterface):
def __init__(self, parent, im_size, center,
@@ -22,108 +49,144 @@ class EditRecipe(View, ButtonInterface):
self.recipe = Recipe("New", [])
self.recipe_manager.tmp_recipe = self.recipe
else:
self.recipe = recipe_manager.get_recipe(recipe_id)
self.recipe = deepcopy(recipe_manager.get_recipe(recipe_id))
self.confirm_view = False
self.selected_field = 0 # 0: name, 1+: steps
self.move_mode = False
self.item_list = ListView(x_offset=40, max_visible=5, font_size=15)
self._rebuild_items()
super().__init__(parent, im_size, center)
def _get_visual_steps(self):
steps = self.recipe.steps + ['+', 'BACK']
if len(steps) < 4:
return steps, 0
start = max(0, self.selected_field - 2)
end = min(len(steps), start + 4)
steps = steps[start:end]
def _make_name_item(self):
"""ListItem that renders the recipe name field."""
recipe = self.recipe
def render(draw, pos, fill, **kw):
draw.text(pos, f"Name: {recipe.name}", fill=fill, **kw)
return ListItem(render)
return steps, start
def _rebuild_items(self):
"""Rebuild list items from current recipe state."""
old_index = self.item_list.selected_index
items = [self._make_name_item()]
for step in self.recipe.steps:
items.append(_make_step_item(step))
if self.move_mode:
items.append(_make_cancel_item())
else:
items.append(_make_add_item())
items.append(_make_save_item())
self.item_list.items = items
self.item_list.selected_index = min(old_index, len(items) - 1)
def update_weight(self, weight: float) -> Image.Image:
im = self.bkg_im.copy()
draw = ImageDraw.Draw(im)
x = 40
draw.text((x, 10), "Name:", fill='black')
if self.selected_field == 0:
r = 10
offset = 35
for i in range(0, 90, r // 2):
draw.circle((x + i, offset), r, fill='black')
draw.text((x, 30), self.recipe.name, fill='white')
else:
draw.text((x, 30), self.recipe.name, fill='black')
visual_steps, start = self._get_visual_steps()
for idx, step in enumerate(visual_steps):
y_pos = 60 + idx * 20
if start + idx + 1 == self.selected_field:
r = 10
offset = 15
for i in range(0, 90, r // 2):
draw.circle((x + i, y_pos), r, fill='black')
if str(step) == '+':
draw.text((x, y_pos - 5), '+', fill='white')
elif str(step) == 'BACK':
draw.regular_polygon((x + 5, y_pos, 5), 3, fill='white', rotation=90)
else:
step.step_type.render(draw, (x, y_pos - 5), fill='white')
draw.text((x + 30, y_pos - 5), step.value_str, fill='white')
elif str(step) == '+':
draw.text((x, y_pos - 5), '+', fill='black')
elif str(step) == 'BACK':
draw.regular_polygon((x + 5, y_pos, 5), 3, fill='black', rotation=90)
else:
step.step_type.render(draw, (x, y_pos - 5), fill='black')
draw.text((x + 30, y_pos - 5), step.value_str, fill='black')
self._rebuild_items()
self.item_list.render(draw, y_start=10)
if self.move_mode:
draw.text((2, 10), '\u2195', fill='black')
return im
def left_press(self):
self.selected_field = (self.selected_field - 1) % (len(self.recipe.steps) + 3)
def left_long_press(self):
if self.selected_field == len(self.recipe.steps) + 2:
# back
self.deactivate_command()
elif self.selected_field == len(self.recipe.steps) + 1:
# add step
pass
if self.move_mode:
idx = self.item_list.selected_index
num_steps = len(self.recipe.steps)
if 1 < idx <= num_steps: # swap step upward
steps = self.recipe.steps
step_idx = idx - 1
steps[step_idx - 1], steps[step_idx] = steps[step_idx], steps[step_idx - 1]
self.item_list.selected_index -= 1
elif idx == num_steps + 1: # on cancel -> move to last step (clamped, no wrap)
self.item_list.selected_index = num_steps
else:
# edit name
self.edit_step_command(self.recipe_id, self.selected_field)
self.item_list.select_previous()
def left_long_press(self):
if self.move_mode:
idx = self.item_list.selected_index
num_steps = len(self.recipe.steps)
if idx == num_steps + 1: # cancel item
self.move_mode = False
return
# always go back (discard unsaved changes)
self.deactivate_command()
def right_press(self):
self.selected_field = (self.selected_field + 1) % (len(self.recipe.steps) + 3)
if self.move_mode:
idx = self.item_list.selected_index
num_steps = len(self.recipe.steps)
if 1 <= idx < num_steps: # swap step downward
steps = self.recipe.steps
step_idx = idx - 1
steps[step_idx], steps[step_idx + 1] = steps[step_idx + 1], steps[step_idx]
self.item_list.selected_index += 1
elif idx == num_steps: # on last step -> move to cancel (clamped, no wrap)
self.item_list.selected_index = num_steps + 1
# on cancel or name: do nothing
else:
self.item_list.select_next()
def both_long_press(self):
idx = self.item_list.selected_index
num_steps = len(self.recipe.steps)
if self.move_mode:
self.move_mode = False
elif 1 <= idx <= num_steps:
self.move_mode = True
def right_long_press(self):
# save
if self.is_add_form:
self.recipe_manager.add_recipe(self.recipe)
if self.move_mode:
return
idx = self.item_list.selected_index
num_steps = len(self.recipe.steps)
if idx == num_steps + 2:
# save item
if self.is_add_form:
self.recipe_manager.add_recipe(self.recipe)
else:
self.recipe_manager.update_recipe(self.recipe_id, self.recipe)
self.deactivate_command()
elif idx == num_steps + 1:
# add step
new_step = Step(StepType.SECTION, "")
self.recipe.steps.append(new_step)
self.edit_step_command(self.recipe_id, num_steps + 1)
else:
self.recipe_manager.update_recipe(self.recipe_id, self.recipe)
# if view is in edit mode, the recipe is already updated (by reference)
self.deactivate_command()
# edit name (idx=0) or step (idx=1+)
self.edit_step_command(self.recipe_id, idx)
def has_button(self) -> Tuple[bool, bool, bool, bool]:
return True, True, True, True
def render_left_press(self, draw, x, y):
draw.regular_polygon((x, y+2, 5), 3, fill='black')
def render_left_long_press(self, draw, x, y):
draw.text((x, y-5), 'Enter', fill='black')
if self.move_mode:
draw.text((x, y-5), 'Cancel', fill='black')
else:
draw.text((x, y-5), 'Back', fill='black')
def render_right_press(self, draw, x, y):
draw.regular_polygon((x, y+4, 5), 3, fill='black', rotation=180)
def render_right_long_press(self, draw, x, y):
draw.text((x - 20, y-5), 'Save', fill='black')
if self.move_mode:
return
idx = self.item_list.selected_index
num_steps = len(self.recipe.steps)
if idx == num_steps + 2:
draw.text((x - 20, y-5), 'Save', fill='black')
elif idx == num_steps + 1:
draw.text((x - 15, y-5), 'Add', fill='black')
else:
draw.text((x - 15, y-5), 'Edit', fill='black')
def render_both_long_press(self, draw, x, y):
idx = self.item_list.selected_index
num_steps = len(self.recipe.steps)
if self.move_mode:
draw.text((x - 15, y - 5), 'Confirm', fill='black')
elif 1 <= idx <= num_steps:
draw.text((x - 10, y - 5), 'Move', fill='black')