diff --git a/android/app/build.gradle b/android/app/build.gradle index 2addb9f2..4e3cb6fd 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.moimob.drinkable" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 14500 - versionName "1.45.0" + versionCode 14501 + versionName "1.45.1" 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/14501.txt b/fastlane/metadata/android/en-US/changelogs/14501.txt new file mode 100644 index 00000000..1f5a5480 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/14501.txt @@ -0,0 +1,2 @@ +• Updated cocktail images +• Updated cocktail dialog design \ No newline at end of file diff --git a/src/components/dialogs/cocktail-dialog/cocktail-dialog.html b/src/components/dialogs/cocktail-dialog/cocktail-dialog.html index e196a04f..8dfaf098 100644 --- a/src/components/dialogs/cocktail-dialog/cocktail-dialog.html +++ b/src/components/dialogs/cocktail-dialog/cocktail-dialog.html @@ -3,7 +3,7 @@

${cocktail.name}

@@ -16,16 +16,26 @@

${cocktail.name}

class.bind="nameErrors.length ? 'input-error' : ''" data-cy="cocktail-name" /> - - - - + { diff --git a/src/components/icons/icon-menu.html b/src/components/icons/icon-menu.html new file mode 100644 index 00000000..147ab90a --- /dev/null +++ b/src/components/icons/icon-menu.html @@ -0,0 +1,11 @@ + diff --git a/src/components/index.ts b/src/components/index.ts index b4d11e53..124173df 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -34,6 +34,7 @@ export function configure(config: FrameworkConfiguration) { PLATFORM.moduleName('./add-ingredient-component/add-ingredient-component'), PLATFORM.moduleName('./copy-to-clipboard/copy-to-clipboard'), PLATFORM.moduleName('./icons/icon-arrow-forward.html'), - PLATFORM.moduleName('./icons/icon-chevron-forward.html') + PLATFORM.moduleName('./icons/icon-chevron-forward.html'), + PLATFORM.moduleName('./icons/icon-menu.html') ]); } diff --git a/src/data/cocktail-data.ts b/src/data/cocktail-data.ts index 7d9b6fd1..78eeb264 100644 --- a/src/data/cocktail-data.ts +++ b/src/data/cocktail-data.ts @@ -229,7 +229,8 @@ const cocktails: StaticCocktail[] = [ }, { id: '15', - imageSrc: 'images/placeholder.jpg', + imageSrc: 'images/frozen_margarita.png', + isImageAiGenerated: true, isImagePortrait: false, translation: 'frozen-margarita', category: DrinkCategory.Cocktail, @@ -2287,8 +2288,9 @@ const cocktails: StaticCocktail[] = [ }, { id: '167', - imageSrc: 'images/angel_face.jpg', + imageSrc: 'images/angel_face.png', isImagePortrait: false, + isImageAiGenerated: true, translation: 'angel-face', category: DrinkCategory.Cocktail, ingredientGroups: [ diff --git a/src/domain/entities/cocktail.ts b/src/domain/entities/cocktail.ts index 5b4d5541..eea56ba4 100644 --- a/src/domain/entities/cocktail.ts +++ b/src/domain/entities/cocktail.ts @@ -7,6 +7,7 @@ export class StaticCocktail { translation: string; imageSrc: string; isImagePortrait: boolean; + isImageAiGenerated?: boolean; category: DrinkCategory; ingredientGroups: IngredientGroup[]; tags: string[]; diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json index a68d742e..c8954506 100644 --- a/src/locales/en/translation.json +++ b/src/locales/en/translation.json @@ -169,5 +169,6 @@ "remove-from-favorites": "Remove from Favorites", "preferred-unit": "Preferred Unit", "christmas-title": "Christmas!", - "christmas-subtitle": "Explore christmas themed cocktails" + "christmas-subtitle": "Explore christmas themed cocktails", + "edit-cocktail": "Edit Cocktail" } diff --git a/src/long-press-event.js b/src/long-press-event.js index fb6ffeff..7142f409 100644 --- a/src/long-press-event.js +++ b/src/long-press-event.js @@ -268,9 +268,6 @@ } // hook events that clear a pending long press event - document.addEventListener('contextmenu', e => { - e.preventDefault(); - }); document.addEventListener(mouseUp, clearLongPressTimer, true); document.addEventListener(mouseLeave, clearLongPressTimer, true); document.addEventListener(mouseMove, mouseMoveHandler, true); diff --git a/static/images/angel_face.jpg b/static/images/angel_face.jpg deleted file mode 100644 index 00ba7649..00000000 Binary files a/static/images/angel_face.jpg and /dev/null differ diff --git a/static/images/angel_face.png b/static/images/angel_face.png new file mode 100644 index 00000000..9e92a877 Binary files /dev/null and b/static/images/angel_face.png differ diff --git a/static/images/frozen_margarita.png b/static/images/frozen_margarita.png new file mode 100644 index 00000000..225e791d Binary files /dev/null and b/static/images/frozen_margarita.png differ