From 16d5c917d237c6df2867d88b7d817011300e888e Mon Sep 17 00:00:00 2001 From: Jose Olarte III Date: Mon, 9 Jun 2025 19:36:06 +0800 Subject: [PATCH 1/2] Updated QR scanner call - Searched for all other (outdated) calls to QR scanner dialog and updated them - Fixed vite HTML spec warning --- src/components/ImageMethodDialog.vue | 15 ++++++-- src/views/AccountViewView.vue | 25 +++++++++----- src/views/HelpView.vue | 51 ++++++++++++++++------------ src/views/HomeView.vue | 11 +++++- src/views/ProjectsView.vue | 11 +++++- 5 files changed, 79 insertions(+), 34 deletions(-) diff --git a/src/components/ImageMethodDialog.vue b/src/components/ImageMethodDialog.vue index a84641f1..7ccf6e30 100644 --- a/src/components/ImageMethodDialog.vue +++ b/src/components/ImageMethodDialog.vue @@ -242,12 +242,12 @@

Before you can upload a photo, a friend needs to register you.

- Share Your Info - + @@ -260,6 +260,7 @@ import axios from "axios"; import { ref } from "vue"; import { Component, Vue } from "vue-facing-decorator"; import VuePictureCropper, { cropper } from "vue-picture-cropper"; +import { Capacitor } from "@capacitor/core"; import { DEFAULT_IMAGE_API_SERVER, NotificationIface, @@ -709,6 +710,14 @@ export default class ImageMethodDialog extends Vue { toggleDiagnostics() { this.showDiagnostics = !this.showDiagnostics; } + + private handleQRCodeClick() { + if (Capacitor.isNativePlatform()) { + this.$router.push({ name: "contact-qr-scan-full" }); + } else { + this.$router.push({ name: "contact-qr" }); + } + } } diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue index f55a164e..44812c1c 100644 --- a/src/views/AccountViewView.vue +++ b/src/views/AccountViewView.vue @@ -44,12 +44,12 @@

- - - + + {{ givenName }} @@ -206,12 +206,12 @@ Before you can publicly announce a new project or time commitment, a friend needs to register you.

- Share Your Info - +

diff --git a/src/views/HelpView.vue b/src/views/HelpView.vue index 8ad8c484..fe2aec3e 100644 --- a/src/views/HelpView.vue +++ b/src/views/HelpView.vue @@ -215,7 +215,7 @@ Use these instructions. To start scanning, go to the - contact-scanning page. + contact-scanning page.

If they are not nearby to scan QR codes, you each can tap on the QR code @@ -502,27 +502,27 @@ then don't use it.
As for data & privacy: -

+

How can I contribute?

@@ -576,6 +576,7 @@ import { Component, Vue } from "vue-facing-decorator"; import { Router } from "vue-router"; import { useClipboard } from "@vueuse/core"; +import { Capacitor } from "@capacitor/core"; import * as Package from "../../package.json"; import QuickNav from "../components/QuickNav.vue"; @@ -632,5 +633,13 @@ export default class HelpView extends Vue { } this.$router.push({ name: "home" }); } + + private handleQRCodeClick() { + if (Capacitor.isNativePlatform()) { + this.$router.push({ name: "contact-qr-scan-full" }); + } else { + this.$router.push({ name: "contact-qr" }); + } + } } diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 1ce8e83a..0c69b60e 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -298,6 +298,7 @@ Raymer * @version 1.0.0 */ import { UAParser } from "ua-parser-js"; import { Component, Vue } from "vue-facing-decorator"; import { Router } from "vue-router"; +import { Capacitor } from "@capacitor/core"; //import App from "../App.vue"; import EntityIcon from "../components/EntityIcon.vue"; @@ -1765,7 +1766,7 @@ export default class HomeView extends Vue { this.$router.push({ name: "onboard-meeting-list" }); }, onOption2: () => { - this.$router.push({ name: "contact-qr" }); + this.handleQRCodeClick(); }, onOption3: () => { this.$router.push({ name: "share-my-contact-info" }); @@ -1872,5 +1873,13 @@ export default class HomeView extends Vue { -1, ); } + + private handleQRCodeClick() { + if (Capacitor.isNativePlatform()) { + this.$router.push({ name: "contact-qr-scan-full" }); + } else { + this.$router.push({ name: "contact-qr" }); + } + } } diff --git a/src/views/ProjectsView.vue b/src/views/ProjectsView.vue index 6b59749c..f3ebd5ba 100644 --- a/src/views/ProjectsView.vue +++ b/src/views/ProjectsView.vue @@ -268,6 +268,7 @@ import { AxiosRequestConfig } from "axios"; import { Component, Vue } from "vue-facing-decorator"; import { Router } from "vue-router"; +import { Capacitor } from "@capacitor/core"; import { NotificationIface, USE_DEXIE_DB } from "../constants/app"; import { db, retrieveSettingsForActiveAccount } from "../db/index"; @@ -559,7 +560,7 @@ export default class ProjectsView extends Vue { this.$router.push({ name: "share-my-contact-info" }); }, onYes: async () => { - this.$router.push({ name: "contact-qr" }); + this.handleQRCodeClick(); }, noText: "we will share another way", yesText: "we are nearby with cameras", @@ -603,5 +604,13 @@ export default class ProjectsView extends Vue { "hover:border-slate-400": !this.showProjects, }; } + + private handleQRCodeClick() { + if (Capacitor.isNativePlatform()) { + this.$router.push({ name: "contact-qr-scan-full" }); + } else { + this.$router.push({ name: "contact-qr" }); + } + } } From 1b2d4b623a24d43fd4e1f9b21b8b65e209a15efa Mon Sep 17 00:00:00 2001 From: Jose Olarte III Date: Mon, 9 Jun 2025 20:20:17 +0800 Subject: [PATCH 2/2] Turned off automatic safe area in iOS - Safe area implementations will solely depend on CSS styles for full control - Eliminates doubled top and bottom padding in iOS --- capacitor.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capacitor.config.json b/capacitor.config.json index f43f3ea3..262f9ccd 100644 --- a/capacitor.config.json +++ b/capacitor.config.json @@ -32,7 +32,7 @@ } }, "ios": { - "contentInset": "always", + "contentInset": "never", "allowsLinkPreview": true, "scrollEnabled": true, "limitsNavigationsToAppBoundDomains": true,