Merge pull request #123 from tooot-app/main

Nightly 210510

src/components/Input.tsx

@@ -9,7 +9,14 @@ import React, {
   useRef,
   useState
 } from 'react'
-import { Platform, StyleSheet, Text, TextInput, View } from 'react-native'
+import {
+  Platform,
+  StyleSheet,
+  Text,
+  TextInput,
+  TextInputProps,
+  View
+} from 'react-native'
 import Animated, { useAnimatedStyle, withTiming } from 'react-native-reanimated'
 import {
   ComponentEmojis,
@@ -23,7 +30,6 @@ export interface Props {
 
   title?: string
 
-  maxLength?: number
   multiline?: boolean
 
   emoji?: boolean
@@ -32,16 +38,28 @@ export interface Props {
   setValue:
     | Dispatch<SetStateAction<string | undefined>>
     | Dispatch<SetStateAction<string>>
+
+  options?: Omit<
+    TextInputProps,
+    | 'autoFocus'
+    | 'onFocus'
+    | 'onBlur'
+    | 'style'
+    | 'onChangeText'
+    | 'onSelectionChange'
+    | 'keyboardAppearance'
+    | 'textAlignVertical'
+  >
 }
 
 const Input: React.FC<Props> = ({
   autoFocus = true,
   title,
-  maxLength,
   multiline = false,
   emoji = false,
   value,
-  setValue
+  setValue,
+  options
 }) => {
   const { mode, theme } = useTheme()
 
@@ -90,7 +108,15 @@ const Input: React.FC<Props> = ({
       setValue={setValue}
       selectionRange={selectionRange}
     >
-      <View style={[styles.base, { borderColor: theme.border }]}>
+      <View
+        style={[
+          styles.base,
+          {
+            borderColor: theme.border,
+            flexDirection: multiline ? 'column' : 'row'
+          }
+        ]}
+      >
         <EmojisContext.Consumer>
           {({ emojisDispatch }) => (
             <TextInput
@@ -113,11 +139,13 @@ const Input: React.FC<Props> = ({
               onChangeText={setValue}
               onSelectionChange={onSelectionChange}
               value={value}
-              maxLength={maxLength}
               {...(multiline && {
                 multiline,
                 numberOfLines: Platform.OS === 'android' ? 5 : undefined
               })}
+              keyboardAppearance={mode}
+              textAlignVertical='top'
+              {...options}
             />
           )}
         </EmojisContext.Consumer>
@@ -128,12 +156,14 @@ const Input: React.FC<Props> = ({
             {title}
           </Animated.Text>
         ) : null}
-        {maxLength && value?.length ? (
+        <View style={{ flexDirection: 'row' }}>
-          <Text style={[styles.maxLength, { color: theme.secondary }]}>
+          {options?.maxLength && value?.length ? (
-            {value?.length} / {maxLength}
+            <Text style={[styles.maxLength, { color: theme.secondary }]}>
-          </Text>
+              {value?.length} / {options.maxLength}
-        ) : null}
+            </Text>
-        {inputFocused ? <EmojisButton /> : null}
+          ) : null}
+          {inputFocused ? <EmojisButton /> : null}
+        </View>
       </View>
       <EmojisList />
     </ComponentEmojis>
@@ -142,7 +172,6 @@ const Input: React.FC<Props> = ({
 
 const styles = StyleSheet.create({
   base: {
-    flexDirection: 'row',
     alignItems: 'flex-end',
     borderWidth: 1,
     marginVertical: StyleConstants.Spacing.S,
@@ -156,7 +185,8 @@ const styles = StyleSheet.create({
     fontSize: StyleConstants.Font.Size.M
   },
   maxLength: {
-    ...StyleConstants.FontStyle.S
+    ...StyleConstants.FontStyle.S,
+    paddingLeft: StyleConstants.Spacing.XS
   }
 })
 

src/components/Instance.tsx

@@ -149,14 +149,14 @@ const ComponentInstance: React.FC<Props> = ({
             style={[
               styles.prefix,
               {
+                color: theme.primaryDefault,
                 borderBottomColor: instanceQuery.isError
                   ? theme.red
                   : theme.border
               }
             ]}
             editable={false}
-            placeholder='https://'
+            defaultValue='https://'
-            placeholderTextColor={theme.primaryDefault}
           />
           <TextInput
             style={[

src/screens/Tabs/Me/Profile.tsx

@@ -26,10 +26,7 @@ const TabMeProfile: React.FC<StackScreenProps<
       behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
     >
       <Stack.Navigator
-        screenOptions={{
+        screenOptions={{ headerHideShadow: true, headerTopInsetEnabled: false }}
-          headerHideShadow: true,
-          headerTopInsetEnabled: false
-        }}
       >
         <Stack.Screen
           name='Tab-Me-Profile-Root'

src/screens/Tabs/Me/Profile/Fields.tsx

@@ -113,48 +113,51 @@ const ScreenMeProfileFields: React.FC<StackScreenProps<
 
   return (
     <ScrollView style={styles.base} keyboardShouldPersistTaps='handled'>
-      {Array.from(Array(4).keys()).map(index => (
+      <View style={{ marginBottom: StyleConstants.Spacing.L * 2 }}>
-        <View key={index} style={styles.group}>
+        {Array.from(Array(4).keys()).map(index => (
-          <Text style={[styles.headline, { color: theme.primaryDefault }]}>
+          <View key={index} style={styles.group}>
-            {t('me.profile.fields.group', { index: index + 1 })}
+            <Text style={[styles.headline, { color: theme.primaryDefault }]}>
-          </Text>
+              {t('me.profile.fields.group', { index: index + 1 })}
-          <Input
+            </Text>
-            title={t('me.profile.fields.label')}
+            <Input
-            autoFocus={false}
+              title={t('me.profile.fields.label')}
-            maxLength={255}
+              autoFocus={false}
-            value={newFields[index].name}
+              options={{ maxLength: 255 }}
-            setValue={(v: any) =>
+              value={newFields[index].name}
-              setNewFields(
+              setValue={(v: any) =>
-                newFields.map((field, i) =>
+                setNewFields(
-                  i === index ? { ...field, name: v } : field
+                  newFields.map((field, i) =>
+                    i === index ? { ...field, name: v } : field
+                  )
                 )
-              )
+              }
-            }
+              emoji
-            emoji
+            />
-          />
+            <Input
-          <Input
+              title={t('me.profile.fields.content')}
-            title={t('me.profile.fields.content')}
+              autoFocus={false}
-            autoFocus={false}
+              options={{ maxLength: 255 }}
-            maxLength={255}
+              value={newFields[index].value}
-            value={newFields[index].value}
+              setValue={(v: any) =>
-            setValue={(v: any) =>
+                setNewFields(
-              setNewFields(
+                  newFields.map((field, i) =>
-                newFields.map((field, i) =>
+                    i === index ? { ...field, value: v } : field
-                  i === index ? { ...field, value: v } : field
+                  )
                 )
-              )
+              }
-            }
+              emoji
-            emoji
+            />
-          />
+          </View>
-        </View>
+        ))}
-      ))}
+      </View>
     </ScrollView>
   )
 }
 
 const styles = StyleSheet.create({
   base: {
-    padding: StyleConstants.Spacing.Global.PagePadding
+    paddingHorizontal: StyleConstants.Spacing.Global.PagePadding,
+    marginBottom: StyleConstants.Spacing.L
   },
   group: {
     marginBottom: StyleConstants.Spacing.M

src/screens/Tabs/Me/Profile/Name.tsx

@@ -95,14 +95,24 @@ const ScreenMeProfileName: React.FC<StackScreenProps<
 
   return (
     <ScrollView style={styles.base} keyboardShouldPersistTaps='handled'>
-      <Input value={displayName} setValue={setDisplayName} emoji />
+      <Input
+        value={displayName}
+        setValue={setDisplayName}
+        emoji
+        options={{
+          maxLength: 30,
+          autoCapitalize: 'none',
+          autoCompleteType: 'username',
+          autoCorrect: false
+        }}
+      />
     </ScrollView>
   )
 }
 
 const styles = StyleSheet.create({
   base: {
-    padding: StyleConstants.Spacing.Global.PagePadding
+    paddingHorizontal: StyleConstants.Spacing.Global.PagePadding
   }
 })
 

src/screens/Tabs/Me/Profile/Note.tsx

@@ -7,7 +7,7 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { RefObject, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Alert, StyleSheet } from 'react-native'
+import { Alert, StyleSheet, View } from 'react-native'
 import FlashMessage from 'react-native-flash-message'
 import { ScrollView } from 'react-native-gesture-handler'
 
@@ -95,14 +95,22 @@ const ScreenMeProfileNote: React.FC<StackScreenProps<
 
   return (
     <ScrollView style={styles.base} keyboardShouldPersistTaps='handled'>
-      <Input value={newNote} setValue={setNewNote} multiline emoji />
+      <View style={{ marginBottom: StyleConstants.Spacing.XL * 2 }}>
+        <Input
+          value={newNote}
+          setValue={setNewNote}
+          multiline
+          emoji
+          options={{ maxLength: 500 }}
+        />
+      </View>
     </ScrollView>
   )
 }
 
 const styles = StyleSheet.create({
   base: {
-    padding: StyleConstants.Spacing.Global.PagePadding
+    paddingHorizontal: StyleConstants.Spacing.Global.PagePadding
   }
 })