Rename pages to screens #15

prosjekt-4/components/App.tsx

-import BrowsePage from '../pages/BrowsePage';
-import MoviePage from '../pages/MoviePage';
+import BrowseScreen from '../pages/BrowseScreen';
+import MovieScreen from '../pages/MovieScreen';
 import React from 'react';
 import { View } from 'react-native';
 import { useFonts } from 'expo-font';
@@ -7,7 +7,7 @@ import { Ionicons } from '@expo/vector-icons';
 import { Container, Footer, Icon, Input, Item, Left, Text } from 'native-base';
 import { createStackNavigator } from '@react-navigation/stack';
 import { NavigationContainer } from '@react-navigation/native';
-import FilterPage from '../pages/FilterPage';
+import FilterPage from '../pages/FilterScreen';
 
 
 export type StackParamList = { // The parameters for each screen
@@ -33,8 +33,8 @@ const App = () => {
     <NavigationContainer>
       <Container>
         <Stack.Navigator initialRouteName='Browse'>
-          <Stack.Screen name='Browse' component={BrowsePage} />
-          <Stack.Screen name='Movie' component={MoviePage} />
+          <Stack.Screen name='Browse' component={BrowseScreen} />
+          <Stack.Screen name='Movie' component={MovieScreen} />
           <Stack.Screen name='Filter' component={FilterPage} />
         </Stack.Navigator>
       </Container>

prosjekt-4/components/Search.tsx

@@ -2,7 +2,7 @@ import { View, Button } from "native-base";
 import React from "react";
 import SearchBar from "./SearchBar";
 import { StyleSheet, Text } from 'react-native';
-import { BrowseScreenProps } from "../pages/BrowsePage";
+import { BrowseScreenProps } from "../pages/BrowseScreen";
 
 // SearchBar and Filter Button combined 
 const Search = ({navigation}: BrowseScreenProps) => {

prosjekt-4/pages/BrowsePage.tsx → prosjekt-4/pages/BrowseScreen.tsx

@@ -16,7 +16,7 @@ export type BrowseScreenProps = {
 };
 
 // Main page. Displays different movies and the search bar
-const BrowsePage = ({ navigation }: BrowseScreenProps) => {
+const BrowseScreen = ({ navigation }: BrowseScreenProps) => {
   const dispatch = useDispatch();
   const movies = useSelector(selectMoviesByAllIdsOrdering);
   const movieElements = Object.values(movies).map((
@@ -52,4 +52,4 @@ const BrowsePage = ({ navigation }: BrowseScreenProps) => {
   );
 };
 
-export default BrowsePage;
+export default BrowseScreen;

prosjekt-4/pages/FilterPage.tsx → prosjekt-4/pages/FilterScreen.tsx

@@ -20,7 +20,7 @@ type Props = {
 };
 
 // Shows the different available filter options in its own page
-const FilterPage = ({ navigation }: Props) => {
+const FilterScreen = ({ navigation }: Props) => {
   const dispatch = useDispatch();
   return (
     <View>
@@ -61,4 +61,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default FilterPage;
+export default FilterScreen;

prosjekt-4/pages/MoviePage.tsx → prosjekt-4/pages/MovieScreen.tsx

@@ -15,7 +15,7 @@ type Props = {
 };
 
 // Detailed page about a movie
-const MoviePage = ({ route }: Props) => {
+const MovieScreen = ({ route }: Props) => {
   const movie: Movie = useSelector(
     (state: RootState) => state.movies.byId[route.params.id] // Retrieves the current movie based on the navigation id
   );
@@ -53,4 +53,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default MoviePage;
+export default MovieScreen;