From ff338801a9dbeb4f2c352db95fd6204e7a212140 Mon Sep 17 00:00:00 2001
From: Roland Osborne <roland.osborne@gmail.com>
Date: Wed, 15 Jan 2025 20:56:32 -0800
Subject: [PATCH] apply same keyboard strategy in ios and android

---
 app/client/mobile/android/app/src/main/AndroidManifest.xml | 2 +-
 app/client/mobile/src/conversation/Conversation.tsx        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/client/mobile/android/app/src/main/AndroidManifest.xml b/app/client/mobile/android/app/src/main/AndroidManifest.xml
index 01efb975..494cbe0a 100644
--- a/app/client/mobile/android/app/src/main/AndroidManifest.xml
+++ b/app/client/mobile/android/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
         android:launchMode="singleTask"
-        android:windowSoftInputMode="adjustResize"
+        android:windowSoftInputMode="adjustNothing"
         android:exported="true">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
diff --git a/app/client/mobile/src/conversation/Conversation.tsx b/app/client/mobile/src/conversation/Conversation.tsx
index 259e26b8..f887a3e6 100644
--- a/app/client/mobile/src/conversation/Conversation.tsx
+++ b/app/client/mobile/src/conversation/Conversation.tsx
@@ -188,7 +188,7 @@ export function Conversation({close, openDetails, wide}: {close: ()=>void, openD
   const containerStyle = state.layout === 'large' ? { ...styles.conversation, ...styles.largeConversation } : styles.conversation;
   const headerStyle = state.layout === 'large' ? { ...styles.header, ...styles.largeHeader } : styles.header;
   const padStyle = state.layout === 'large' ? styles.pad : styles.nopad;
-  const offset = state.layout === 'large' ? state.avoid - 64 : state.avoid - 128;
+  const offset = state.layout === 'large' ? state.avoid - 64 : state.avoid - 120;
 
   return (
     <View style={containerStyle}>
@@ -295,7 +295,7 @@ export function Conversation({close, openDetails, wide}: {close: ()=>void, openD
               autoComplete="off" autoCapitalize="none" autoCorrect={false} placeholder={state.strings.newMessage} placeholderTextColor={state.textColorSet ? state.textColor : undefined}
               cursorColor={state.textColorSet ? state.textColor : undefined} value={state.message} onChangeText={value => actions.setMessage(value)} />
 
-          { Platform.OS === 'ios' && avoid && (<View style={{ ...styles.avoid, height: offset }} />) }
+          { avoid && (<View style={{ ...styles.avoid, height: offset }} />) }
 
           <View style={styles.controls}>
             <Pressable style={styles.control} onPress={addImage}><Surface style={styles.surface} elevation={2}><Icon style={styles.button} source="camera" size={24} color={Colors.primary} /></Surface></Pressable>