diff --git a/front/components/UI/TextFieldBase.tsx b/front/components/UI/TextFieldBase.tsx index 4364742..4df08f3 100644 --- a/front/components/UI/TextFieldBase.tsx +++ b/front/components/UI/TextFieldBase.tsx @@ -1,6 +1,6 @@ import { Eye, EyeSlash, Icon } from 'iconsax-react-native'; import React, { useState } from 'react'; -import { View, TouchableOpacity, StyleSheet, StyleProp, ViewStyle } from 'react-native'; +import { View, StyleSheet, StyleProp, ViewStyle, Pressable } from 'react-native'; import InteractiveBase from './InteractiveBase'; import { Input, useTheme } from 'native-base'; @@ -102,7 +102,7 @@ const TextFieldBase: React.FC = ({ return ( @@ -116,20 +116,23 @@ const TextFieldBase: React.FC = ({ /> )} - setFocused(true)} - onBlur={() => setFocused(false)} - {...props} - /> + + setFocused(true)} + onBlur={() => setFocused(false)} + {...props} + /> + {isSecret && ( - setPasswordVisible((prevState) => !prevState)} > @@ -146,7 +149,7 @@ const TextFieldBase: React.FC = ({ variant="Bold" /> )} - + )} @@ -157,25 +160,29 @@ const styles = StyleSheet.create({ container: { display: 'flex', alignItems: 'center', - justifyContent: 'center', + justifyContent: 'space-between', flexDirection: 'row', + gap: 5, + width: '100%', + paddingHorizontal: 12, }, input: { - flex: 1, - paddingHorizontal: 12 + 20 + 12, - paddingVertical: 12, + flexGrow: 1, + flexShrink: 1, + paddingVertical: 8, // outlineStyle: 'none', + width: 0, }, iconContainerLeft: { - position: 'absolute', - left: 12, - zIndex: 1, + flexGrow: 0, + flexShrink: 0, + width: 20, }, iconContainerRight: { - position: 'absolute', // outlineStyle: 'none', - right: 12, - zIndex: 1, + flexGrow: 0, + flexShrink: 0, + width: 20, }, }); diff --git a/front/views/HomeView.tsx b/front/views/HomeView.tsx index d057df1..fbc279e 100644 --- a/front/views/HomeView.tsx +++ b/front/views/HomeView.tsx @@ -42,25 +42,6 @@ const HomeView = (props: RouteProps<{}>) => { } return ( - - - `${welcome} ${userQuery.data.name}!`} - /> - - - - - { isRequired />,