Merge pull request #505 from AndreWohnsland/dev

Hide virgin and alcohol option in case of single ingredient

Author: AndreWohnsland

src/config/config_manager.py

@@ -518,7 +518,6 @@ def __init__(self) -> None:
         self.old_ingredient: list[str] = []
         self.selected_team = "No Team"
         self.team_member_name: str | None = None
-        self.alcohol_factor: float = 1.0
         self.is_v1 = False
         self.restricted_mode_active = False
         self.cocktail_status = CocktailStatus()

src/dialog_handler.py

@@ -770,8 +770,6 @@ def adjust_mainwindow(self, w: Ui_MainWindow) -> None:
             ui_element.setText(self._choose_language(text_name))
 
     def adjust_cocktail_selection_screen(self, w: Ui_CocktailSelection) -> None:
-        window = "cocktail_selection"
-        w.virgin_checkbox.setText(self._choose_language("activate_virgin", window))
         w.button_back.setText(self._choose_language("back"))
 
     def adjust_available_windows(self, w: Ui_available) -> None:

src/language.yaml

@@ -455,9 +455,6 @@ ui:
     prepare_button:
       en: '  Prepare {amount} {unit}'
       de: '  {amount} {unit} Zubereiten'
-    activate_virgin:
-      en: 'Virgin (no alcohol)'
-      de: 'Virgin (kein Alkohol)'
 
   ##### AVAILABLE WINDOW #####
   # all values for available window

src/models.py

@@ -137,7 +137,8 @@ def virgin_machineadds(self) -> list[Ingredient]:
     @property
     def is_virgin(self) -> bool:
         """Returns if the cocktail is virgin."""
-        return self.adjusted_alcohol == 0
+        # single ingredient cocktails will not be considered virgin, because they are an ingredient (wrapper)
+        return self.adjusted_alcohol == 0 and len(self.ingredients) > 1
 
     def current_price(
         self,

src/ui/icons.py

@@ -145,6 +145,7 @@ def set_cocktail_selection_icons(self, w: Ui_CocktailSelection) -> None:
             (w.prepare_button, _COCKTAIL_ICON, False),
             (w.increase_alcohol, _SKULL, True),
             (w.decrease_alcohol, _EASY, True),
+            (w.virgin_toggle, _VIRGIN_ICON, True),
         ]:
             fa_icon: QIcon = qta.icon(icon, color=self.color.background)
             self.set_icon(ui_element, fa_icon, no_text)

src/ui/setup_cocktail_selection.py

@@ -6,13 +6,12 @@
 from PyQt6.QtWidgets import QDialog, QLabel, QPushButton, QSizePolicy
 
 from src.config.config_manager import CONFIG as cfg
-from src.config.config_manager import shared
 from src.database_commander import DB_COMMANDER
 from src.dialog_handler import UI_LANGUAGE
 from src.display_controller import DP_CONTROLLER
 from src.image_utils import find_cocktail_image
 from src.models import Cocktail, Ingredient
-from src.ui.creation_utils import LARGE_FONT, create_button, create_label, set_strike_through, set_underline
+from src.ui.creation_utils import LARGE_FONT, create_button, create_label, set_underline
 from src.ui.icons import IconSetter
 from src.ui.shared import qt_prepare_flow
 from src.ui_elements import Ui_CocktailSelection
@@ -44,11 +43,28 @@ def __init__(self, mainscreen: MainScreen, cocktail: Cocktail) -> None:
 
         UI_LANGUAGE.adjust_cocktail_selection_screen(self)
         self.clear_recipe_data_maker()
-        # Also resets the alcohol factor
-        self.reset_alcohol_factor()
         DP_CONTROLLER.set_display_settings(self, False)
         self._connect_elements()
 
+    @property
+    def can_change_virgin(self) -> bool:
+        """Return if the cocktail can have a virgin option."""
+        return self.cocktail.virgin_available and not self.cocktail.only_virgin
+
+    @property
+    def alcohol_factor(self) -> float:
+        if self.virgin_toggle.isChecked():
+            return 0.0
+        if self.increase_alcohol.isChecked():
+            return 1.3
+        if self.decrease_alcohol.isChecked():
+            return 0.7
+        return 1.0
+
+    @property
+    def is_virgin(self) -> bool:
+        return self.virgin_toggle.isChecked()
+
     def _set_image(self) -> None:
         """Set the image of the cocktail."""
         image_path = find_cocktail_image(self.cocktail)
@@ -60,10 +76,8 @@ def _connect_elements(self) -> None:
         self.button_back.clicked.connect(self.mainscreen.switch_to_cocktail_list)
         self.increase_alcohol.clicked.connect(self._higher_alcohol)
         self.decrease_alcohol.clicked.connect(self._lower_alcohol)
