feat(all): add cocktails and update version

MOIMOB · Oct 16, 2022 · 84f956a · 84f956a
1 parent d6444b9
commit 84f956a
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 5 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.moimob.drinkable"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 10900
-        versionName "1.9.0"
+        versionCode 11000
+        versionName "1.10.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

diff --git a/fastlane/metadata/android/en-US/changelogs/11000.txt b/fastlane/metadata/android/en-US/changelogs/11000.txt
@@ -0,0 +1,3 @@
+• Minor UI fixes 
+• Ingredient amount will now default be displayed in ML instead of CL when using metric
+• Added more cocktails 🍸
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
@@ -3,7 +3,7 @@ Drinkable is an app which help you find cocktails that you could make today with
 - Includes 100+ cocktails.
 - Ability to add your own cocktails and ingredients within the app.
 - Mark cocktails as favorites
-- Supports both Imperial and Metric messuarement system.
+- Supports both Imperial and Metric measurement system.
 - Simple User Interface
 - Offline support
 

diff --git a/src/functions/cocktail-functions.ts b/src/functions/cocktail-functions.ts
@@ -1530,4 +1530,35 @@ const cocktails: Cocktail[] = [
             { amount: '2', ingredientId: '91', unit: Unit.TSP },
         ],
     },
+    {
+        id: '108',
+        imageSrc: 'images/pisco_sour.jpg',
+        isImagePortrait: false,
+        name: 'Pisco Sour',
+        category: DrinkCategory.Cocktail,
+        instructions:
+            'Vigorously shake and strain contents in a cocktail shaker with ice cubes, then pour into glass and garnish with bitters.',
+        ingredientGroups: [
+            { amount: '60', ingredientId: '93', unit: Unit.ML },
+            { amount: '30', ingredientId: '10', unit: Unit.ML },
+            { amount: '1.5', ingredientId: '42', unit: Unit.TSP },
+            { amount: '1', ingredientId: '23', unit: '' },
+        ],
+    },
+    {
+        id: '109',
+        imageSrc: 'images/aquafaba_gin_fizz.png',
+        isImagePortrait: false,
+        name: 'Aquafaba Gin Fizz',
+        category: DrinkCategory.Cocktail,
+        instructions:
+            'Add the gin, lime juice, Aquafaba and sugar syrup to a cocktail shaker filled with ice. Shake until cold to touch. Strain the shaker into a rocks glass filled with ice and top with soda water. Garnish with a lime wedge.',
+        ingredientGroups: [
+            { amount: '15', ingredientId: '94', unit: Unit.ML },
+            { amount: '25', ingredientId: '2', unit: Unit.ML },
+            { amount: '50', ingredientId: '6', unit: Unit.ML },
+            { amount: '30', ingredientId: '3', unit: Unit.ML },
+            { amount: '20', ingredientId: '4', unit: Unit.ML },
+        ],
+    },
 ];
diff --git a/src/functions/ingredient-functions.ts b/src/functions/ingredient-functions.ts
@@ -98,4 +98,6 @@ const currentIngredients: Ingredient[] = [
     { id: '90', name: 'Mezcal', spiritType: SpiritType.Tequila },
     { id: '91', name: 'Water', spiritType: SpiritType.None },
     { id: '92', name: 'Cointreau', spiritType: SpiritType.None },
+    { id: '93', name: 'Pisco', spiritType: SpiritType.None },
+    { id: '94', name: 'Aquafaba', spiritType: SpiritType.None },
 ];
diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
@@ -26,7 +26,7 @@
     "add-ingredients": "Add Ingredients",
     "all-ingredients-selected": "All ingredients selected",
     "theme": "Theme",
-    "messuarementSystem": "Messuarement System",
+    "messuarementSystem": "Measurement system",
     "imperial": "Imperial",
     "metric": "Metric",
     "dark": "Dark",
@@ -60,7 +60,7 @@
     "cancel": "Cancel",
     "save": "Save",
     "welcome": "Welcome",
-    "select-messuarement-system": "Select Messuarement System",
+    "select-messuarement-system": "Select Measurement system",
     "select": "Select",
     "quick-add-ingredients": "Quick Add Ingredients",
     "selected": "selected",

diff --git a/static/images/aquafaba_gin_fizz.png b/static/images/aquafaba_gin_fizz.png
diff --git a/static/images/pisco_sour.jpg b/static/images/pisco_sour.jpg