From 18b52a37bbb5d3aa3503d56607c15a4f51a14f19 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Tue, 23 Jun 2026 11:04:58 -0700 Subject: [PATCH] Fix keyboard safe insets --- android/app/capacitor.build.gradle | 1 - android/app/src/main/res/values/styles.xml | 1 - android/capacitor.settings.gradle | 3 --- capacitor.config.ts | 6 +----- ios/App/Podfile | 1 - package.json | 1 - pnpm-lock.yaml | 12 ------------ src/app.html | 4 +--- src/routes/+layout.svelte | 1 - 9 files changed, 2 insertions(+), 28 deletions(-) diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle index f59918b1..79000fa3 100644 --- a/android/app/capacitor.build.gradle +++ b/android/app/capacitor.build.gradle @@ -10,7 +10,6 @@ android { apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" dependencies { implementation project(':aparajita-capacitor-secure-storage') - implementation project(':capacitor-community-safe-area') implementation project(':capacitor-app') implementation project(':capacitor-clipboard') implementation project(':capacitor-filesystem') diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index ca652513..ff53ab2d 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -11,7 +11,6 @@ false true @null - true diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index 9b984c36..c79cf19b 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -5,9 +5,6 @@ project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@capa include ':aparajita-capacitor-secure-storage' project(':aparajita-capacitor-secure-storage').projectDir = new File('../node_modules/.pnpm/@aparajita+capacitor-secure-storage@8.0.0/node_modules/@aparajita/capacitor-secure-storage/android') -include ':capacitor-community-safe-area' -project(':capacitor-community-safe-area').projectDir = new File('../node_modules/.pnpm/@capacitor-community+safe-area@8.0.1_@capacitor+core@8.3.4/node_modules/@capacitor-community/safe-area/android') - include ':capacitor-app' project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@capacitor+app@8.1.0_@capacitor+core@8.3.4/node_modules/@capacitor/app/android') diff --git a/capacitor.config.ts b/capacitor.config.ts index 79d2e75b..0815f9e4 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -7,22 +7,18 @@ const config: CapacitorConfig = { ios: { scheme: "Flotilla Chat", }, - android: { - adjustMarginsForEdgeToEdge: true, - }, plugins: { CapacitorHttp: { enabled: true, }, SystemBars: { - insetsHandling: "enable", + insetsHandling: "css", }, SplashScreen: { androidSplashResourceName: "splash", }, Keyboard: { style: "DARK", - resizeOnFullScreen: true, }, Badge: { persist: true, diff --git a/ios/App/Podfile b/ios/App/Podfile index 0ecdf2aa..00267691 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -12,7 +12,6 @@ def capacitor_pods pod 'Capacitor', :path => '../../node_modules/.pnpm/@capacitor+ios@8.3.4_@capacitor+core@8.3.4/node_modules/@capacitor/ios' pod 'CapacitorCordova', :path => '../../node_modules/.pnpm/@capacitor+ios@8.3.4_@capacitor+core@8.3.4/node_modules/@capacitor/ios' pod 'AparajitaCapacitorSecureStorage', :path => '../../node_modules/.pnpm/@aparajita+capacitor-secure-storage@8.0.0/node_modules/@aparajita/capacitor-secure-storage' - pod 'CapacitorCommunitySafeArea', :path => '../../node_modules/.pnpm/@capacitor-community+safe-area@8.0.1_@capacitor+core@8.3.4/node_modules/@capacitor-community/safe-area' pod 'CapacitorApp', :path => '../../node_modules/.pnpm/@capacitor+app@8.1.0_@capacitor+core@8.3.4/node_modules/@capacitor/app' pod 'CapacitorClipboard', :path => '../../node_modules/.pnpm/@capacitor+clipboard@8.0.1_@capacitor+core@8.3.4/node_modules/@capacitor/clipboard' pod 'CapacitorFilesystem', :path => '../../node_modules/.pnpm/@capacitor+filesystem@8.1.2_@capacitor+core@8.3.4/node_modules/@capacitor/filesystem' diff --git a/package.json b/package.json index 26afa199..a1338318 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "type": "module", "dependencies": { "@aparajita/capacitor-secure-storage": "^8.0.0", - "@capacitor-community/safe-area": "^8.0.1", "@capacitor/android": "^8.0.1", "@capacitor/app": "^8.0.0", "@capacitor/cli": "^8.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 25a13299..f420fca3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,9 +14,6 @@ importers: '@aparajita/capacitor-secure-storage': specifier: ^8.0.0 version: 8.0.0 - '@capacitor-community/safe-area': - specifier: ^8.0.1 - version: 8.0.1(@capacitor/core@8.3.4) '@capacitor/android': specifier: ^8.0.1 version: 8.3.4(@capacitor/core@8.3.4) @@ -779,11 +776,6 @@ packages: '@canvas/image-data@1.1.0': resolution: {integrity: sha512-QdObRRjRbcXGmM1tmJ+MrHcaz1MftF2+W7YI+MsphnsCrmtyfS0d5qJbk0MeSbUeyM/jCb0hmnkXPsy026L7dA==} - '@capacitor-community/safe-area@8.0.1': - resolution: {integrity: sha512-zVVQ7k94DbOff1mHP8qrZGTJZWyhGZnKHD2eXdcobIoOBFW9CeVphLNZYDCop/DBsHXfv6r8k0/Ac8xMIlwT+A==} - peerDependencies: - '@capacitor/core': '>=8.0.0' - '@capacitor/android@8.3.4': resolution: {integrity: sha512-7gJjrG3X32Am1QMLqgMztWTYMLMVNE+VZwhekNxhvYizH4mOV05vH+rC9B+f17bCkYZfyu/qXQX6hoY7kLeVZw==} peerDependencies: @@ -5847,10 +5839,6 @@ snapshots: '@canvas/image-data@1.1.0': {} - '@capacitor-community/safe-area@8.0.1(@capacitor/core@8.3.4)': - dependencies: - '@capacitor/core': 8.3.4 - '@capacitor/android@8.3.4(@capacitor/core@8.3.4)': dependencies: '@capacitor/core': 8.3.4 diff --git a/src/app.html b/src/app.html index 3bab4e05..56e67676 100644 --- a/src/app.html +++ b/src/app.html @@ -4,9 +4,7 @@ {NAME} - + diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 210610a0..dd17dfdc 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,7 +1,6 @@