Browse Source

refactor(rn): improve some inputs ux

pull/6291/head
mehmet-erim 6 years ago
parent
commit
26a80ad1d8
  1. 2
      templates/app/react-native/src/components/TenantBox/TenantBox.js
  2. 5
      templates/app/react-native/src/screens/CreateUpdateTenant/CreateUpdateTenantForm.js
  3. 21
      templates/app/react-native/src/screens/CreateUpdateUser/CreateUpdateUserForm.js
  4. 2
      templates/app/react-native/src/screens/CreateUpdateUser/CreateUpdateUserScreen.js
  5. 8
      templates/app/react-native/src/screens/Login/LoginScreen.js

2
templates/app/react-native/src/components/TenantBox/TenantBox.js

@ -62,7 +62,7 @@ function TenantBox({ style, tenant = {}, setTenant, showTenantSelection, toggleT
<Content px20 style={{ flex: 1 }}>
<InputGroup abpInputGroup>
<Label abpLabel>{i18n.t('AbpUiMultiTenancy::Name')}</Label>
<Input abpInput value={tenantName} onChangeText={setTenantName} />
<Input abpInput value={tenantName} onChangeText={setTenantName} autoCapitalize = 'none'/>
</InputGroup>
<Text style={style.hint}>{i18n.t('AbpUiMultiTenancy::SwitchTenantHint')}</Text>
<View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>

5
templates/app/react-native/src/screens/CreateUpdateTenant/CreateUpdateTenantForm.js

@ -49,8 +49,6 @@ function CreateUpdateTenantForm({ editingTenant = {}, submit, remove }) {
}),
})}
initialValues={{
lockoutEnabled: false,
twoFactorEnabled: false,
...editingTenant,
}}
onSubmit={values => onSubmit(values)}>
@ -70,6 +68,7 @@ function CreateUpdateTenantForm({ editingTenant = {}, submit, remove }) {
onChangeText={handleChange('name')}
onBlur={handleBlur('name')}
value={values.name}
autoCapitalize = 'none'
/>
</InputGroup>
<ValidationMessage>{errors.name}</ValidationMessage>
@ -87,6 +86,7 @@ function CreateUpdateTenantForm({ editingTenant = {}, submit, remove }) {
onChangeText={handleChange('adminEmailAddress')}
onBlur={handleBlur('adminEmailAddress')}
value={values.adminEmailAddress}
autoCapitalize = 'none'
/>
</InputGroup>
<ValidationMessage>{errors.adminEmailAddress}</ValidationMessage>
@ -102,6 +102,7 @@ function CreateUpdateTenantForm({ editingTenant = {}, submit, remove }) {
onChangeText={handleChange('adminPassword')}
onBlur={handleBlur('adminPassword')}
value={values.adminPassword}
autoCapitalize = 'none'
/>
<Icon
name={showAdminPassword ? 'eye-off' : 'eye'}

21
templates/app/react-native/src/screens/CreateUpdateUser/CreateUpdateUserForm.js

@ -74,7 +74,6 @@ function CreateUpdateUserForm({ editingUser = {}, submit, remove }) {
})}
initialValues={{
lockoutEnabled: false,
twoFactorEnabled: false,
...editingUser,
}}
onSubmit={values => onSubmit(values)}>
@ -106,6 +105,7 @@ function CreateUpdateUserForm({ editingUser = {}, submit, remove }) {
onChangeText={handleChange('userName')}
onBlur={handleBlur('userName')}
value={values.userName}
autoCapitalize = 'none'
/>
</InputGroup>
<ValidationMessage>{errors.userName}</ValidationMessage>
@ -138,11 +138,12 @@ function CreateUpdateUserForm({ editingUser = {}, submit, remove }) {
<Input
abpInput
ref={emailRef}
onSubmitEditing={() => phoneNumberRef.current._root.focus()}
onSubmitEditing={() => passwordRef.current._root.focus()}
returnKeyType="next"
onChangeText={handleChange('email')}
onBlur={handleBlur('email')}
value={values.email}
autoCapitalize = 'none'
/>
</InputGroup>
<ValidationMessage>{errors.email}</ValidationMessage>
@ -150,11 +151,12 @@ function CreateUpdateUserForm({ editingUser = {}, submit, remove }) {
<Label abpLabel>{i18n.t('AbpIdentity::PhoneNumber')}</Label>
<Input
abpInput
ref={phoneNumberRef}
ref={passwordRef}
returnKeyType={!editingUser.id ? 'next' : 'default'}
onChangeText={handleChange('phoneNumber')}
onBlur={handleBlur('phoneNumber')}
value={values.phoneNumber}
autoCapitalize = 'none'
/>
</InputGroup>
{!editingUser.id ? (
@ -168,6 +170,7 @@ function CreateUpdateUserForm({ editingUser = {}, submit, remove }) {
onChangeText={handleChange('password')}
onBlur={handleBlur('password')}
value={values.password}
autoCapitalize = 'none'
/>
<Icon
name={showPassword ? 'eye-off' : 'eye'}
@ -190,18 +193,6 @@ function CreateUpdateUserForm({ editingUser = {}, submit, remove }) {
</TouchableOpacity>
</Body>
</ListItem>
<ListItem>
<CheckBox
checked={values.twoFactorEnabled}
onPress={() => setFieldValue('twoFactorEnabled', !values.twoFactorEnabled)}
/>
<Body>
<TouchableOpacity
onPress={() => setFieldValue('twoFactorEnabled', !values.twoFactorEnabled)}>
<Text>{i18n.t('AbpIdentity::DisplayName:TwoFactorEnabled')}</Text>
</TouchableOpacity>
</Body>
</ListItem>
</View>
<View
style={{

2
templates/app/react-native/src/screens/CreateUpdateUser/CreateUpdateUserScreen.js

@ -27,7 +27,7 @@ function CreateUpdateUserScreen({ navigation, route, startLoading, stopLoading }
startLoading({ key: 'saveUser' });
let request;
if (data.id) {
request = updateUser(data, userId);
request = updateUser(user, userId)
} else {
request = createUser(data);
}

8
templates/app/react-native/src/screens/Login/LoginScreen.js

@ -13,7 +13,7 @@ import {
Icon,
} from 'native-base';
import PropTypes from 'prop-types';
import React, { useState } from 'react';
import React, { useState, useRef } from 'react';
import { View } from 'react-native';
import * as Yup from 'yup';
import { login } from '../../api/AccountAPI';
@ -32,6 +32,7 @@ const ValidationSchema = Yup.object().shape({
function LoginScreen({ startLoading, stopLoading, setToken, fetchAppConfig }) {
const [showTenantSelection, setShowTenantSelection] = useState(false);
const [showPassword, setShowPassword] = useState(false);
const passwordRef = useRef(null)
const toggleTenantSelection = () => {
setShowTenantSelection(!showTenantSelection);
@ -77,6 +78,9 @@ function LoginScreen({ startLoading, stopLoading, setToken, fetchAppConfig }) {
onChangeText={handleChange('username')}
onBlur={handleBlur('username')}
value={values.username}
onSubmitEditing={() => passwordRef.current._root.focus()}
returnKeyType="next"
autoCapitalize = 'none'
/>
</InputGroup>
<ValidationMessage>{errors.username}</ValidationMessage>
@ -88,6 +92,8 @@ function LoginScreen({ startLoading, stopLoading, setToken, fetchAppConfig }) {
onChangeText={handleChange('password')}
onBlur={handleBlur('password')}
value={values.password}
ref={passwordRef}
autoCapitalize = 'none'
/>
<Icon
name={showPassword ? 'eye-off' : 'eye'}

Loading…
Cancel
Save