update login page ui

This commit is contained in:
ammarahm-ed
2020-11-14 11:07:01 +05:00
parent 865db0aafe
commit 718d26e8dc
3 changed files with 48 additions and 25 deletions

View File

@@ -13,18 +13,18 @@ export const Button = ({
grayed,
title = '',
icon,
color = 'accent',
color,
fontSize = SIZE.sm,
iconColor = 'accent',
}) => {
const [state] = useTracked();
const {colors} = state;
const usedColor = color === 'accent' ? colors.accent : colors[color];
const usedColor = colors[color];
return (
<PressableButton
onPress={onPress}
color="transparent"
color={usedColor || "transparent"}
selectedColor={grayed ? colors.nav : colors.shade}
alpha={grayed ? (!colors.night ? -0.02 : 0.02) : -0.1}
customStyle={{

View File

@@ -34,6 +34,8 @@ import {sleep} from '../../utils/TimeUtils';
import {ActionIcon} from '../ActionIcon';
import {Loading} from '../Loading';
import {ListHeaderComponent} from '../SimpleList/ListHeaderComponent';
import Heading from '../Typography/Heading';
import Paragraph from '../Typography/Paragraph';
const LoginDialog = () => {
const [state, dispatch] = useTracked();
@@ -247,7 +249,6 @@ const LoginDialog = () => {
: '65%'
: '100%',
width: DDS.isTab ? 500 : '100%',
backgroundColor: colors.shade,
borderRadius: DDS.isTab ? 5 : 0,
zIndex: 10,
@@ -282,19 +283,34 @@ const LoginDialog = () => {
) : null}
{DDS.isTab ? null : (
<ActionIcon
name="arrow-left"
size={SIZE.xxxl}
onPress={() => {
close();
}}
customStyle={{
width: 50,
<View
style={{
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
paddingHorizontal: 12,
height: 50,
alignSelf: 'flex-start',
}}
color={colors.heading}
/>
}}>
<ActionIcon
name="arrow-left"
size={SIZE.xxxl}
onPress={() => {
close();
}}
customStyle={{
width: 40,
height: 40,
marginLeft: -5,
}}
color={colors.heading}
/>
<Paragraph
onPress={() => setLogin(!login)}
size={SIZE.md}
color={colors.accent}>
{login ? 'Sign Up' : 'Login'}
</Paragraph>
</View>
)}
<ListHeaderComponent
@@ -302,11 +318,10 @@ const LoginDialog = () => {
type="settings"
title={login ? 'Login' : 'Sign Up'}
messageCard={false}
paragraph={
login
? 'Access notes on any device.'
: 'Access notes on any device.'
}
onPress={() => {
setLogin(!login);
}}
paragraph={login ? 'create an account' : 'login to your account'}
/>
<View
@@ -742,12 +757,14 @@ const LoginDialog = () => {
title={login ? 'Login' : 'Create Account'}
onPress={login ? loginUser : signupUser}
width="100%"
color="accent"
iconColor="white"
fontSize={SIZE.md}
height={50}
/>
</View>
<TouchableOpacity
{/* <TouchableOpacity
onPress={() => {
setLogin(!login);
}}
@@ -774,7 +791,7 @@ const LoginDialog = () => {
{!login ? 'Login' : 'Sign up now'}
</Text>
</Text>
</TouchableOpacity>
</TouchableOpacity> */}
</View>
</View>
</View>

View File

@@ -19,10 +19,11 @@ export const ListHeaderComponent = ({
title,
paragraph,
color,
onPress,
}) => {
const [state] = useTracked();
const {colors, headerTextState, currentScreen} = state;
/*
/*
const onScroll = async (y) => {
if (y > 100) {
let o = (y - 100) / 100;
@@ -100,7 +101,12 @@ export const ListHeaderComponent = ({
: headerTextState.heading}
</Heading>
{paragraph && (
<Paragraph color={colors.icon}> {'\n' + paragraph}</Paragraph>
<Paragraph color={colors.icon}>
{'\n'}or
<Paragraph onPress={onPress} color={colors.accent}>
{" " + paragraph}
</Paragraph>
</Paragraph>
)}
</View>
</View>