View now moves out of the way in ThreadViewPage

SquareTable · Sep 21, 2023 · 6a90af9 · 6a90af9
1 parent 9b99903
commit 6a90af9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -24,7 +24,7 @@
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATE_URL" android:value="https://exp.host/@squaretabledevelopment/SocialSquare"/>
-    <activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:exported="true" android:screenOrientation="portrait">
+    <activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustPan" android:theme="@style/Theme.App.SplashScreen" android:exported="true" android:screenOrientation="portrait">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>

diff --git a/screens/ThreadViewPage.js b/screens/ThreadViewPage.js
@@ -27,8 +27,7 @@ import {
     TestText
 } from './screenStylings/styling';
 
-// async-storage
-import AsyncStorage from '@react-native-async-storage/async-storage';
+import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view'
 
 // formik
 import {Formik} from 'formik';
@@ -750,7 +749,7 @@ const ThreadViewPage = ({navigation, route}) => {
                 </Navigator_BackButton>
                 <TestText style={{textAlign: 'center', color: colors.tertiary}}>{creatorDisplayName ? creatorDisplayName : creatorName}'s thread</TestText>
             </ChatScreen_Title>
-            <ScrollView style={{backgroundColor: colors.primary}}>
+            <KeyboardAwareScrollView style={{backgroundColor: colors.primary}} enableOnAndroid extraScrollHeight={50} keyboardOpeningTime={0}>
                 <StyledContainer style={{width: '100%', backgroundColor: dark ? colors.darkest : colors.greyish, alignItems: 'center', paddingBottom: 2, paddingTop: 0}}>
                         <Avatar style={{height: 70, width: 70, marginBottom: 0}} source={{uri: categoryImageB64 == null || categoryImageB64 == "Finding" ? SocialSquareLogo_B64_png : categoryImageB64}}/>
                     <SubTitle style={{marginBottom: 0, color: colors.tertiary}}>Category: {threadCategory}</SubTitle>
@@ -805,6 +804,7 @@ const ThreadViewPage = ({navigation, route}) => {
                                                     value={values.comment}
                                                     multiline={true}
                                                     style={{color: colors.tertiary, backgroundColor: colors.primary, borderColor: colors.borderColor}}
+                                                    scrollEnabled={false}
                                                 />
                                             </CommentsVerticalView>
                                         </CommentsHorizontalView>
@@ -844,7 +844,7 @@ const ThreadViewPage = ({navigation, route}) => {
                         </StyledButton>
                     </View>
                 }
-            </ScrollView>
+            </KeyboardAwareScrollView>
         </>
     );
 }