Clean

Author: MartinBraquet

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 {

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;

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}`

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)
+// console.log('IS_LOCAL_ANDROID', IS_LOCAL_ANDROID)

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

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'))
   })
 }