Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Hosted Weblate 2021-06-30 14:16:51 +02:00
commit c93c0db8a9
No known key found for this signature in database
GPG key ID: A3FAAA06E6569B4C
6 changed files with 127 additions and 96 deletions

View file

@ -1,12 +1,12 @@
## :warning: Important Notice :warning:
#### :warning: IMPORTANT NOTICE for users with EnRecipes v1.3.2 or before:
To continue receiving updates, please update your EnRecipes to v2.0.0
To continue receiving updates, please update your EnRecipes to the latest version.
There are some significant changes in this version. So, in order to continue, you must do the following:
1. Export a full backup.
2. Uninstall EnRecipes.
3. Install v2.0.0 and Import your data.
3. Install this version and Import your data.
<p align="center"><a href="https://enrecipes.vercel.app"><img src="fastlane/metadata/android/en-US/images/featureGraphic.png" width="100%"></a></p>

View file

@ -155,7 +155,7 @@
col="2"
:text="`${recipe.ingredients[i].unit}` | L"
editable="false"
@focus="showUnits(1, i)"
@focus="!modalOpen && showUnits(1, i)"
@tap="showUnits(0, i)"
/>
<TextField
@ -714,6 +714,7 @@ export default {
});
},
showUnits(focus, i) {
this.modalOpen = 1;
this.$showModal(Action, {
props: {
title: "Unit",
@ -722,6 +723,7 @@ export default {
selected: this.recipe.ingredients[i].unit,
},
}).then((action) => {
this.modalOpen = 0;
if (action == "aNBtn") {
this.$showModal(Prompt, {
props: {

View file

@ -608,6 +608,7 @@ export default {
},
pgUnload() {
if (this.shake) stopAccelerometerUpdates();
this.releaseBackEvent();
},
abLoad({ object }) {
this.appbar = object;

View file

@ -66,7 +66,7 @@
:class="{ r: RTL }"
>
<RLabel class="sub" :text="'ts' | L" />
<RLabel class="v" :text="getTags(recipe.tags)" />
<RLabel class="v" :text="getTags" />
</StackLayout>
<RGridLayout :rtl="RTL" rows="auto" columns="*, *">
<StackLayout class="attrT" :hidden="!hasTime(recipe.prepTime)">
@ -120,7 +120,7 @@
<RLabel
class="v tw"
:class="{ 'tb t t3': !item.type }"
:text="getIngredientItem(item)"
:text="getIng(item)"
/>
</RStackLayout>
</StackLayout>
@ -234,7 +234,7 @@
col="2"
v-else
class="ico"
:text="icon.done"
:text="recipeTried ? icon.try : icon.done"
@tap="toggle('tried', 1)"
/>
<Button
@ -318,7 +318,6 @@ import * as utils from "~/shared/utils";
const Intl = require("nativescript-intl");
let barTimer;
declare const android: any;
export default {
components: { Toast },
props: ["filterTrylater", "recipeID", "yieldQuantity"],
@ -348,6 +347,8 @@ export default {
view: null,
wv: null,
showTools: 0,
snackMsg: null,
recipeTried: 0,
};
},
computed: {
@ -378,6 +379,9 @@ export default {
hasPrinterSupport() {
return utils.Printer.isSupported();
},
getTags() {
return this.recipe.tags.join(" · ");
},
},
methods: {
...mapActions(["toggleState", "setR"]),
@ -392,6 +396,7 @@ export default {
},
onPageUnload() {
utils.keepScreenOn(0);
if (this.recipeTried) this.markTried();
},
sbload({ object }) {
this.sidebar = object;
@ -401,7 +406,7 @@ export default {
},
tbLoad({ object }) {
this.toastbar = object;
this.recipe.tried && this.recipe.lastTried && this.showLastTried();
this.recipe.lastTried && this.showLastTried();
},
wvLoad({ object }) {
this.wv = object;
@ -527,7 +532,7 @@ export default {
let text = s && !unsel ? ` (${s}/${c})` : ` (${c})`;
return localize(title) + text;
},
getIngredientItem(o) {
getIng(o) {
return `${
this.roundedQuantity(o.quantity)
? this.roundedQuantity(o.quantity) + " "
@ -614,10 +619,6 @@ export default {
minute: "numeric",
}).format(new Date(date));
},
isValidURL(string) {
let pattern = new RegExp("^https?|^www", "ig");
return pattern.test(string);
},
getCombinationTitle(id) {
return this.recipes.filter((e) => e.id === id)[0].title;
},
@ -692,6 +693,22 @@ export default {
},
// NavigationHandlers
hijackBackEvent() {
Application.android.on(
AndroidApplication.activityBackPressedEvent,
this.backEvent
);
},
releaseBackEvent() {
Application.android.off(
AndroidApplication.activityBackPressedEvent,
this.backEvent
);
},
backEvent(args) {
args.cancel = true;
this.closePhoto();
},
editRecipe() {
this.busyEdit = 1;
this.$navigateTo(EditRecipe, {
@ -714,7 +731,7 @@ export default {
this.syncCombinations();
this.createNotes();
this.yieldMultiplier = this.recipe.yieldQuantity;
this.recipe.tried && this.recipe.lastTried && this.showLastTried();
this.recipe.lastTried && this.showLastTried();
},
// Tools
@ -767,60 +784,76 @@ export default {
}
},
shareRecipe() {
let overview = `${this.recipe.title}\n\n`;
if (this.recipe.rating)
overview += `${localize("stars")}: ${this.recipe.rating}\n`;
overview += `${localize("cui")}: ${localize(
this.recipe.cuisine
)}\n${localize("cat")}: ${localize(this.recipe.category)}\n`;
if (this.recipe.tags.length)
overview += `${localize("ts")}: ${this.recipe.tags.join(", ")}\n`;
if (this.recipe.prepTime != "00:00")
overview += `${localize("prepT")}: ${this.formattedTime(
this.recipe.prepTime
)}\n`;
if (this.recipe.cookTime != "00:00")
overview += `${localize("cookT")}: ${this.formattedTime(
this.recipe.cookTime
)}\n`;
let r = this.recipe;
let overview = `${r.title}\n\n`;
if (r.rating) overview += `${localize("stars")}: ${r.rating}\n`;
overview += `${localize("cui")}: ${localize(r.cuisine)}\n${localize(
"cat"
)}: ${localize(r.category)}\n`;
if (r.tags.length)
overview += `${localize("ts")}: ${r.tags.join(", ")}\n`;
if (r.prepTime != "00:00")
overview += `${localize("prepT")}: ${this.formattedTime(r.prepTime)}\n`;
if (r.cookTime != "00:00")
overview += `${localize("cookT")}: ${this.formattedTime(r.cookTime)}\n`;
overview += `${localize("yld")}: ${this.tempYieldQuantity} ${localize(
this.recipe.yieldUnit
)}\n${localize("Difficulty level")}: ${localize(
this.recipe.difficulty
)}\n`;
r.yieldUnit
)}\n${localize("Difficulty level")}: ${localize(r.difficulty)}\n`;
let shareContent = overview;
if (this.recipe.ingredients.length) {
if (r.ingredients.length) {
let ingredients = `\n\n${localize("ings")}:\n\n`;
this.recipe.ingredients.forEach((e) => {
ingredients += `- ${
e.quantity
? this.roundedQuantity(e.quantity) +
" " +
this.$options.filters.L(e.unit) +
" "
: ""
}${e.value}\n`;
r.ingredients.forEach((e) => {
if (e.type) {
ingredients += `- ${
e.quantity
? this.roundedQuantity(e.quantity) +
" " +
localize(e.unit) +
" "
: ""
}${e.value}\n`;
} else {
ingredients += `\n${
e.quantity
? this.roundedQuantity(e.quantity) +
" " +
localize(e.unit) +
" "
: ""
}${e.value}\n\n`;
}
});
shareContent += ingredients;
}
if (this.recipe.instructions.length) {
let ins = r.instructions;
if (ins.length) {
let a = 1;
let b = 1;
let group = ins.reduce((acc, e) => {
if (!e.type) {
a = 1;
acc.push(b++);
} else acc.push(a++);
return acc;
}, []);
let instructions = `\n\n${localize("inss")}:\n\n`;
this.recipe.instructions.forEach((e, i) => {
instructions += `${i + 1}. ${e.value}\n\n`;
});
ins.forEach(
(e, i) =>
(instructions += (e.type ? group[i] + ". " : "") + `${e.value}\n\n`)
);
shareContent += instructions;
}
if (this.recipe.combinations.length) {
if (r.combinations.length) {
let combinations = `\n${localize("cmbs")}:\n\n`;
this.recipe.combinations.forEach((e, i) => {
r.combinations.forEach((e, i) => {
combinations += `${i + 1}. ${this.getCombinationTitle(e)}\n\n`;
});
shareContent += combinations;
}
if (this.recipe.notes.length) {
if (r.notes.length) {
let notes = `\n${localize("nos")}:\n\n`;
this.recipe.notes.forEach((e, i) => {
r.notes.forEach((e, i) => {
notes += `${i + 1}. ${e.value}\n\n`;
});
shareContent += notes;
@ -831,19 +864,25 @@ export default {
},
// DataHandlers
toggle(key: string, setDate: boolean) {
toggle(key: string, setDate: number) {
console.log(setDate);
if (setDate) {
this.recipeTried = !this.recipeTried;
} else
this.toggleState({
id: this.currentRecipeID,
key,
setDate,
});
},
markTried() {
this.toggleState({
id: this.currentRecipeID,
key,
setDate,
key: "tried",
setDate: 1,
});
if (setDate) this.$navigateBack();
},
touchRate({ object, action }, r) {
this.touchFade(object, action);
if (action == "up") this.setRating(r);
},
setRating(r) {
rate(r) {
if (r !== this.recipe.rating || r === 1) {
if (this.recipe.rating == 1 && r == 1) r = 0;
this.setR({
@ -853,8 +892,6 @@ export default {
}
},
// ShoppingList
// Notes
createNote(note) {
let regex = /(https?:\/\/[^\s]+)/g;
@ -887,27 +924,12 @@ export default {
stack.addChild(this.createNote(note.value))
);
},
getTags(tags) {
return tags.join(" · ");
},
hijackBackEvent() {
Application.android.on(
AndroidApplication.activityBackPressedEvent,
this.backEvent
);
},
releaseBackEvent() {
Application.android.off(
AndroidApplication.activityBackPressedEvent,
this.backEvent
);
},
backEvent(args) {
if (this.photoOpen) {
args.cancel = true;
this.closePhoto();
} else this.$navigateBack();
isValidURL(s) {
let pattern = new RegExp("^https?|^www", "ig");
return pattern.test(s);
},
// PhotoViewer
viewPhoto() {
this.hideBars();
this.photoOpen = 1;
@ -978,7 +1000,7 @@ export default {
});
},
//DuplicateRecipe
// Duplicate
duplicateRecipe() {
this.busyDup = 1;
let dupRecipe = Object.assign({}, this.recipe);
@ -1011,9 +1033,9 @@ export default {
i < ings.length - 1 ? "<ul>" : ""
}`;
else
return `${i < 1 ? "<ul>" : ""}<li>${this.getIngredientItem(
e
)}</li>${i == ings.length - 1 ? "</ul>" : ""}`;
return `${i < 1 ? "<ul>" : ""}<li>${this.getIng(e)}</li>${
i == ings.length - 1 ? "</ul>" : ""
}`;
})
.join("");
};
@ -1069,7 +1091,7 @@ export default {
r.tags.length
? `<div class=attr><div style="grid-column:span 2"><p>${localize(
"ts"
)}<p>${this.getTags(r.tags)}</div></div>`
)}<p>${this.getTags}</div></div>`
: ""
} ${
this.hasTime(r.prepTime) || this.hasTime(r.cookTime)
@ -1123,6 +1145,10 @@ export default {
},
// Helpers
touchRate({ object, action }, r) {
this.touchFade(object, action);
if (action == "up") this.rate(r);
},
touchYield({ object, action }) {
this.touchFade(object, action);

View file

@ -1173,16 +1173,16 @@ export default new Vuex.Store({
}
},
toggleState(state, { id, key, setDate }) {
let i = state.recipes.findIndex((e) => e.id == id)
state.recipes[i][key] = state.recipes[i][key] ? 0 : 1
let res = state.recipes
let i = res.findIndex((e) => e.id == id)
state.recipes[i][key] = +!res[i][key]
db.execute(
`UPDATE recipes SET ${key} = ${state.recipes[i][key]} WHERE id = '${id}'`
`UPDATE recipes SET ${key} = ${res[i][key]} WHERE id = '${id}'`
)
if (setDate) {
state.recipes[i].lastTried = new Date().getTime()
db.execute(
`UPDATE recipes SET lastTried = ${state.recipes[i].lastTried} WHERE id = '${id}'`
)
let time = new Date().getTime()
state.recipes[i].lastTried = time
db.execute(`UPDATE recipes SET lastTried = ${time} WHERE id = '${id}'`)
}
},
// UnLinkCombinations

View file

@ -1,3 +1,5 @@
IMPORTANT NOTICE for users with EnRecipes v1.3.2 or before:
To continue receiving updates, please update your EnRecipes to this version.
There are some significant changes in this version. So, in order to continue, you must do the following: