From fe90d5b4e737b86f0ab7227427df259572d1dc92 Mon Sep 17 00:00:00 2001
From: suraj-markup <sk9261712674@gmail.com>
Date: Tue, 3 Mar 2026 03:42:44 +0530
Subject: [PATCH] fix(mobile): fix keyboard hiding text input on Android and
 iOS

- Set android.softwareKeyboardLayoutMode to "pan" in app.json to prevent
  conflict between system adjustResize and KeyboardAvoidingView
- Use behavior="padding" consistently on both platforms
- Add keyboardVerticalOffset on Android to account for nav header
- Applied fix across all screens with keyboard input

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 packages/mobile/app.json                            | 3 ++-
 packages/mobile/src/screens/SessionDetailScreen.tsx | 4 ++--
 packages/mobile/src/screens/SettingsScreen.tsx      | 3 ++-
 packages/mobile/src/screens/SpawnSessionScreen.tsx  | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/mobile/app.json b/packages/mobile/app.json
index 04e78a318..7e66845b9 100644
--- a/packages/mobile/app.json
+++ b/packages/mobile/app.json
@@ -30,7 +30,8 @@
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#0d1117"
       },
-      "package": "com.composio.aomobile"
+      "package": "com.composio.aomobile",
+      "softwareKeyboardLayoutMode": "pan"
     },
     "web": {
       "favicon": "./assets/favicon.png"
diff --git a/packages/mobile/src/screens/SessionDetailScreen.tsx b/packages/mobile/src/screens/SessionDetailScreen.tsx
index 243f10aa7..7dda7b37e 100644
--- a/packages/mobile/src/screens/SessionDetailScreen.tsx
+++ b/packages/mobile/src/screens/SessionDetailScreen.tsx
@@ -164,8 +164,8 @@ export default function SessionDetailScreen({ route, navigation }: Props) {
   return (
     <KeyboardAvoidingView
       style={styles.root}
-      behavior={Platform.OS === "ios" ? "padding" : "height"}
-      keyboardVerticalOffset={Platform.OS === "ios" ? 88 : 0}
+      behavior="padding"
+      keyboardVerticalOffset={Platform.OS === "ios" ? 88 : 80}
     >
       <ScrollView ref={scrollRef} style={styles.container} contentContainerStyle={styles.content} keyboardShouldPersistTaps="handled">
         {/* Header row */}
diff --git a/packages/mobile/src/screens/SettingsScreen.tsx b/packages/mobile/src/screens/SettingsScreen.tsx
index 0b9ac101f..fd84d36a1 100644
--- a/packages/mobile/src/screens/SettingsScreen.tsx
+++ b/packages/mobile/src/screens/SettingsScreen.tsx
@@ -132,7 +132,8 @@ export default function SettingsScreen({ navigation }: Props) {
   return (
     <KeyboardAvoidingView
       style={styles.root}
-      behavior={Platform.OS === "ios" ? "padding" : undefined}
+      behavior="padding"
+      keyboardVerticalOffset={Platform.OS === "ios" ? 88 : 80}
     >
       <ScrollView style={styles.container} contentContainerStyle={styles.content}>
         <View style={styles.section}>
diff --git a/packages/mobile/src/screens/SpawnSessionScreen.tsx b/packages/mobile/src/screens/SpawnSessionScreen.tsx
index 0d52a696c..eac05466f 100644
--- a/packages/mobile/src/screens/SpawnSessionScreen.tsx
+++ b/packages/mobile/src/screens/SpawnSessionScreen.tsx
@@ -52,7 +52,8 @@ export default function SpawnSessionScreen({ navigation }: Props) {
   return (
     <KeyboardAvoidingView
       style={styles.root}
-      behavior={Platform.OS === "ios" ? "padding" : undefined}
+      behavior="padding"
+      keyboardVerticalOffset={Platform.OS === "ios" ? 88 : 80}
     >
       <ScrollView style={styles.container} contentContainerStyle={styles.content}>
         <View style={styles.section}>