-        if cfg.payment_enabled:
-            self.decrease_alcohol.hide()
-            self.increase_alcohol.hide()
-        self.virgin_checkbox.stateChanged.connect(self.update_cocktail_data)
+        self.virgin_toggle.clicked.connect(self._toggle_virgin)
+        self._apply_button_visibility()
         self.adjust_maker_label_size_cocktaildata()
 
     def set_cocktail(self, cocktail: Cocktail) -> None:
@@ -98,11 +112,7 @@ def _scale_cocktail(self, amount: int | None = None) -> None:
         # overwrite the amount if the cocktail has a fixed volume
         if cfg.MAKER_USE_RECIPE_VOLUME:
             amount = self.cocktail.amount
-        factor = shared.alcohol_factor * (cfg.MAKER_ALCOHOL_FACTOR / 100)  # remember this is percent
-        is_virgin = self.virgin_checkbox.isChecked()
-        if is_virgin:
-            factor = 0
-        self.cocktail.scale_cocktail(amount, factor)
+        self.cocktail.scale_cocktail(amount, self.alcohol_factor * (cfg.MAKER_ALCOHOL_FACTOR / 100))
 
     def update_cocktail_data(self) -> None:
         """Update the cocktail data in the selection view."""
@@ -112,14 +122,15 @@ def update_cocktail_data(self) -> None:
         self.prepare_button.setText(
             UI_LANGUAGE.get_translation("prepare_button", "cocktail_selection", amount=amount, unit=cfg.EXP_MAKER_UNIT)
         )
-        virgin_prefix = "Virgin " if self.cocktail.is_virgin else ""
+        virgin_prefix = "Virgin " if self.is_virgin else ""
         self.LAlkoholname.setText(f"{virgin_prefix}{self.cocktail.name}")
         display_volume = self._decide_rounding(amount * cfg.EXP_MAKER_FACTOR, 20)
         self.LMenge.setText(f"{display_volume} {cfg.EXP_MAKER_UNIT}")
         self.LAlkoholgehalt.setText(f"{self.cocktail.adjusted_alcohol:.1f}%")
         display_data = self.cocktail.machineadds
         hand = self.cocktail.handadds
-        self._apply_virgin_setting()
+        self._apply_button_visibility()
+        self._update_volume_button_labels()
         if hand:
             display_data.extend([Ingredient(-1, "", 0, 0, 0, False, 100, 100), *hand])
         fields_ingredient = self.get_labels_maker_ingredients()
@@ -150,18 +161,18 @@ def update_cocktail_data(self) -> None:
                 ingredient_name = ing.name
             field_ingredient.setText(f"{ingredient_name} ")
 
-    def _apply_virgin_setting(self) -> None:
-        # hide the strong/weak buttons, since they are not needed
-        show_alcohol_buttons = not self.cocktail.only_virgin and not cfg.payment_enabled
+    def _apply_button_visibility(self) -> None:
+        """Hide or show the toggle buttons for alcohol and virgin mode, depending on the cocktail and config."""
+        is_single_ingredient_recipe = len(self.cocktail.ingredients) == 1
+        # hide the strong/weak buttons, when they are not needed or possible
+        show_alcohol_buttons = (
+            not is_single_ingredient_recipe and not self.cocktail.only_virgin and not cfg.payment_enabled
+        )
         self.increase_alcohol.setVisible(show_alcohol_buttons)
         self.decrease_alcohol.setVisible(show_alcohol_buttons)
-        can_change_virgin = self.cocktail.virgin_available and not self.cocktail.only_virgin
-        self.virgin_checkbox.setEnabled(can_change_virgin)
-        # Styles does not work on strikeout, so we use internal qt things
-        # To be precise, they do work at start, but does not support dynamic changes
-        set_strike_through(self.virgin_checkbox, not can_change_virgin)
+        self.LAlkoholgehalt.setVisible(not is_single_ingredient_recipe)
+        self.virgin_toggle.setVisible(self.can_change_virgin)
         # Update button labels if payment is active (price may change with virgin mode)
-        self._update_volume_button_labels()
 
     def _decide_rounding(self, val: float, threshold: int = 8) -> int | float:
         """Return the right rounding for numbers displayed to the user."""
@@ -175,18 +186,11 @@ def clear_recipe_data_maker(self) -> None:
         self.LAlkoholgehalt.setText("")
         self.LAlkoholname.setText(UI_LANGUAGE.get_cocktail_dummy())
         self.LMenge.setText("")
-        self.virgin_checkbox.setChecked(self.cocktail.only_virgin)
+        self.virgin_toggle.setChecked(self.cocktail.only_virgin)
         for field_ingredient, field_volume in zip(self.get_labels_maker_ingredients(), self.get_labels_maker_volume()):
             field_ingredient.setText("")
             field_volume.setText("")
 
