diff --git a/README.md b/README.md
index b29fcc19..9c297a2e 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,13 @@
+## :warning: Important Notice :warning:
+
+To continue receiving updates, please update your EnRecipes to v2.0.0
+
+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.
+
A Simple, Offline Recipe Manager
@@ -15,7 +25,7 @@
Important Links
-User Guide - Privacy Policy - Contribution Guide - Roadmap - Telegram Group - Website
+User Guide · Privacy Policy · Contribution Guide · Roadmap · Telegram Group · Website
## Features
@@ -32,7 +42,7 @@
- Create meal plans
- Set cooking timers
- You can Import or Export your data
-- Has Light, Dark and Black themes
+- Light, Dark and Black themes
## Highlights
@@ -41,10 +51,6 @@
- No special permissions required
- No annoying ads or pop-ups
-**Languages being translated**:
-
-[![Translation status](https://hosted.weblate.org/widgets/enrecipes/-/app-translations/multi-auto.svg)](https://hosted.weblate.org/engage/enrecipes/)
-
Check the [Roadmap](https://github.com/vishnuraghavb/EnRecipes/projects/1) for upcoming features.
Please read the [User Guide](https://github.com/vishnuraghavb/EnRecipes/wiki/User-Guide) to get the most out of EnRecipes.
@@ -55,11 +61,11 @@ Please read the [User Guide](https://github.com/vishnuraghavb/EnRecipes/wiki/Use
| :---------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------: |
| **Home - Light theme** | **Home - Dark theme** |
| | |
-| **Home - Black theme** | **Recipe view** |
+| **Recipe view** | **Scale ingredients** |
| | |
-| **Share menu** | **Scale ingredients** |
+| **Share menu** | **Meal Planner** |
| | |
-| **Meal planner** | **About** |
+| **Cooking Timer** | **About** |
## Contribution
@@ -75,19 +81,52 @@ You can,
- [Join the Telegram group](http://t.me/enrecipes) (quicker replies)
- Contact me at apps@vishnuraghav.com
-### Looking to translate the app to your own language?
+### Looking to translate EnRecipes?
EnRecipes is being translated using [Weblate](https://hosted.weblate.org/engage/enrecipes/). See [translation instructions](https://github.com/vishnuraghavb/EnRecipes/wiki/Translation-Instructions) in the wiki for more information.
-
+
+
+
## Credits
This app was written in my free time using NativeScript-Vue. I would like to thank all those people who helped me understand the concepts during the process and my special thanks to the NativeScript team and the community. I also would like to thank the members of the [EnRecipes Telegram group](https://t.me/enrecipes) for contributing their ideas for this project.
-### Recipes used in the Screenshots
+### Translation credits
+
+| Language | Translator(s) |
+| ------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Arabic | [phwright](https://hosted.weblate.org/user/phwright/) |
+| Catalan | J. Lavoie |
+| Danish | [mondstern](https://hosted.weblate.org/user/mondstern/), Henrik Dankvardt, J. Lavoie, Allan Nordhøy, Jonas Hansen |
+| Dutch | Heimen Stoffels |
+| English (India) | Vishnu Raghav B |
+| English (United Kingdom) | Vishnu Raghav B |
+| English (United States) | Vishnu Raghav B |
+| Finnish | J. Lavoie |
+| French | J. Lavoie, Swann Fournial, fabeuss, [mondstern](https://hosted.weblate.org/user/mondstern/) |
+| French (Canada) | Swann Fournial, J. Lavoie |
+| French (Switzerland) | Swann Fournial, J. Lavoie |
+| French (Belgium) | Swann Fournial, J. Lavoie |
+| German | J. Lavoie, nautilusx, Swann Fournial |
+| Hindi | Vishnu Raghav B, V |
+| Indonesian | Reza Almanda, [mondstern](https://hosted.weblate.org/user/mondstern/) |
+| Italian | J. Lavoie, [mondstern](https://hosted.weblate.org/user/mondstern/), Andrea Ghensi |
+| Japanese | Y. Sakamoto, K. Herbert |
+| Malayalam | Vishnu Raghav B |
+| Norwegian Bokmål | Allan Nordhøy, [mondstern](https://hosted.weblate.org/user/mondstern/), Lars A Reinton |
+| Portuguese | Sérgio Morais, [mondstern](https://hosted.weblate.org/user/mondstern/), J. Lavoie |
+| Portuguese (Brazil) | [mondstern](https://hosted.weblate.org/user/mondstern/), Sérgio Morais, Wesley, Ricardo Zamarrenho Carvalho Correa, J. Lavoie, Nínive de Jesus Celestino, emmanuel einstein campos vasconcelos, Fabio Oliveira |
+| Russian | dm9pZCAq, [mondstern](https://hosted.weblate.org/user/mondstern/), Leca |
+| Spanish | taraletti, J. Lavoie, Sansom, [mondstern](https://hosted.weblate.org/user/mondstern/), Diego |
+| Spanish (Argentina) | another-sapiens |
+| Tamil | Vishnu Raghav B |
+
+### Screenshot recipe credits
- **Meen Pollichathu** by [Bency Veronica](https://www.instagram.com/bencys_lil_kitchen)
- **Curd Vada** by P. Shanmugalakshmi
diff --git a/app/app.scss b/app/app.scss
index 60c61cee..7ce68960 100644
--- a/app/app.scss
+++ b/app/app.scss
@@ -54,7 +54,6 @@ Page {
color: $gray9;
background: $gray1;
Page,
- .filters,
.sticky {
background: $gray1;
}
@@ -79,7 +78,7 @@ Page {
color: $gray3;
background: $gray2;
}
- .snackBar {
+ .snackbar {
color: $gray1;
background: $gray9;
}
@@ -91,7 +90,6 @@ Page {
color: $gray1;
background: $gray9;
Page,
- .filters,
.sticky {
background: $gray9;
}
@@ -116,7 +114,7 @@ Page {
color: $gray9;
background: $gray10;
}
- .snackBar {
+ .snackbar {
color: $gray9;
background: $gray1;
}
@@ -128,7 +126,6 @@ Page {
color: $gray2;
background: $gray10;
Page,
- .filters,
.sticky {
background: $gray10;
}
@@ -153,7 +150,7 @@ Page {
color: $gray10;
background: $gray9;
}
- .snackBar {
+ .snackbar {
color: $gray10;
background: $gray2;
}
@@ -179,7 +176,7 @@ TextView {
line-height: 4;
}
#search {
- padding: 13 12;
+ padding: 13 8;
}
.inputC {
margin-bottom: 24;
@@ -414,26 +411,23 @@ ActivityIndicator {
// AppBar
.appbar {
- margin: 8;
- padding: 4;
+ margin: 0 8 8;
border-radius: 16;
- .fab {
- margin-left: 8;
+ padding: 2;
+ .ico {
+ margin: 2;
}
}
-.sidebar {
- margin-bottom: 0;
-}
.toolbar {
- vertical-align: bottom;
height: 1;
+ vertical-align: bottom;
transform: translateY(48);
+ padding: 4 2;
.tool {
- padding: 0 8;
orientation: horizontal;
+ padding: 0 8;
}
- .v,
- .ico {
+ .v {
padding: 0 4;
}
}
@@ -459,15 +453,15 @@ ActivityIndicator {
// -----------------------------
// MealPlanner
.calendar {
- padding: 0 16;
+ padding: 0 16 16;
.accent.sub {
color: rgba($orange, 0.6);
}
}
.plans {
- margin: 16 16 0;
+ margin: 0 16;
.date {
- margin: 16 0 8;
+ padding: 16 0 8;
}
.type {
padding: 8 0;
diff --git a/app/components/CookingTimer.vue b/app/components/CookingTimer.vue
index 8c16dd1b..24eaf053 100644
--- a/app/components/CookingTimer.vue
+++ b/app/components/CookingTimer.vue
@@ -38,8 +38,8 @@
:hidden="showUndo"
columns="auto, *, auto"
>
-
-
+
+
-
+
-
+
@@ -306,7 +306,7 @@
class="tool"
@touch="touchTool($event, item.comp, item.title)"
>
-
+
@@ -320,10 +320,7 @@
@touch="() => null"
>
{
this.toolbar.animate({
- height: 104,
+ height: 52 * this.tbItems.length + 8,
duration: 200,
translate: { x: 0, y: 0 },
curve: CoreTypes.AnimationCurve.easeOut,
@@ -734,7 +731,6 @@ export default {
// ListHandlers
addToSelection(id) {
this.showTools && this.toggleTools();
-
this.selectMode = 1;
this.appbar.translateY = 0;
this.selection.includes(id)
@@ -872,9 +868,7 @@ export default {
}
return count && this.localeN(count);
},
- centerLabel({ object }) {
- object.android.setGravity(17);
- },
+
focusField({ object }) {
if (this.RTL) object.android.setGravity(5);
setTimeout((e) => {
diff --git a/app/components/MealPlanner.vue b/app/components/MealPlanner.vue
index cffa375e..37b8a87f 100644
--- a/app/components/MealPlanner.vue
+++ b/app/components/MealPlanner.vue
@@ -1,7 +1,8 @@
-
+
@@ -72,7 +74,7 @@
:rtl="RTL"
class="plan vc"
columns="auto, *, auto"
- @touch="!edit && touchRecipe"
+ @touch="!edit && touchRecipe($event)"
@tap="!edit && viewRecipe(item.id)"
>
-
-
+
+
@@ -118,7 +115,7 @@
@@ -127,7 +124,7 @@
col="2"
class="ico si"
:text="icon.x"
- @tap="removeRecipe(item.id)"
+ @tap="removePlan(item.id)"
/>
@@ -174,7 +171,12 @@
@tap="hasRecipes ? toggleEditMode() : randomMealPlan()"
col="3"
/> -->
-
+