keannu125/StudE-Frontend
1
0
Fork 0
mirror of https://github.com/lemeow125/StudE-Frontend.git synced 2025-04-20 08:51:21 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: keannu125:v1.1
Branches Tags
keannu125:master
keannu125:feature/qol-fixes
keannu125:feature/messaging
keannu125:initial-frontend
keannu125:feature/student_status
keannu125:feature/homepage_rendering
keannu125:feature/UserInfo
keannu125:feature/studentinfo
keannu125:feature/location
keannu125:feature/onboarding
keannu125:feature/auth
keannu125:v1.3
keannu125:v1.2
keannu125:v1.1
keannu125:v0.9.3.7-beta
keannu125:v0.9.3.6-beta
keannu125:v0.9.3.5-beta
keannu125:v0.9.2-beta
keannu125:v0.9.1-beta
keannu125:v0.9.0-beta
keannu125:v0.3.0-alpha
keannu125:v0.2.0-alpha
keannu125:pre-release
...
compare: keannu125:master
Branches Tags
keannu125:master
keannu125:feature/qol-fixes
keannu125:feature/messaging
keannu125:initial-frontend
keannu125:feature/student_status
keannu125:feature/homepage_rendering
keannu125:feature/UserInfo
keannu125:feature/studentinfo
keannu125:feature/location
keannu125:feature/onboarding
keannu125:feature/auth
keannu125:v1.3
keannu125:v1.2
keannu125:v1.1
keannu125:v0.9.3.7-beta
keannu125:v0.9.3.6-beta
keannu125:v0.9.3.5-beta
keannu125:v0.9.2-beta
keannu125:v0.9.1-beta
keannu125:v0.9.0-beta
keannu125:v0.3.0-alpha
keannu125:v0.2.0-alpha
keannu125:pre-release

3 commits
v1.1 ... master

Author SHA1 Message Date
Keannu Bernasol
0b3af716a5 limit studying to within 250m of the center of ustp 2023-12-10 22:50:53 +08:00
Keannu Bernasol
05cee78d31 Format with Prettier and turn off debug flag 2023-11-24 21:15:47 +08:00
Keannu Bernasol
cbd82a05f9 Added callout information for study groups when pressing on maps and improved responsiveness of the homepage map renderer 2023-11-24 21:14:33 +08:00
1 changed files with 164 additions and 32 deletions
Show stats Expand all files Collapse all files

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

