From 6288cd3cc11c41704900bb9f934fb502eb4088fe Mon Sep 17 00:00:00 2001 From: spradhan7656 Date: Wed, 29 Jul 2026 20:47:39 +0530 Subject: [PATCH 1/4] fix the ui issue in the chat screen --- .../java/com/bitchat/android/ui/ChatScreen.kt | 15 +++++++++++++-- gradle/gradle-daemon-jvm.properties | 12 ++++++++++++ gradle/verification-metadata.xml | 2 +- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 gradle/gradle-daemon-jvm.properties diff --git a/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt b/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt index 59a126a6..18737754 100644 --- a/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt +++ b/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt @@ -1,5 +1,6 @@ package com.bitchat.android.ui +import android.os.Build import com.bitchat.android.ui.theme.BitchatFontFamily // [Goose] Bridge file share events to ViewModel via dispatcher is installed in ChatScreen composition @@ -259,8 +260,18 @@ fun ChatScreen(viewModel: ChatViewModel) { Column( modifier = Modifier .fillMaxSize() - .windowInsetsPadding(WindowInsets.ime) // This handles keyboard insets - .windowInsetsPadding(WindowInsets.navigationBars) // Add bottom padding when keyboard is not expanded + .then( + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + // Android 11+: Handle both IME and navigation bar insets in Compose + Modifier.windowInsetsPadding( + WindowInsets.ime.union(WindowInsets.navigationBars) + ) + } else { + // Android 10 and below: Window is resized by the system (adjustResize), + // so only account for the navigation bar. + Modifier.windowInsetsPadding(WindowInsets.navigationBars) + } + ) ) { Box(modifier = Modifier.weight(1f)) { // Messages area - takes up available space, will compress when keyboard appears diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 00000000..6c1139ec --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,12 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73bcfb608d1fde9fb62e462f834a3299/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/846ee0d876d26a26f37aa1ce8de73224/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9482ddec596298c84656d31d16652665/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/39701d92e1756bb2f141eb67cd4c660e/redirect +toolchainVersion=21 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 709b9b56..3cb59450 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1,7 +1,7 @@ - true + false false From 31d822e7d677778ac827a3f24c8cc75e2117713c Mon Sep 17 00:00:00 2001 From: spradhan7656 Date: Wed, 29 Jul 2026 20:54:15 +0530 Subject: [PATCH 2/4] fix the ui issue in the chat screen --- app/src/main/java/com/bitchat/android/ui/ChatScreen.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt b/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt index 18737754..30e972c2 100644 --- a/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt +++ b/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt @@ -267,6 +267,7 @@ fun ChatScreen(viewModel: ChatViewModel) { WindowInsets.ime.union(WindowInsets.navigationBars) ) } else { + // Android 10 and below: Window is resized by the system (adjustResize), // so only account for the navigation bar. Modifier.windowInsetsPadding(WindowInsets.navigationBars) From fe93be379a67f952961a5ce3a93624fcaeb8aaec Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Wed, 29 Jul 2026 20:45:41 +0200 Subject: [PATCH 3/4] Remove generated Gradle daemon JVM config --- gradle/gradle-daemon-jvm.properties | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 gradle/gradle-daemon-jvm.properties diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties deleted file mode 100644 index 6c1139ec..00000000 --- a/gradle/gradle-daemon-jvm.properties +++ /dev/null @@ -1,12 +0,0 @@ -#This file is generated by updateDaemonJvm -toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect -toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect -toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect -toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect -toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73bcfb608d1fde9fb62e462f834a3299/redirect -toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/846ee0d876d26a26f37aa1ce8de73224/redirect -toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect -toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect -toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9482ddec596298c84656d31d16652665/redirect -toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/39701d92e1756bb2f141eb67cd4c660e/redirect -toolchainVersion=21 From 5dd7b2c8093a12e4bee9ffdb181b7f068fa1d147 Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Wed, 29 Jul 2026 21:57:41 +0200 Subject: [PATCH 4/4] Restore Gradle verification metadata --- gradle/verification-metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 3cb59450..709b9b56 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1,7 +1,7 @@ - false + true false