-    def reset_alcohol_factor(self) -> None:
-        """Set the alcohol slider to default (100%) value."""
-        if self.cocktail.only_virgin:
-            shared.alcohol_factor = 0.0
-        else:
-            shared.alcohol_factor = 1.0
-
     def adjust_maker_label_size_cocktaildata(self) -> None:
         """Adjust the font size for larger screens."""
         # iterate over all size types and adjust size relative to window height
@@ -225,25 +229,22 @@ def get_labels_maker_ingredients(self) -> list[QLabel]:
         """Return all maker label objects for ingredient name."""
         return [getattr(self, f"LZutat{x}") for x in range(1, 10)]
 
-    def _higher_alcohol(self, checked: bool) -> None:
+    def _higher_alcohol(self, _: bool) -> None:
         """Increases the alcohol factor."""
         self.decrease_alcohol.setChecked(False)
-        if checked:
-            self.adjust_alcohol(1.3)
-        else:
-            self.adjust_alcohol(1.0)
+        self.virgin_toggle.setChecked(False)
+        self.update_cocktail_data()
 
-    def _lower_alcohol(self, checked: bool) -> None:
+    def _lower_alcohol(self, _: bool) -> None:
         """Decreases the alcohol factor."""
         self.increase_alcohol.setChecked(False)
-        if checked:
-            self.adjust_alcohol(0.7)
-        else:
-            self.adjust_alcohol(1.0)
+        self.virgin_toggle.setChecked(False)
+        self.update_cocktail_data()
 
-    def adjust_alcohol(self, amount: float) -> None:
-        """Change the alcohol factor to the given value."""
-        shared.alcohol_factor = amount
+    def _toggle_virgin(self, _: bool) -> None:
+        """Toggle the virgin option."""
+        self.decrease_alcohol.setChecked(False)
+        self.increase_alcohol.setChecked(False)
         self.update_cocktail_data()
 
     def _adjust_preparation_buttons(self) -> None:
@@ -298,7 +299,7 @@ def _update_volume_button_labels(self) -> None:
             volume_converted = self._decide_rounding(volume * cfg.EXP_MAKER_FACTOR, 20)
             label = f"{volume_converted}"
             if cfg.payment_enabled:
-                multiplier = cfg.PAYMENT_VIRGIN_MULTIPLIER / 100 if self.virgin_checkbox.isChecked() else 1.0
+                multiplier = cfg.PAYMENT_VIRGIN_MULTIPLIER / 100 if self.is_virgin else 1.0
                 price = self.cocktail.current_price(cfg.PAYMENT_PRICE_ROUNDING, volume, price_multiplier=multiplier)
                 price_str = f"{price}".rstrip("0").rstrip(".")
                 label += f": {price_str}€"

src/ui/shared.py

@@ -9,7 +9,6 @@
 
 from src.config.config_manager import CONFIG as cfg
 from src.config.config_manager import Tab
-from src.config.config_manager import shared as global_shared
 from src.display_controller import DP_CONTROLLER
 from src.logger_handler import LoggerHandler
 from src.models import Cocktail, PrepareResult
@@ -66,10 +65,7 @@ def qt_prepare_flow(w: MainScreen, cocktail: Cocktail) -> tuple[bool, str]:
         DP_CONTROLLER.standard_box(message, close_time=60)
 
     # Otherwise clean up the rest
-    if w.cocktail_selection:
-        w.cocktail_selection.virgin_checkbox.setChecked(False)
     bottles.set_fill_level_bars(w)
-    global_shared.alcohol_factor = 1.0
     w.switch_to_cocktail_list()
     if cfg.cocktailberry_payment and cfg.PAYMENT_LOGOUT_AFTER_PREPARATION:
         NFCPaymentService().logout_user()

src/ui/styles/_elements.scss

@@ -78,7 +78,6 @@ $picture-view-active-color: $secondary;
   padding: 5px 25px 5px 25px;
 }
 
-#virgin_checkbox,
 *[cssClass~='big-checkbox'] {
   &.QCheckBox::indicator {
     width: 30px;

src/ui/styles/alien.css

@@ -53,7 +53,6 @@
 #informationLabel {
   padding: 5px 25px 5px 25px; }
 
-#virgin_checkbox.QCheckBox::indicator,
 *[cssClass~='big-checkbox'].QCheckBox::indicator {
   width: 30px;
   height: 30px;

src/ui/styles/bavaria.css

@@ -53,7 +53,6 @@
 #informationLabel {
   padding: 5px 25px 5px 25px; }
 
-#virgin_checkbox.QCheckBox::indicator,
 *[cssClass~='big-checkbox'].QCheckBox::indicator {
   width: 30px;
   height: 30px;