diff options
| author | João Ferreiro <ferreiro@pinkroom.dev> | 2022-12-15 15:30:59 +0000 |
|---|---|---|
| committer | Paul Frazee <pfrazee@gmail.com> | 2022-12-19 19:23:24 -0600 |
| commit | 982f46376b3dcd2c9a072789d6db7eca3ea2bf11 (patch) | |
| tree | 9b0174635ae0250acce32ed5dbd82dd72ca627b3 | |
| parent | 70f4debc0b27cc5245cceaede2a50ec03c1d67d5 (diff) | |
| download | voidsky-982f46376b3dcd2c9a072789d6db7eca3ea2bf11.tar.zst | |
fixing modal & keyboard interaction on android
| -rw-r--r-- | android/app/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/view/com/login/CreateAccount.tsx | 2 | ||||
| -rw-r--r-- | src/view/com/login/Signin.tsx | 2 | ||||
| -rw-r--r-- | src/view/screens/Settings.tsx | 4 |
4 files changed, 7 insertions, 3 deletions
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 5ba5c50ef..d74715078 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -17,7 +17,7 @@ android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode" android:launchMode="singleTask" - android:windowSoftInputMode="adjustResize" + android:windowSoftInputMode="adjustPan" android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/src/view/com/login/CreateAccount.tsx b/src/view/com/login/CreateAccount.tsx index 37dcba2fd..58d305d54 100644 --- a/src/view/com/login/CreateAccount.tsx +++ b/src/view/com/login/CreateAccount.tsx @@ -1,6 +1,7 @@ import React, {useState, useEffect} from 'react' import { ActivityIndicator, + Keyboard, KeyboardAvoidingView, ScrollView, StyleSheet, @@ -65,6 +66,7 @@ export const CreateAccount = ({onPressBack}: {onPressBack: () => void}) => { const onPressSelectService = () => { store.shell.openModal(new ServerInputModal(serviceUrl, setServiceUrl)) + Keyboard.dismiss() } const onPressNext = async () => { diff --git a/src/view/com/login/Signin.tsx b/src/view/com/login/Signin.tsx index 8ba66e870..5e8891c08 100644 --- a/src/view/com/login/Signin.tsx +++ b/src/view/com/login/Signin.tsx @@ -1,6 +1,7 @@ import React, {useState, useEffect} from 'react' import { ActivityIndicator, + Keyboard, KeyboardAvoidingView, StyleSheet, Text, @@ -134,6 +135,7 @@ const LoginForm = ({ const onPressSelectService = () => { store.shell.openModal(new ServerInputModal(serviceUrl, setServiceUrl)) + Keyboard.dismiss() } const onPressNext = async () => { diff --git a/src/view/screens/Settings.tsx b/src/view/screens/Settings.tsx index 732b47683..3199c4d9a 100644 --- a/src/view/screens/Settings.tsx +++ b/src/view/screens/Settings.tsx @@ -31,7 +31,7 @@ export const Settings = observer(function Settings({ <ViewHeader title="Settings" /> <View style={[s.mt10, s.pl10, s.pr10]}> <View style={[s.flexRow]}> - <Text>Signed in as</Text> + <Text style={s.black}>Signed in as</Text> <View style={s.flex1} /> <TouchableOpacity onPress={onPressSignout}> <Text style={[s.blue3, s.bold]}>Sign out</Text> @@ -49,7 +49,7 @@ export const Settings = observer(function Settings({ avatar={store.me.avatar} /> <View style={[s.ml10]}> - <Text style={[s.f18]}> + <Text style={[s.f18, s.black]}> {store.me.displayName || store.me.handle} </Text> <Text style={[s.gray5]}>@{store.me.handle}</Text> |