From 1d7bca959e820ccf4f1317106dfe8afa73ecd527 Mon Sep 17 00:00:00 2001 From: Vishnu Raghav B Date: Sat, 24 Oct 2020 23:32:35 +0530 Subject: [PATCH] implemented couchbase, fs image import, zip export --- app/App_Resources/Android/app.gradle | 8 + app/app.scss | 43 +- app/components/App.vue | 66 +- app/components/EditRecipe.vue | 141 +- app/components/EnRecipes.vue | 97 +- app/components/Settings.vue | 28 +- app/components/ViewRecipe.vue | 88 +- app/components/modal/ActionDialog.vue | 19 +- app/components/modal/ConfirmDialog.vue | 18 +- app/components/modal/PromptDialog.vue | 44 +- app/store.js | 341 +- package-lock.json | 4499 +++++++++++------------- package.json | 3 +- 13 files changed, 2503 insertions(+), 2892 deletions(-) diff --git a/app/App_Resources/Android/app.gradle b/app/App_Resources/Android/app.gradle index 6ccc08e5..57c89209 100644 --- a/app/App_Resources/Android/app.gradle +++ b/app/App_Resources/Android/app.gradle @@ -9,10 +9,18 @@ // e.g. project.ext.googlePlayServicesVersion = "15.0.1" // create a file named before-plugins.gradle in the current directory and place it there + +// abiFilter "arm64-v8a" "armeabi-v7a" "x86" "x86_64" + + android { defaultConfig { minSdkVersion 23 generatedDensities = [] + ndk { + abiFilters.clear() + abiFilters.addAll(['arm64-v8a','x86']) + } } aaptOptions { additionalParameters "--no-version-vectors" diff --git a/app/app.scss b/app/app.scss index 2e077ac2..fbabe82e 100644 --- a/app/app.scss +++ b/app/app.scss @@ -71,7 +71,8 @@ Page { color: $grayD4; } } - .view-imageHolder { + .view-imageHolder, + .recipeImgContainer { color: $grayL1; background: $grayL2; } @@ -126,7 +127,8 @@ Page { color: $grayL4; } } - .view-imageHolder { + .view-imageHolder, + .recipeImgContainer { color: $grayD4; background: #111; } @@ -239,7 +241,7 @@ RadListView { margin: 8 16; border-radius: 6; .recipe-info { - margin: 4 0; + margin: 4; } .recipe-cat { font-size: 12; @@ -255,15 +257,31 @@ RadListView { .recipe-time { padding: 0; } - .recipe-favorite { - font-size: 12; - padding: 14 8 0 0; - } - .recipe-cat, - .recipe-favorite { + .recipe-cat { color: $orange; } } +.noResults { + width: 100%; + font-size: 16; + line-height: 8; + padding: 32 16; + text-align: center; +} +.swipe-item { + margin: 0 8; + background: #c62828; + color: #fff; + height: 128; + border-radius: 6; +} +.recipeImgContainer { + vertical-alignment: center; + // prettier-ignore + Image { + border-radius: 6 0 0 6; + } +} // Settings .group-header { @@ -372,13 +390,13 @@ RadListView { } // Edit Recipe .fab-button { - color: white; + color: #fff; height: 56; width: 56; background-color: #ff7043; horizontal-align: center; vertical-align: center; - border-radius: 100; + border-radius: 28; padding: 16; margin: 16; } @@ -411,6 +429,9 @@ RadListView { padding: 24 24 12; font-size: 20; } + .dialogInputField { + padding: 0 24 16; + } .dialogDescription { font-size: 16; padding: 0 24 16; diff --git a/app/components/App.vue b/app/components/App.vue index 63d99571..7a56e01d 100644 --- a/app/components/App.vue +++ b/app/components/App.vue @@ -34,6 +34,7 @@ class="sd-group-header orkm" rows="auto" columns="*, auto" + v-if="categories.length" >