diff --git a/apps/mobile/src/components/Button/index.js b/apps/mobile/src/components/Button/index.js index b5e73e5a1..62acca011 100644 --- a/apps/mobile/src/components/Button/index.js +++ b/apps/mobile/src/components/Button/index.js @@ -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 ( { 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 : ( - { - close(); - }} - customStyle={{ - width: 50, + + }}> + { + close(); + }} + customStyle={{ + width: 40, + height: 40, + marginLeft: -5, + }} + color={colors.heading} + /> + setLogin(!login)} + size={SIZE.md} + color={colors.accent}> + {login ? 'Sign Up' : 'Login'} + + )} { 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'} /> { title={login ? 'Login' : 'Create Account'} onPress={login ? loginUser : signupUser} width="100%" + color="accent" + iconColor="white" fontSize={SIZE.md} height={50} /> - { setLogin(!login); }} @@ -774,7 +791,7 @@ const LoginDialog = () => { {!login ? 'Login' : 'Sign up now'} - + */} diff --git a/apps/mobile/src/components/SimpleList/ListHeaderComponent.js b/apps/mobile/src/components/SimpleList/ListHeaderComponent.js index cee09c20d..fc0fb5a25 100644 --- a/apps/mobile/src/components/SimpleList/ListHeaderComponent.js +++ b/apps/mobile/src/components/SimpleList/ListHeaderComponent.js @@ -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} {paragraph && ( - {'\n' + paragraph} + + {'\n'}or + + {" " + paragraph} + + )}