components/Timetable.js

@@ -2,7 +2,6 @@ import React from "react";
 import PropTypes from "prop-types";
 import {
 	Portal,
-	Text,
 } from "react-native-paper";
 import { createStackNavigator } from "@react-navigation/stack";
 
@@ -13,17 +12,6 @@ const Stack = createStackNavigator();
 
 export default function Timetable({ addTimetableEntry, removeTimetableEntry, timetable, subjects }) {
 	const days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
-	if (subjects.length === 0) {
-		return (
-			<Text
-				style={{
-					textAlign: "center",
-					marginTop: 12,
-				}}
-			>
-				No Subjects added. Add Subjects first.
-			</Text>);
-	}
 	return (
 		<Portal.Host><Stack.Navigator headerMode="none">
 			<Stack.Screen name="Timetable">

components/timetable/AddEntry.js

@@ -47,22 +47,19 @@ function AddEntry({addTimetableEntry, days, day, subjects, navigation }) {
 	}
 
 	function submit() {
-		let message = "";
+		if (subject.id === null) {
-		if (subject.id === null)
+			setSnackbar({ visible: true, message: "Missing subject." });
-			message = "Missing Subject";
+			return;
-		else if (start === null)
+		} else if (start === null) {
-			message =  "Missing start time.";
+			setSnackbar({ visible: true, message: "Missing start time." });
-		else if (end === null)
+			return;
-			message =  "Missing end time.";
+		} else if (end === null) {
-		else if (count === 0)
+			setSnackbar({ visible: true, message: "Missing end time." });
-			message =  "Missing count.";
+			return;
-
+		} else if (count === 0) {
-		if (message !== "") {
+			setSnackbar({ visible: true, message: "Missing count." });
-			setSnackbar({visible: true, message: message});
-			setTimeout(() => setSnackbar({ visible: false, message: null }), 2000);
 			return;
 		}
-
 		addTimetableEntry(day, {
 			sub_id: subject.id,
 			count,