keannu125/StudE-Frontend
1
0
Fork 0
mirror of https://github.com/lemeow125/StudE-Frontend.git synced 2024-11-17 06:19:25 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unified styling for buttons

Browse source
This commit is contained in:
Keannu Bernasol 2023-07-19 17:47:12 +08:00
parent 8fb8d6b8b2
commit 334978d2fd
7 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/Button/DrawerButton.tsx
View file

@ -1,21 +1,16 @@
import * as React from "react";
import { Pressable, GestureResponderEvent } from "react-native";
import { Pressable } from "react-native";
import styles from "../../styles";
import { colors } from "../../styles";
export interface props {
children: React.ReactNode;
onPress: (event: GestureResponderEvent) => void;
color: string;
}
export default function DrawerButton(props: props) {
export default function DrawerButton({ color = colors.secondary_3, ...props }) {
return (
<Pressable
onPress={props.onPress}
style={{
...styles.button_template,
...{
backgroundColor: props.color,
backgroundColor: color,
width: "95%",
justifyContent: "flex-start",
},

7
src/components/DrawerSettings/CustomDrawerContent.tsx
View file

@ -36,7 +36,6 @@ export default function CustomDrawerContent(props: {}) {
</View>
<DrawerButton
color={colors.secondary_3}
onPress={async () => {
dispatch(logout());
await AsyncStorage.clear();
@ -61,7 +60,6 @@ export default function CustomDrawerContent(props: {}) {
<Text style={styles.text_white_medium}>Stud-E</Text>
</View>
<DrawerButton
color={colors.secondary_2}
onPress={() => {
navigation.navigate("Home");
}}
@ -70,7 +68,6 @@ export default function CustomDrawerContent(props: {}) {
<Text style={styles.text_white_medium}>Home</Text>
</DrawerButton>
<DrawerButton
color={colors.secondary_2}
onPress={() => {
navigation.navigate("User Info");
}}
@ -79,7 +76,6 @@ export default function CustomDrawerContent(props: {}) {
<Text style={styles.text_white_medium}>User Info</Text>
</DrawerButton>
<DrawerButton
color={colors.secondary_2}
onPress={() => {
navigation.navigate("Subjects");
}}
@ -88,7 +84,6 @@ export default function CustomDrawerContent(props: {}) {
<Text style={styles.text_white_medium}>Subjects</Text>
</DrawerButton>
<DrawerButton
color={colors.secondary_3}
onPress={async () => {
dispatch(logout());
await AsyncStorage.clear();
@ -113,7 +108,6 @@ export default function CustomDrawerContent(props: {}) {
<Text style={styles.text_white_medium}>Stud-E</Text>
</View>
<DrawerButton
color={colors.secondary_2}
onPress={() => {
navigation.navigate("Login");
}}
@ -122,7 +116,6 @@ export default function CustomDrawerContent(props: {}) {
<Text style={styles.text_white_medium}>Login</Text>
</DrawerButton>
<DrawerButton
color={colors.secondary_2}
onPress={() => {
navigation.navigate("Register");
}}

3
src/routes/Home/Home.tsx
View file

@ -43,6 +43,9 @@ export default function Home() {
useEffect(() => {
requestLocation();
}, [location]);
useEffect(() => {
requestLocation();
}, []);
async function getDistance(location: LocationType) {
let dist = GetDistance(

6
src/routes/Login/Login.tsx
View file

@ -99,14 +99,10 @@ export default function Login() {
}
});
}}
color={colors.secondary_3}
>
<Text style={styles.text_white_small}>Login</Text>
</Button>
<Button
onPress={() => navigation.navigate("Register")}
color={colors.secondary_3}
>
<Button onPress={() => navigation.navigate("Register")}>
<Text style={styles.text_white_small}>Register</Text>
</Button>
</AnimatedContainer>

1
src/routes/Register/Register.tsx
View file

@ -158,7 +158,6 @@ export default function Register() {
{
}
}}
color={colors.secondary_3}
>
<Text style={styles.text_white_small}>Register</Text>
</Button>

1
src/routes/SubjectsPage/SubjectsPage.tsx
View file

@ -201,7 +201,6 @@ export default function SubjectsPage() {
</View>
<View style={{ zIndex: -1 }}>
<Button
color={colors.secondary_3}
onPress={() => {
if (subjectsOpen) {
setSelectedSubjects([]);

1
src/routes/UserInfoPage/UserInfoPage.tsx
View file

@ -311,7 +311,6 @@ export default function UserInfoPage() {
<View style={styles.padding} />
<View style={{ zIndex: -1 }}>
<Button
color={colors.secondary_3}
onPress={() => {
if (isEditable) {
setYearLevelOpen(false);