From 75905e465279b3fc81b3bb19ef98a313d36ad35b Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Fri, 7 Mar 2025 09:01:47 -0800 Subject: [PATCH] Take a guess at fixing android keyboard issue --- android/app/build.gradle | 4 ++-- android/app/capacitor.build.gradle | 1 + android/app/src/main/AndroidManifest.xml | 1 + android/capacitor.settings.gradle | 3 +++ capacitor.config.ts | 4 ++++ ios/App/App.xcodeproj/project.pbxproj | 8 ++++---- ios/App/Podfile | 1 + package-lock.json | 10 ++++++++++ package.json | 3 ++- src/app.css | 2 +- 10 files changed, 29 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 7ecbb5e..9de3237 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "social.flotilla" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 12 - versionName "0.2.12" + versionCode 13 + versionName "0.2.13" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle index 0e88d9b..c3f32cc 100644 --- a/android/app/capacitor.build.gradle +++ b/android/app/capacitor.build.gradle @@ -10,6 +10,7 @@ android { apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" dependencies { implementation project(':capacitor-app') + implementation project(':capacitor-keyboard') implementation project(':nostr-signer-capacitor-plugin') } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index d4e8060..0a85f81 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ android:name=".MainActivity" android:label="@string/title_activity_main" android:theme="@style/AppTheme.NoActionBarLaunch" + android:windowSoftInputMode="adjustResize" android:launchMode="singleTask" android:exported="true"> diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index 5d3c2a9..50fa8ca 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -5,5 +5,8 @@ project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/ include ':capacitor-app' project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android') +include ':capacitor-keyboard' +project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android') + include ':nostr-signer-capacitor-plugin' project(':nostr-signer-capacitor-plugin').projectDir = new File('../node_modules/nostr-signer-capacitor-plugin/android') diff --git a/capacitor.config.ts b/capacitor.config.ts index 5c56f01..e286283 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -11,6 +11,10 @@ const config: CapacitorConfig = { SplashScreen: { androidSplashResourceName: "splash" }, + Keyboard: { + style: "DARK", + resizeOnFullScreen: true, + }, }, // Use this for live reload https://capacitorjs.com/docs/guides/live-reload // server: { diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 3425418..b6419a0 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -351,14 +351,14 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = S26U9DYW3A; INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.2.12; + MARKETING_VERSION = 0.2.13; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = social.flotilla; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -376,14 +376,14 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = S26U9DYW3A; INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.2.12; + MARKETING_VERSION = 0.2.13; PRODUCT_BUNDLE_IDENTIFIER = social.flotilla; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/ios/App/Podfile b/ios/App/Podfile index 843ee07..93261c3 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -12,6 +12,7 @@ def capacitor_pods pod 'Capacitor', :path => '../../node_modules/@capacitor/ios' pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios' pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app' + pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard' pod 'NostrSignerCapacitorPlugin', :path => '../../node_modules/nostr-signer-capacitor-plugin' end diff --git a/package-lock.json b/package-lock.json index f201ea5..a82bacb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@capacitor/cli": "^7.0.0", "@capacitor/core": "^7.0.1", "@capacitor/ios": "^7.0.0", + "@capacitor/keyboard": "^7.0.0", "@noble/curves": "^1.5.0", "@noble/hashes": "^1.4.0", "@poppanator/sveltekit-svg": "^4.2.1", @@ -2090,6 +2091,15 @@ "@capacitor/core": "^7.0.0" } }, + "node_modules/@capacitor/keyboard": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@capacitor/keyboard/-/keyboard-7.0.0.tgz", + "integrity": "sha512-Tqwy8wG+sx4UqiFCX4Q+bFw6uKgG7BiHKAPpeefoIgoEB8H8Jf3xZNZoVPnJIMuPsCdSvuyHXZbJXH9IEEirGA==", + "license": "MIT", + "peerDependencies": { + "@capacitor/core": ">=7.0.0" + } + }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", diff --git a/package.json b/package.json index 5410a45..14a0b48 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "flotilla", - "version": "0.2.12", + "version": "0.2.13", "private": true, "scripts": { "dev": "vite dev", @@ -42,6 +42,7 @@ "@capacitor/cli": "^7.0.0", "@capacitor/core": "^7.0.1", "@capacitor/ios": "^7.0.0", + "@capacitor/keyboard": "^7.0.0", "@noble/curves": "^1.5.0", "@noble/hashes": "^1.4.0", "@poppanator/sveltekit-svg": "^4.2.1", diff --git a/src/app.css b/src/app.css index 6d80d7b..5f8917d 100644 --- a/src/app.css +++ b/src/app.css @@ -341,7 +341,7 @@ progress[value]::-webkit-progress-value { /* chat view */ .chat__page-bar { - @apply sait cw !fixed top-0; + @apply sait cw !fixed top-2; } .chat__messages {