From 1dba2debc51bb4089567d05af5c549b3cc68cba1 Mon Sep 17 00:00:00 2001 From: MartinBraquet Date: Mon, 3 Nov 2025 20:27:32 +0100 Subject: [PATCH] Clean --- android/app/build.gradle | 2 +- capacitor.config.ts | 8 +++++--- common/src/envs/constants.ts | 4 ++-- common/src/hosting/constants.ts | 5 +++-- scripts/build_sync_android.sh | 2 ++ web/pages/_app.tsx | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 1ae30ca..4b07492 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -8,7 +8,7 @@ android { applicationId "com.compassconnections.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 4 + versionCode 5 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { diff --git a/capacitor.config.ts b/capacitor.config.ts index e138bb8..fa7fac6 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -1,13 +1,15 @@ import type { CapacitorConfig } from '@capacitor/cli'; -const LOCAL_ANDROID = process.env.NEXT_PUBLIC_LOCAL_ANDROID === '1' -console.log("LOCAL_ANDROID in CapacitorConfig", LOCAL_ANDROID) +const WEBVIEW_DEV_PHONE = process.env.NEXT_PUBLIC_WEBVIEW_DEV_PHONE === '1' +const LOCAL_ANDROID = WEBVIEW_DEV_PHONE || process.env.NEXT_PUBLIC_LOCAL_ANDROID === '1' +const LOCAL_URL = WEBVIEW_DEV_PHONE ? '192.168.1.3' : '10.0.2.2' +console.log("CapacitorConfig", {LOCAL_ANDROID, WEBVIEW_DEV_PHONE}) const config: CapacitorConfig = { appId: 'com.compassconnections.app', appName: 'Compass', webDir: 'web/out', - server: LOCAL_ANDROID ? { url: 'http://10.0.2.2:3000', cleartext: true } : {} + server: LOCAL_ANDROID ? { url: `http://${LOCAL_URL}:3000`, cleartext: true } : {} }; export default config; diff --git a/common/src/envs/constants.ts b/common/src/envs/constants.ts index 7b51def..f71049e 100644 --- a/common/src/envs/constants.ts +++ b/common/src/envs/constants.ts @@ -1,7 +1,7 @@ import {DEV_CONFIG} from './dev' import {PROD_CONFIG} from './prod' import {isProd} from "common/envs/is-prod"; -import {HOSTING_ENV, IS_LOCAL, IS_LOCAL_ANDROID} from "common/hosting/constants"; +import {HOSTING_ENV, IS_LOCAL, IS_LOCAL_ANDROID, IS_WEBVIEW_DEV_PHONE} from "common/hosting/constants"; export const MAX_DESCRIPTION_LENGTH = 100000 export const MAX_ANSWER_LENGTH = 240 @@ -42,7 +42,7 @@ console.debug(`Running in ${HOSTING_ENV} (${ENV})`,); // } export const LOCAL_WEB_DOMAIN = `localhost:3000` -export const LOCAL_BACKEND_DOMAIN = `${IS_LOCAL_ANDROID ? '10.0.2.2' : 'localhost'}:8088` +export const LOCAL_BACKEND_DOMAIN = `${IS_WEBVIEW_DEV_PHONE ? '192.168.1.3' : IS_LOCAL_ANDROID ? '10.0.2.2' : 'localhost'}:8088` export const DOMAIN = IS_LOCAL ? LOCAL_WEB_DOMAIN : ENV_CONFIG.domain export const DEPLOYED_WEB_URL = `https://www.${ENV_CONFIG.domain}` diff --git a/common/src/hosting/constants.ts b/common/src/hosting/constants.ts index 5648bae..ab6a597 100644 --- a/common/src/hosting/constants.ts +++ b/common/src/hosting/constants.ts @@ -1,4 +1,5 @@ -export const IS_LOCAL_ANDROID = process.env.NEXT_PUBLIC_LOCAL_ANDROID === '1' +export const IS_WEBVIEW_DEV_PHONE = process.env.NEXT_PUBLIC_WEBVIEW_DEV_PHONE === '1' +export const IS_LOCAL_ANDROID = IS_WEBVIEW_DEV_PHONE || process.env.NEXT_PUBLIC_LOCAL_ANDROID === '1' export const IS_WEBVIEW = !!process.env.NEXT_PUBLIC_WEBVIEW export const IS_GOOGLE_CLOUD = !!process.env.GOOGLE_CLOUD_PROJECT export const IS_VERCEL = !!process.env.NEXT_PUBLIC_VERCEL @@ -11,4 +12,4 @@ if (IS_LOCAL && !process.env.ENVIRONMENT && !process.env.NEXT_PUBLIC_FIREBASE_EN process.env.ENVIRONMENT = 'DEV' } -console.log('IS_LOCAL_ANDROID', IS_LOCAL_ANDROID) \ No newline at end of file +// console.log('IS_LOCAL_ANDROID', IS_LOCAL_ANDROID) \ No newline at end of file diff --git a/scripts/build_sync_android.sh b/scripts/build_sync_android.sh index 7e02958..114a304 100755 --- a/scripts/build_sync_android.sh +++ b/scripts/build_sync_android.sh @@ -10,6 +10,8 @@ yarn build-web source web/.env +export NEXT_PUBLIC_WEBVIEW_DEV_PHONE=1 + npx cap sync android # To generate icons diff --git a/web/pages/_app.tsx b/web/pages/_app.tsx index eee8403..a48d78c 100644 --- a/web/pages/_app.tsx +++ b/web/pages/_app.tsx @@ -23,7 +23,7 @@ if (Capacitor.isNativePlatform()) { // Note sure it's doing anything, though, need to check StatusBar.setOverlaysWebView({overlay: false}).catch(console.warn) // StatusBar.setStyle({style: Style.Light}).catch(console.warn) - App.addListener('backButton', ({canGoBack}) => { + App.addListener('backButton', () => { window.dispatchEvent(new CustomEvent('appBackButton')) }) }