diff --git a/src/Components/InputScreenStyles/InputScreenStyles.ts b/src/Components/InputScreenStyles/InputScreenStyles.ts
index b969a848..cb30f157 100644
--- a/src/Components/InputScreenStyles/InputScreenStyles.ts
+++ b/src/Components/InputScreenStyles/InputScreenStyles.ts
@@ -28,6 +28,10 @@ export const ErrorMessageContainer = styled.View({
paddingTop: 10,
});
+export const InputScreenGap = styled.View({
+ height: 40,
+});
+
export const GroupButtonContent = styled.View({
flexDirection: 'row',
alignItems: 'center',
diff --git a/src/app/(Authentication)/SignUp/Address/index.tsx b/src/app/(Authentication)/SignUp/Address/index.tsx
index 12fdb91a..637cd5cb 100644
--- a/src/app/(Authentication)/SignUp/Address/index.tsx
+++ b/src/app/(Authentication)/SignUp/Address/index.tsx
@@ -9,14 +9,16 @@ import {
ButtonTextWhite,
} from '../../../../Components/AuthButton/AuthButton';
import AuthInput from '../../../../Components/AuthInput/AuthInput';
-import { useSession } from '../../../../context/AuthContext';
-import { SafeArea, ContentContainer } from '../../../../styles/global';
import {
+ GroupButtonContent,
InlineInputContainer,
InputBoxContainer,
+ InputScreenGap,
InstructionContainer,
TitleText,
} from '../../../../Components/InputScreenStyles/InputScreenStyles';
+import { useSession } from '../../../../context/AuthContext';
+import { SafeArea, ContentContainer } from '../../../../styles/global';
export default function SignUpScreen() {
const { name } = useLocalSearchParams() as unknown as { name: string };
@@ -130,6 +132,8 @@ export default function SignUpScreen() {
+
+
handleSubmit()}
+ style={{ justifyContent: 'center' }}
>
-
+
Sign Up
-
+
diff --git a/src/app/(Authentication)/SignUp/Password/index.tsx b/src/app/(Authentication)/SignUp/Password/index.tsx
index 181838d0..5a80f661 100644
--- a/src/app/(Authentication)/SignUp/Password/index.tsx
+++ b/src/app/(Authentication)/SignUp/Password/index.tsx
@@ -7,10 +7,9 @@ import Arrow from '../../../../../assets/right-arrow-white.svg';
import {
ButtonBlack,
ButtonTextBlack,
+ ButtonTextWhite,
} from '../../../../Components/AuthButton/AuthButton';
import AuthInput from '../../../../Components/AuthInput/AuthInput';
-import { SafeArea, ContentContainer } from '../../../../styles/global';
-import supabase from '../../../../supabase/createClient';
import {
ErrorMessageContainer,
ErrorMessageText,
@@ -18,6 +17,8 @@ import {
InstructionContainer,
TitleText,
} from '../../../../Components/InputScreenStyles/InputScreenStyles';
+import { SafeArea, ContentContainer } from '../../../../styles/global';
+import supabase from '../../../../supabase/createClient';
export default function SignUpScreen() {
const { name } = useLocalSearchParams() as unknown as { name: string };
@@ -122,8 +123,8 @@ export default function SignUpScreen() {
disabled={password === '' || confirmPassword === '' || disableButton}
onPress={handleSubmit}
>
- Continue
-
+ Continue
+
diff --git a/src/app/(BottomTabNavigation)/Profile/DeleteAccount/index.tsx b/src/app/(BottomTabNavigation)/Profile/DeleteAccount/index.tsx
index 62a9d654..c8ad8678 100644
--- a/src/app/(BottomTabNavigation)/Profile/DeleteAccount/index.tsx
+++ b/src/app/(BottomTabNavigation)/Profile/DeleteAccount/index.tsx
@@ -12,6 +12,10 @@ import {
ButtonWhite,
} from '../../../../Components/AuthButton/AuthButton';
import CasesHeader from '../../../../Components/CasesHeader/CasesHeader';
+import {
+ GroupButtonContent,
+ InlineInputContainer,
+} from '../../../../Components/InputScreenStyles/InputScreenStyles';
import { useSession } from '../../../../context/AuthContext';
import { SafeArea } from '../../../../styles/global';
@@ -40,23 +44,21 @@ function DeleteAccountScreen() {
-
+
router.back()} style={styles.buttonView}>
-
+
-
- Cancel
-
-
+ Cancel
+
-
+
Confirm
-
+
-
+
);
diff --git a/src/app/(BottomTabNavigation)/Profile/EditAddress/index.tsx b/src/app/(BottomTabNavigation)/Profile/EditAddress/index.tsx
index a89d6495..4fd44b3a 100644
--- a/src/app/(BottomTabNavigation)/Profile/EditAddress/index.tsx
+++ b/src/app/(BottomTabNavigation)/Profile/EditAddress/index.tsx
@@ -5,9 +5,21 @@ import { Text, View, TouchableOpacity } from 'react-native';
import styles from './styles';
import BackButton from '../../../../../assets/back-button.svg';
import Submit from '../../../../../assets/submit.svg';
-import { ButtonBlack } from '../../../../Components/AuthButton/AuthButton';
+import {
+ ButtonBlack,
+ ButtonTextWhite,
+} from '../../../../Components/AuthButton/AuthButton';
import AuthInput from '../../../../Components/AuthInput/AuthInput';
+import {
+ GroupButtonContent,
+ InlineInputContainer,
+ InputBoxContainer,
+ InputScreenGap,
+ InstructionContainer,
+ TitleText,
+} from '../../../../Components/InputScreenStyles/InputScreenStyles';
import { useSession } from '../../../../context/AuthContext';
+import { ContentContainer, SafeArea } from '../../../../styles/global';
function EditNameScreen() {
const { updateUser, session } = useSession();
@@ -62,17 +74,17 @@ function EditNameScreen() {
}, []);
return (
-
-
- router.push('/Profile/')}
- >
+
+
+ router.back()}>
- Edit account details
-
+
+ Edit account details
+
+
+
-
-
+
-
-
-
+
-
-
-
-
+
+
+
+
-
- Submit
-
-
+
+ Submit
+
+
-
-
+
+
);
}
export default EditNameScreen;
diff --git a/src/app/(BottomTabNavigation)/Profile/EditAddress/styles.ts b/src/app/(BottomTabNavigation)/Profile/EditAddress/styles.ts
index 4ef09ad7..6823d897 100644
--- a/src/app/(BottomTabNavigation)/Profile/EditAddress/styles.ts
+++ b/src/app/(BottomTabNavigation)/Profile/EditAddress/styles.ts
@@ -2,55 +2,4 @@ import { StyleSheet } from 'react-native';
import { colors } from '../../../../styles/colors';
-export default StyleSheet.create({
- container: {
- backgroundColor: colors.white,
- alignItems: 'center',
- justifyContent: 'flex-start',
- height: '100%',
- width: '100%',
- },
- contentContainer: {
- width: '81%',
- },
- backButton: {
- marginTop: 70,
- marginBottom: 35,
- alignSelf: 'flex-start',
- },
- instructionText: {
- color: colors.black,
- fontSize: 24,
- fontWeight: '800',
- alignSelf: 'flex-start',
- marginBottom: 27,
- },
- inputBox: {
- marginBottom: 15,
- },
- smallInput: {
- width: '48%',
- },
- stateLine: {
- flexDirection: 'row',
- justifyContent: 'space-between',
- width: '100%',
- },
- submitText: {
- fontSize: 17,
- color: colors.white,
- fontWeight: '600',
- },
- submitIcon: {
- marginLeft: 20,
- },
- submitButton: {
- backgroundColor: colors.black,
- flexDirection: 'row',
- alignItems: 'center',
- justifyContent: 'center',
- borderRadius: 5,
- marginTop: 39,
- height: 50,
- },
-});
+export default StyleSheet.create({});
diff --git a/src/app/(BottomTabNavigation)/Profile/EditName/index.tsx b/src/app/(BottomTabNavigation)/Profile/EditName/index.tsx
index a8b91d3a..2c308eb4 100644
--- a/src/app/(BottomTabNavigation)/Profile/EditName/index.tsx
+++ b/src/app/(BottomTabNavigation)/Profile/EditName/index.tsx
@@ -14,6 +14,7 @@ import {
ErrorMessageContainer,
GroupButtonContent,
InputBoxContainer,
+ InputScreenGap,
InstructionContainer,
TitleText,
} from '../../../../Components/InputScreenStyles/InputScreenStyles';
@@ -60,7 +61,7 @@ function EditNameScreen() {
/>
-
+