@ -6,10 +6,11 @@ import {
ScrollView,
Switch,
ActivityIndicator,
TouchableHighlight,
} from "react-native";
import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
import { useState, useEffect } from "react";
import MapView, { Circle, Marker, UrlTile } from "react-native-maps";
import MapView, { Callout, Circle, Marker, UrlTile } from "react-native-maps";
import * as Location from "expo-location";
import GetDistance from "../../components/GetDistance/GetDistance";
import Button from "../../components/Button/Button";
@ -45,6 +46,7 @@ import DropdownIcon from "../../icons/CaretDownIcon/CaretDownIcon";
import CaretUpIcon from "../../icons/CaretUpIcon/CaretUpIcon";
import RefreshIcon from "../../icons/RefreshIcon/RefreshIcon";
import AsyncStorage from "@react-native-async-storage/async-storage";
import AnimatedContainerNoScroll from "../../components/AnimatedContainer/AnimatedContainerNoScroll";
export default function Home() {
// Switch this condition to see the main map when debugging
@ -84,16 +86,15 @@ export default function Home() {
async function requestLocation() {
if (locationPermitted) {
let newLocation = await Location.getCurrentPositionAsync();
if (newLocation) {
setLocation(newLocation);
await DistanceHandler(newLocation);
}
}
}
useEffect(() => {
console.log("changed");
console.log(locationPermitted);
// console.log("Location Update");
// console.log(locationPermitted);
requestLocation();
}, [locationPermitted]);
@ -111,7 +112,7 @@ export default function Home() {
let dist = GetDistanceFromUSTP(location.coords);
setDist(dist);
// Deactivate student status if too far away from USTP and still studying
if (dist >= 2 && !map_distance_override && studying && !stopping_toofar) {
if (dist >= 1 && !map_distance_override && studying && !stopping_toofar) {
stop_studying.mutate({
active: false,
});
@ -153,14 +154,7 @@ export default function Home() {
location.coords.latitude,
location.coords.longitude
);
console.log("Distance:", dist);
console.log(
student_status.location.latitude,
student_status.location.longitude,
location.coords.latitude,
location.coords.longitude
);
if (dist > 0.02 && studying && !stopping_toofar) {
if (dist > 0.5 && studying && !stopping_toofar) {
console.log("Too far from current studying location");
stop_studying.mutate({
active: false,
@ -412,8 +406,21 @@ export default function Home() {
<Text style={styles.text_white_medium}>Loading...</Text>
</>
);
} else if (
study_groups == undefined ||
study_groups_global == undefined ||
student_statuses == undefined ||
student_statuses_global == undefined
) {
return (
<>
<View style={{ paddingVertical: 8 }} />
<ActivityIndicator size={96} color={colors.secondary_1} />
<Text style={styles.text_white_medium}>Loading...</Text>
</>
);
} else if (dist && location) {
if (dist <= 1 || map_distance_override) {
if (dist <= 0.25 || map_distance_override) {
return (
<>
<MapView
@ -472,6 +479,7 @@ export default function Home() {
zIndex={1000}
onPress={() => {
toast.hideAll();
toast.show(
<View
style={{
@ -500,7 +508,26 @@ export default function Home() {
}
);
}}
/>
>
<Callout>
<Text style={styles.text_white_tiny_bold}>
Student: {student_status.user}
</Text>
<Text style={styles.text_white_tiny_bold}>
{`Studying ${student_status.subject}`}
</Text>
<Text style={styles.text_black_tiny}>
{`${Math.round(
GetDistance(
student_status.location.latitude,
student_status.location.longitude,
location.coords.latitude,
location.coords.longitude
) * 1000
)}m away`}
</Text>
</Callout>
</Marker>
);
}
)
@ -581,6 +608,7 @@ export default function Home() {
zIndex={1000}
onPress={() => {
toast.hideAll();
toast.show(
<View
style={{
@ -663,7 +691,35 @@ export default function Home() {
}
);
}}
/>
>
<Callout>
<Text style={styles.text_black_tiny}>
Study Group: {studygroup.name}
</Text>
<Text style={styles.text_black_tiny}>
Studying: {studygroup.subject}
</Text>
{studygroup.landmark ? (
<Text style={styles.text_black_tiny}>
{studygroup.landmark}
</Text>
) : (
<></>
)}
<Text style={styles.text_black_tiny}>
{`${studygroup.students.length} ${
studygroup.students.length > 1
? "students"
: "student"
} studying`}
</Text>
<Text style={styles.text_black_tiny}>
{`${Math.round(
studygroup.distance * 1000
)}m away`}
</Text>
</Callout>
</Marker>
<Circle
center={studygroup.location}
radius={studygroup.radius}
@ -745,7 +801,40 @@ export default function Home() {
}
);
}}
/>
>
<Callout>
<Text style={styles.text_black_tiny}>
Study Group: {studygroup.name}
</Text>
<Text style={styles.text_black_tiny}>
Studying: {studygroup.subject}
</Text>
{studygroup.landmark ? (
<Text style={styles.text_black_tiny}>
{studygroup.landmark}
</Text>
) : (
<></>
)}
<Text style={styles.text_black_tiny}>
{`${studygroup.students.length} ${
studygroup.students.length > 1
? "students"
: "student"
} studying`}
</Text>
<Text style={styles.text_black_tiny}>
{`${Math.round(
GetDistance(
studygroup.location.latitude,
studygroup.location.longitude,
location.coords.latitude,
location.coords.longitude
)
)}m away`}
</Text>
</Callout>
</Marker>
<Circle
center={studygroup.location}
radius={studygroup.radius}
@ -1035,6 +1124,20 @@ export default function Home() {
<Text style={styles.text_white_tiny_bold}>
{`${Math.round(student_status.distance * 1000)}m away`}
</Text>
{location && location.coords ? (
<Text style={styles.text_black_tiny}>
{`${Math.round(
GetDistance(
student_status.location.latitude,
student_status.location.longitude,
location.coords.latitude,
location.coords.longitude
)
)}m away`}
</Text>
) : (
<></>
)}
</View>
);
}
@ -1186,6 +1289,20 @@ export default function Home() {
<Text style={styles.text_white_tiny_bold}>
{`Studying ${student_status.subject}`}
</Text>
{location && location.coords ? (
<Text style={styles.text_white_tiny}>
{`${Math.round(
GetDistance(
student_status.location.latitude,
student_status.location.longitude,
location.coords.latitude,
location.coords.longitude
)
)}m away`}
</Text>
) : (
<></>
)}
</View>
);
}
@ -1227,6 +1344,20 @@ export default function Home() {
<Text style={styles.text_white_tiny_bold}>
Students Studying: {studygroup.students.length}
</Text>
{location && location.coords ? (
<Text style={styles.text_white_tiny}>
{`${Math.round(
GetDistance(
studygroup.location.latitude,
studygroup.location.longitude,
location.coords.latitude,
location.coords.longitude
)
)}m away`}
</Text>
) : (
<></>
)}
</View>
);
}
@ -1237,6 +1368,7 @@ export default function Home() {
</ScrollView>
</AnimatedContainer>
</Modal>
<AnimatedContainer>
<View style={{ borderRadius: 16, overflow: "hidden" }}>
<CustomMap />