From 982f46376b3dcd2c9a072789d6db7eca3ea2bf11 Mon Sep 17 00:00:00 2001
From: João Ferreiro <ferreiro@pinkroom.dev>
Date: Thu, 15 Dec 2022 15:30:59 +0000
Subject: fixing modal & keyboard interaction on android

---
 src/view/com/login/CreateAccount.tsx | 2 ++
 src/view/com/login/Signin.tsx        | 2 ++
 src/view/screens/Settings.tsx        | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

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>
-- 
cgit 1.4.1