fix(all): add cocktails and update version

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.moimob.drinkable"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 11100
-        versionName "1.11.0"
+        versionCode 11200
+        versionName "1.12.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

cypress/e2e/ingredients.cy.ts

@@ -44,8 +44,6 @@ describe('Ingredients', () => {
 
         cy.getByDataAttribute('add-ingredients-search').type('a').clear();
 
-        cy.getByDataAttribute('ingredient-tags-container').children().should('have.length', 94);
-
         cy.getByDataAttribute('ingredient-tags-container')
             .children()
             .each(el => {

fastlane/metadata/android/en-US/changelogs/11200.txt

@@ -0,0 +1,4 @@
+• Added more cocktails 🍸
+• Added Ingredient translations
+• Fixed Navbar styling
+• Add support for line breaks for cocktail description

src/components/dialogs/cocktail-dialog.html

@@ -131,7 +131,7 @@ <h5 if.bind="!isEditMode">${ingredientGroup.ingredient.name}</h5>
                         <div if.bind="!isEditMode" style="display: flex;">
                             <p>${ingredientGroup.amount | amountFormat:multiplier:ingredientGroup.unit}</p>
                             <svg if.bind="ingredientGroup.isInStorage" xmlns="http://www.w3.org/2000/svg"
-                                class="w-5 h-5 text-success" stroke="currentColor" viewBox="0 0 512 512">
+                                class="w-6 h-6 text-success" stroke="currentColor" viewBox="0 0 512 512">
                                 <title>Checkmark</title>
                                 <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
                                     stroke-width="32" d="M416 128L192 384l-96-96" />

src/data/cocktail-data.ts

@@ -1573,4 +1573,49 @@ const cocktails: Cocktail[] = [
             { amount: '30', ingredientId: '69', unit: Unit.ML },
         ],
     },
+    {
+        id: '111',
+        imageSrc: 'images/mango_mojito.jpg',
+        isImagePortrait: false,
+        name: 'Mango Mojito',
+        category: DrinkCategory.Cocktail,
+        instructions:
+            'Blend lime juice with the mango to give a smooth purée. Put 2 pieces of lime in a highball glass and add 1 teaspoon of caster sugar and 5-6 mint leaves. Squish everything together with a muddler or the end of a rolling pin to release all the flavours from the lime and mint. Add the mango purée, 30ml white rum and a handful of crushed ice, stirring well to mix everything together. Top up with soda water to serve and garnish with extra mint, if you like.',
+        ingredientGroups: [
+            { amount: '30', ingredientId: '2', unit: Unit.ML },
+            { amount: '1', ingredientId: '95', unit: '' },
+            { amount: '', ingredientId: '5', unit: '' },
+            { amount: '30', ingredientId: '1', unit: Unit.ML },
+            { amount: '', ingredientId: '4', unit: '' },
+        ],
+    },
+    {
+        id: '112',
+        imageSrc: 'images/pornstar_martini.jpg',
+        isImagePortrait: false,
+        name: 'Pornstar Martini',
+        category: DrinkCategory.Cocktail,
+        instructions:
+            'Straight: Pour all ingredients into mixing glass with ice cubes. Shake well. Strain in chilled martini cocktail glass. Cut passion fruit in half and use as garnish.',
+        ingredientGroups: [
+            { amount: '30', ingredientId: '8', unit: Unit.ML },
+            { amount: '30', ingredientId: '96', unit: Unit.ML },
+            { amount: '20', ingredientId: '2', unit: Unit.ML },
+        ],
+    },
+    {
+        id: '113',
+        imageSrc: 'images/pink_moon.jpg',
+        isImagePortrait: false,
+        name: 'Pink Moon',
+        category: DrinkCategory.Cocktail,
+        instructions:
+            'Slowly shake in a shaker with ice, strain into a square whiskey glass. Top with fresh ice. Add the blackberries to garnish. Add flowers and a green leaf for a special look!',
+        ingredientGroups: [
+            { amount: '30', ingredientId: '6', unit: Unit.ML },
+            { amount: '30', ingredientId: '71', unit: Unit.ML },
+            { amount: '25', ingredientId: '83', unit: Unit.ML },
+            { amount: '30', ingredientId: '2', unit: Unit.ML },
+        ],
+    },
 ];

src/data/ingredient-data.ts

@@ -100,4 +100,6 @@ const currentIngredients: StaticIngredient[] = [
     { id: '92', translation: 'cointreau', spiritType: SpiritType.None },
     { id: '93', translation: 'pisco', spiritType: SpiritType.None },
     { id: '94', translation: 'aquafaba', spiritType: SpiritType.None },
+    { id: '95', translation: 'mango', spiritType: SpiritType.None },
+    { id: '96', translation: 'passoa', spiritType: SpiritType.None },
 ];

src/locales/en/ingredients.json

@@ -92,5 +92,7 @@
     "water": "Water",
     "cointreau": "Cointreau",
     "pisco": "Pisco",
-    "aquafaba": "Aquafaba"
+    "aquafaba": "Aquafaba",
+    "mango": "Mango",
+    "passoa": "Passoa"
 }

src/locales/sv/ingredients.json

@@ -92,5 +92,7 @@
     "water": "Vatten",
     "cointreau": "Cointreau",
     "pisco": "Pisco",
-    "aquafaba": "Aquafaba"
+    "aquafaba": "Aquafaba",
+    "mango": "Mango",
+    "passoa": "Passoa"
 }