Fixed buttons

This commit is contained in:
Keannu Bernasol 2023-07-17 22:54:06 +08:00
parent e67485d247
commit 0247afe553
3 changed files with 8 additions and 10 deletions

View file

@ -9,16 +9,12 @@ export interface props {
disabled?: boolean;
}
export default function Button({
disabled = false,
color = "rgba(52, 52, 52, 0.8)",
...props
}: props) {
export default function Button({ disabled = false, ...props }: props) {
return (
<Pressable
disabled={disabled}
onPress={props.onPress}
style={styles.button_template}
style={{ ...styles.button_template, ...{ backgroundColor: props.color } }}
>
{props.children}
</Pressable>

View file

@ -15,7 +15,7 @@ import {
UserInfoParams,
Semester,
} from "../../interfaces/Interfaces";
import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
import Button from "../../components/Button/Button";
import { TouchableOpacity, Image } from "react-native";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import {
@ -215,14 +215,15 @@ export default function UserInfoPage() {
setOpen={(open) => setSubjectsOpen(open)}
setValue={setSelectedSubjects}
placeholder="Subjects"
placeholderStyle={styles.text_white_tiny}
style={styles.input}
textStyle={styles.text_white_small_bold}
dropDownContainerStyle={{ backgroundColor: "white" }}
/>
</View>
</View>
<TouchableOpacity
style={styles.button_template}
<Button
color={colors.secondary_3}
onPress={() => {
if (isEditable) {
mutation.mutate({
@ -240,7 +241,7 @@ export default function UserInfoPage() {
<Text style={styles.text_white_small}>
{isEditable && StudentInfo.isSuccess ? "Save" : "Edit Profile"}
</Text>
</TouchableOpacity>
</Button>
</AnimatedContainerNoScroll>
</View>
);

View file

@ -148,6 +148,7 @@ const styles = StyleSheet.create({
overflow: "hidden",
},
input: {
paddingHorizontal: 8,
marginVertical: 12,
borderWidth: 1,
color: colors.text_default,