From 12d1d9ba3d34588af5ba813b4f14b59732d4ae9e Mon Sep 17 00:00:00 2001 From: vishnuraghavb Date: Sat, 22 May 2021 14:26:31 +0530 Subject: [PATCH 1/4] cooking timer ongoing --- README.md | 2 +- app/app.scss | 75 +- app/components/CookingTimer.vue | 377 +++ app/components/EditRecipe.vue | 137 +- app/components/EnRecipes.vue | 130 +- app/components/MealPlanner.vue | 64 +- app/components/Settings/CTSettings.vue | 2 +- app/components/Settings/Database.vue | 269 +- app/components/Settings/Interface.vue | 4 +- app/components/Settings/MPSettings.vue | 75 + app/components/Settings/Options.vue | 14 +- app/components/Settings/Reset.vue | 34 +- app/components/SingleTimer.vue | 196 ++ app/components/ViewRecipe.vue | 131 +- .../modal/ActionDialogWithSearch.vue | 8 +- app/components/modal/CookingTimePicker.vue | 122 + .../modal/{ListPicker.vue => TimePicker.vue} | 7 +- app/fonts/enrecipes.ttf | Bin 14520 -> 16124 bytes app/main.ts | 10 +- app/resources/Android/app.gradle | 25 +- .../Android/src/main/AndroidManifest.xml | 16 +- .../res/drawable-hdpi/ic_stat_notify.webp | Bin 0 -> 954 bytes .../ic_stat_notify_silhouette.webp | Bin 0 -> 938 bytes .../main/res/drawable-ldpi/ic_launcher.webp | Bin 1612 -> 0 bytes .../src/main/res/drawable-ldpi/logo.webp | Bin 754 -> 0 bytes .../res/drawable-mdpi/ic_stat_notify.webp | Bin 0 -> 860 bytes .../ic_stat_notify_silhouette.webp | Bin 0 -> 852 bytes .../res/drawable-xhdpi/ic_stat_notify.webp | Bin 0 -> 1016 bytes .../ic_stat_notify_silhouette.webp | Bin 0 -> 1016 bytes .../res/drawable-xxhdpi/ic_stat_notify.webp | Bin 0 -> 1168 bytes .../ic_stat_notify_silhouette.webp | Bin 0 -> 1160 bytes .../res/drawable-xxxhdpi/ic_stat_notify.webp | Bin 0 -> 1350 bytes .../ic_stat_notify_silhouette.webp | Bin 0 -> 1336 bytes .../src/main/res/values-ar/strings.xml | 316 ++ .../src/main/res/values-ca/strings.xml | 423 +-- .../src/main/res/values-da/strings.xml | 21 + .../src/main/res/values-de/strings.xml | 21 + .../src/main/res/values-en-rIN/strings.xml | 316 ++ .../src/main/res/values-en-rUS/strings.xml | 316 ++ .../src/main/res/values-es-rAR/strings.xml | 316 ++ .../src/main/res/values-es/strings.xml | 21 + .../src/main/res/values-fi/strings.xml | 316 ++ .../src/main/res/values-fr-rBE/strings.xml | 35 +- .../src/main/res/values-fr-rCA/strings.xml | 35 +- .../src/main/res/values-fr-rCH/strings.xml | 35 +- .../src/main/res/values-fr/strings.xml | 107 +- .../src/main/res/values-hi/strings.xml | 21 + .../src/main/res/values-id/strings.xml | 21 + .../src/main/res/values-it/strings.xml | 25 +- .../src/main/res/values-ja/strings.xml | 316 ++ .../src/main/res/values-kn/strings.xml | 316 ++ .../src/main/res/values-ml/strings.xml | 21 + .../src/main/res/values-nb-rNO/strings.xml | 21 + .../src/main/res/values-night/styles.xml | 49 +- .../src/main/res/values-nl/strings.xml | 21 + .../src/main/res/values-pt-rBR/strings.xml | 43 +- .../src/main/res/values-pt/strings.xml | 247 +- .../src/main/res/values-ru/strings.xml | 21 + .../src/main/res/values-ta/strings.xml | 21 + .../src/main/res/values-te/strings.xml | 21 + .../Android/src/main/res/values/colors.xml | 3 + .../Android/src/main/res/values/strings.xml | 21 + .../Android/src/main/res/values/styles.xml | 49 +- app/shared/utils.js | 194 +- app/store.ts | 802 +++-- .../metadata/android/en-GB/changelogs/8.txt | 3 - nativescript.config.ts | 2 +- package-lock.json | 2620 ++++++++++++----- package.json | 17 +- types/references.d.ts | 2 +- 70 files changed, 7013 insertions(+), 1840 deletions(-) create mode 100644 app/components/CookingTimer.vue create mode 100644 app/components/Settings/MPSettings.vue create mode 100644 app/components/SingleTimer.vue create mode 100644 app/components/modal/CookingTimePicker.vue rename app/components/modal/{ListPicker.vue => TimePicker.vue} (94%) create mode 100644 app/resources/Android/src/main/res/drawable-hdpi/ic_stat_notify.webp create mode 100644 app/resources/Android/src/main/res/drawable-hdpi/ic_stat_notify_silhouette.webp delete mode 100644 app/resources/Android/src/main/res/drawable-ldpi/ic_launcher.webp delete mode 100644 app/resources/Android/src/main/res/drawable-ldpi/logo.webp create mode 100644 app/resources/Android/src/main/res/drawable-mdpi/ic_stat_notify.webp create mode 100644 app/resources/Android/src/main/res/drawable-mdpi/ic_stat_notify_silhouette.webp create mode 100644 app/resources/Android/src/main/res/drawable-xhdpi/ic_stat_notify.webp create mode 100644 app/resources/Android/src/main/res/drawable-xhdpi/ic_stat_notify_silhouette.webp create mode 100644 app/resources/Android/src/main/res/drawable-xxhdpi/ic_stat_notify.webp create mode 100644 app/resources/Android/src/main/res/drawable-xxhdpi/ic_stat_notify_silhouette.webp create mode 100644 app/resources/Android/src/main/res/drawable-xxxhdpi/ic_stat_notify.webp create mode 100644 app/resources/Android/src/main/res/drawable-xxxhdpi/ic_stat_notify_silhouette.webp create mode 100644 app/resources/Android/src/main/res/values-ar/strings.xml create mode 100644 app/resources/Android/src/main/res/values-en-rIN/strings.xml create mode 100644 app/resources/Android/src/main/res/values-en-rUS/strings.xml create mode 100644 app/resources/Android/src/main/res/values-es-rAR/strings.xml create mode 100644 app/resources/Android/src/main/res/values-fi/strings.xml create mode 100644 app/resources/Android/src/main/res/values-ja/strings.xml create mode 100644 app/resources/Android/src/main/res/values-kn/strings.xml delete mode 100644 fastlane/metadata/android/en-GB/changelogs/8.txt diff --git a/README.md b/README.md index 5a0978cc..cc79e3a5 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Translation status

-
You can also get the latest release on GitHub +
You can also get the latest release on GitHub

Enjoying EnRecipes?

Please consider making a small donation to help fund the project. Developing an application, especially one that is open source and completely free, takes a lot of time and effort. diff --git a/app/app.scss b/app/app.scss index 6741df01..885ddbb7 100644 --- a/app/app.scss +++ b/app/app.scss @@ -12,11 +12,11 @@ $gray10: #000000; $orange: #ff5200; Page { - font-family: "Inter-Medium"; + font-family: 'Inter-Medium'; font-size: 14; } .ico { - font-family: "enrecipes"; + font-family: 'enrecipes'; font-size: 24; vertical-alignment: center; &.sm { @@ -25,7 +25,7 @@ Page { } } .tb { - font-family: "Inter-Bold"; + font-family: 'Inter-Bold'; } .tac { text-align: center; @@ -180,7 +180,7 @@ TextView { .progressContainer { width: 100%; } -Progress { +progress { margin: 16; background-color: $gray5; } @@ -203,7 +203,7 @@ Switch { @extend .hl; } } -Button { +button { background-color: transparent; z-index: 0; padding: 8; @@ -240,7 +240,7 @@ Button { width: 32; height: 32; min-width: 0; - margin: 0 0 0 8; + margin: 0 0 0 4; vertical-alignment: center; } &.rate { @@ -253,7 +253,7 @@ Button { // HOME .emptyState { padding: 16 16 8; - Label { + label { @extend .tw; } .title { @@ -312,6 +312,25 @@ Button { border-radius: 12; } // ----------------------------- +// COOKING TIMER + +.singleTimer { + padding: 8 16; + .info { + margin: 8; + } + .recipeTitle { + horizontal-alignment: left; + // font-size: 12; + } + progress { + color: $orange; + width: 100%; + height: 4; + margin: 8 0 0; + } +} +// ----------------------------- // SETTINGS .group-info { padding: 16 16 16 72; @@ -334,9 +353,9 @@ Button { font-size: 12; } } - .listSpace { - height: 72; - } +} +.listSpace { + height: 72; } // ----------------------------- @@ -376,9 +395,9 @@ Button { @extend .tb; @extend .tw; } - .clickable { - color: $orange; - } +} +.clickable { + color: $orange; } .ingredient { padding: 0 16; @@ -452,7 +471,7 @@ Button { horizontal-alignment: left; .tool { padding: 0 12; - Label { + label { vertical-alignment: center; } .ico { @@ -509,7 +528,7 @@ Button { color: $orange; } .activeDay { - background-color: rgba($orange, 0.2); + @extend .hl; } } .dayPlan { @@ -549,7 +568,8 @@ Button { } ListPicker { width: 25%; - height: 160; + height: 128; + margin: 16 0; } .listItem { @extend .tw; @@ -596,19 +616,34 @@ ActivityIndicator { } // ----------------------------- // Transitions +.blink { + animation-name: blink; + animation-duration: 1s; + animation-iteration-count: infinite; + animation-timing-function: ease; +} +@keyframes blink { + 0% { + opacity: 0; + } + 50% { + opacity: 1; + } + 100% { + opacity: 0; + } +} .hl { animation-name: hl; animation-duration: 0.2s; animation-fill-mode: forwards; - animation-timing-function: ease-out; + animation-timing-function: ease; } @keyframes hl { 0% { - opacity: 0.5; background-color: transparent; } 100% { - opacity: 1; background-color: rgba($orange, 0.2); } } @@ -616,7 +651,7 @@ ActivityIndicator { animation-name: fade; animation-duration: 0.2s; animation-fill-mode: forwards; - animation-timing-function: ease-out; + animation-timing-function: ease; } @keyframes fade { 0% { diff --git a/app/components/CookingTimer.vue b/app/components/CookingTimer.vue new file mode 100644 index 00000000..af2d1054 --- /dev/null +++ b/app/components/CookingTimer.vue @@ -0,0 +1,377 @@ + + + diff --git a/app/components/EditRecipe.vue b/app/components/EditRecipe.vue index 588de825..c6512332 100644 --- a/app/components/EditRecipe.vue +++ b/app/components/EditRecipe.vue @@ -10,8 +10,8 @@