Fakultas Ilmu Komputer UI

Commit 65364bfa authored by Bagus Prabowo's avatar Bagus Prabowo
Browse files

Merge branch 'dropdown-fix' into 'master'

Dropdown fix

See merge request !56
parents 0f17631a dab51d0b
......@@ -36,6 +36,7 @@ const DropdownForm = ({
}
return (
<DropDownPicker
listMode={"MODAL"}
open={open}
value={value}
items={items}
......
......@@ -54,87 +54,85 @@ const RegisterScreen = ({ navigation }: RootTabScreenProps<"TabOne">) => {
};
return (
<View style={styles.container}>
<ScrollView>
<View>
<Text style={styles.titleText}>Selamat Datang!</Text>
</View>
<Spacer variant={"xl"} />
<View style={styles.componentWrapper}>
<MainButton
text="Daftar Menggunakan Google"
colors="secondary"
onPress={() => nav.navigate("Auth", { screen: "RegisterGoogle" })}
/>
</View>
<Spacer variant={"l"} />
<View style={styles.componentWrapper}>
<MainButton
text="Daftar Menggunakan Facebook"
colors="secondary"
onPress={() => nav.navigate("Auth", { screen: "RegisterGoogle" })}
/>
</View>
<Spacer variant={"xl"} />
<View>
<Text style={styles.description}>
Silakan isi formulir berikut untuk membuat akun Click
</Text>
</View>
<Spacer variant={"xl"} />
<View style={styles.componentWrapper}>
<PlainForm
formTitle={"Nama Depan"}
text={firstName}
setText={setFirstName}
placeholder={"Masukkan Nama Depan"}
errorMessage={"Tolong masukkan nama depan"}
/>
</View>
<Spacer variant={"l"} />
<View style={styles.componentWrapper}>
<PlainForm
formTitle={"Nama Belakang"}
text={lastName}
setText={setLastName}
placeholder={"Masukkan Nama Belakang"}
errorMessage={"Tolong masukkan nama belakang"}
/>
</View>
<Spacer variant={"l"} />
<View style={styles.componentWrapper}>
<PlainForm
formTitle={"Email"}
text={email}
setText={setEmail}
placeholder={"Masukkan Email"}
email
errorMessage={"Tolong masukkan email yang benar"}
/>
</View>
<Spacer variant={"l"} />
<View style={styles.componentWrapper}>
<IconForm
formTitle={"Password"}
text={password}
setText={setPassword}
placeholder={"Masukkan Password"}
password
errorMessage={"Tolong masukkan password"}
/>
</View>
<Spacer variant={"l"} />
<View style={styles.componentWrapper}>
<PlainForm
formTitle={"No. Handphone"}
text={phoneNo}
setText={setPhoneNo}
placeholder={"Masukkan No. Handphone"}
phone
errorMessage={"Tolong masukkan no. handphone"}
/>
</View>
</ScrollView>
<ScrollView style={styles.container}>
<View>
<Text style={styles.titleText}>Selamat Datang!</Text>
</View>
<Spacer variant={"xl"} />
<View style={styles.componentWrapper}>
<MainButton
text="Daftar Menggunakan Google"
colors="secondary"
onPress={() => nav.navigate("Auth", { screen: "RegisterGoogle" })}
/>
</View>
<Spacer variant={"l"} />
<View style={styles.componentWrapper}>
<MainButton
text="Daftar Menggunakan Facebook"
colors="secondary"
onPress={() => nav.navigate("Auth", { screen: "RegisterGoogle" })}
/>
</View>
<Spacer variant={"xl"} />
<View>
<Text style={styles.description}>
Silakan isi formulir berikut untuk membuat akun Click
</Text>
</View>
<Spacer variant={"xl"} />
<View style={styles.componentWrapper}>
<PlainForm
formTitle={"Nama Depan"}
text={firstName}
setText={setFirstName}
placeholder={"Masukkan Nama Depan"}
errorMessage={"Tolong masukkan nama depan"}
/>
</View>
<Spacer variant={"l"} />
<View style={styles.componentWrapper}>
<PlainForm
formTitle={"Nama Belakang"}
text={lastName}
setText={setLastName}
placeholder={"Masukkan Nama Belakang"}
errorMessage={"Tolong masukkan nama belakang"}
/>
</View>
<Spacer variant={"l"} />
<View style={styles.componentWrapper}>
<PlainForm
formTitle={"Email"}
text={email}
setText={setEmail}
placeholder={"Masukkan Email"}
email
errorMessage={"Tolong masukkan email yang benar"}
/>
</View>
<Spacer variant={"l"} />
<View style={styles.componentWrapper}>
<IconForm
formTitle={"Password"}
text={password}
setText={setPassword}
placeholder={"Masukkan Password"}
password
errorMessage={"Tolong masukkan password"}
/>
</View>
<Spacer variant={"l"} />
<View style={styles.componentWrapper}>
<PlainForm
formTitle={"No. Handphone"}
text={phoneNo}
setText={setPhoneNo}
placeholder={"Masukkan No. Handphone"}
phone
errorMessage={"Tolong masukkan no. handphone"}
/>
</View>
<Spacer variant={"l"} />
<View style={styles.titleContainer} testID="TitleContainer">
<Text style={styles.formTitle} testID="Title">
......@@ -161,18 +159,15 @@ const RegisterScreen = ({ navigation }: RootTabScreenProps<"TabOne">) => {
<View style={styles.componentWrapper}>
<MainButton text="Daftar" colors="primary" onPress={handleSubmit} />
</View>
<Spacer variant={"xl"} />
</View>
<Spacer variant="xl" />
</ScrollView>
);
};
const styles = StyleSheet.create({
container: {
flex: 1,
fontStyle: "normal",
display: "flex",
padding: 24,
backgroundColor: Colors.background,
paddingHorizontal: 24,
},
titleText: {
fontSize: 32,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment