diff --git a/app/app.scss b/app/app.scss
index f6142399..377b90b8 100644
--- a/app/app.scss
+++ b/app/app.scss
@@ -43,7 +43,8 @@ Page {
color: $gray9;
background: $gray1;
Page,
- .filters {
+ .filters,
+ .sticky {
background: $gray1;
}
TextField,
@@ -72,14 +73,15 @@ Page {
background: $gray9;
}
.fab {
- color: $gray1;
+ color: #fff;
}
}
.Dark {
color: $gray1;
background: $gray9;
Page,
- .filters {
+ .filters,
+ .sticky {
background: $gray9;
}
TextField,
@@ -116,7 +118,8 @@ Page {
color: $gray2;
background: $gray10;
Page,
- .filters {
+ .filters,
+ .sticky {
background: $gray10;
}
TextField,
@@ -476,6 +479,11 @@ Button {
padding: 0;
margin: 32 0 16;
}
+.sticky {
+ width: 100%;
+ padding: 0 16 16;
+ margin: 0;
+}
.countdown {
font-size: 17;
color: $orange;
diff --git a/app/components/EditRecipe.vue b/app/components/EditRecipe.vue
index e4ec6ef5..a932923e 100644
--- a/app/components/EditRecipe.vue
+++ b/app/components/EditRecipe.vue
@@ -419,17 +419,21 @@ export default {
this.clearEmptyFields(true);
if (this.recipe.imageSrc) {
this.modalOpen = true;
- this.$showModal(ConfirmDialog, {
+ this.$showModal(ActionDialog, {
props: {
title: "recPic",
- secondButtonText: "rBtn",
- cancelButtonText: "cBtn",
- okButtonText: "repBtn",
+ list: ["aap", "rp"],
},
}).then((action) => {
this.modalOpen = false;
- if (action > 0) this.imagePicker();
- else if (action < 0) this.recipe.imageSrc = null;
+ switch (action) {
+ case "aap":
+ this.imagePicker();
+ break;
+ case "rp":
+ this.recipe.imageSrc = null;
+ break;
+ }
});
} else this.imagePicker();
},
diff --git a/app/components/Settings.vue b/app/components/Settings.vue
index 90c8a9a0..ce61445d 100644
--- a/app/components/Settings.vue
+++ b/app/components/Settings.vue
@@ -42,7 +42,6 @@ import Interface from "./Settings/Interface.vue";
import Options from "./Settings/Options.vue";
import Database from "./Settings/Database.vue";
import Reset from "./Settings/Reset.vue";
-import Help from "./Settings/Help.vue";
import About from "./Settings/About.vue";
export default {
data() {
diff --git a/app/components/Settings/Database.vue b/app/components/Settings/Database.vue
index e74edf19..09c76b81 100644
--- a/app/components/Settings/Database.vue
+++ b/app/components/Settings/Database.vue
@@ -270,12 +270,15 @@ export default {
// IMPORT HANDLERS
openZipFile() {
utils.getBackupFile().then((uri) => {
- let dest = path.join(knownFolders.temp().path, "tempUnZip");
- utils.Zip.unzip(uri, dest)
- .then((res) => {
- if (res) this.validateZipContent(res, uri);
- })
- .catch(() => this.failedImport(localize("buInc")));
+ console.log(uri);
+ if (uri) {
+ let dest = path.join(knownFolders.temp().path, "tempUnZip");
+ utils.Zip.unzip(uri, dest)
+ .then((res) => {
+ if (res) this.validateZipContent(res, uri);
+ })
+ .catch(() => this.failedImport(localize("buInc")));
+ }
});
},
validateZipContent(extractedFolderPath, uri) {
diff --git a/app/components/Settings/Help.vue b/app/components/Settings/Help.vue
deleted file mode 100644
index f9d15120..00000000
--- a/app/components/Settings/Help.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/components/ViewRecipe.vue b/app/components/ViewRecipe.vue
index ff5a3360..708bb10b 100644
--- a/app/components/ViewRecipe.vue
+++ b/app/components/ViewRecipe.vue
@@ -35,138 +35,161 @@
@tap="viewPhoto"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
e == false;
+ // if (this.recipe.notes.length && isTop(this.notesT)) {
+ // this.showTitleArr = [false, false, false, true];
+ // } else if (this.recipe.combinations.length && isTop(this.cmbcon)) {
+ // this.showTitleArr = [false, false, true, false];
+ // } else if (this.recipe.instructions.length && isTop(this.inscon)) {
+ // this.showTitleArr = [false, true, false, false];
+ // } else if (this.recipe.ingredients.length && isTop(this.ingcon)) {
+ // this.showTitleArr = [true, false, false, false];
+ // } else {
+ // this.showTitleArr = [false, false, false, false];
+ // }
+ // if (
+ // this.recipe.ingredients.length &&
+ // !this.showTitleArr[0] &&
+ // isTop(this.ingcon)
+ // ) {
+ // this.showTitleArr = [true, false, false, false];
+ // } else if (!this.showTitleArr.every(isAllFalse) && !isTop(this.ingcon)) {
+ // this.showTitleArr = [false, false, false, false];
+ // }
+ },
onScroll(args) {
let scrollUp;
let y = args.scrollY;
@@ -349,6 +412,7 @@ export default {
duration: 250,
curve: CoreTypes.AnimationCurve.ease,
});
+ // this.stickyTitle(args);
}
},
// HELPERS
@@ -482,7 +546,7 @@ export default {
clearChecks() {
this.checked = 0;
this.checks = [];
- for (let i = 0; i < this.ingcon.getChildrenCount(); i++) {
+ for (let i = 1; i < this.ingcon.getChildrenCount(); i++) {
this.ingcon.getChildAt(i).getChildAt(0).text = this.icon.uncheck;
}
},
@@ -505,7 +569,7 @@ export default {
},
clearSteps() {
this.stepsDid = 0;
- for (let i = 0; i < this.inscon.getChildrenCount(); i++) {
+ for (let i = 1; i < this.inscon.getChildrenCount(); i++) {
this.inscon.getChildAt(i).className = "instruction";
}
},
diff --git a/app/components/modal/ConfirmDialog.vue b/app/components/modal/ConfirmDialog.vue
index dbcadc5d..5ed88b19 100644
--- a/app/components/modal/ConfirmDialog.vue
+++ b/app/components/modal/ConfirmDialog.vue
@@ -1,5 +1,9 @@
-
+
-
-
+