- Code clean up

Author: piashcse

src/screens/movie/movie-detail/MovieDetail.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import Loading from '../../../components/loading/Loading.tsx';
+import {Loading} from '../../../components/loading/Loading.tsx';
 import styles from './MovieDetail.Style.ts'
 import {FlatList, Image, Text, TouchableOpacity, View, ScrollView} from "react-native";
 import {Constants} from "../../../constant/AppConstants.ts";
@@ -23,9 +23,9 @@ const MovieDetail = () => {
     const navigation = useNavigation<MovieDetailNavigationProp>();
     const route = useRoute<RouteProp<{ params: RouteParams }, 'params'>>();
     const { movieId } = route.params;
-    const { data: movieDetail, isLoading: isLoadingMovieDetail } = useGetMovieDetailQuery(Number(movieId))
-    const { data: similarMovies, isLoading: isLoadingSimilarMovies } = useGetSimilarMovieQuery(Number(movieId))
-    const { data: castAndCrew, isLoading: isLoadingCastAndCrew } = useGetArtistAndCrewQuery(Number(movieId))
+    const { data: movieDetail, isFetching: isLoadingMovieDetail } = useGetMovieDetailQuery(Number(movieId))
+    const { data: similarMovies, isFetching: isLoadingSimilarMovies } = useGetSimilarMovieQuery(Number(movieId))
+    const { data: castAndCrew, isFetching: isLoadingCastAndCrew } = useGetArtistAndCrewQuery(Number(movieId))
 
     const isLoading = isLoadingMovieDetail || isLoadingSimilarMovies || isLoadingCastAndCrew
 

src/screens/movie/popular/PopularMovie.tsx

@@ -16,7 +16,7 @@ const PopularMovie = () => {
     const navigation = useNavigation<PopularMovieNavigationProp>();
     const [page, setPage] = useState(1);
     const [movies, setMovies] = useState<Array<MovieItem>>([]);
-    const {data = [], error, isLoading, isFetching, isSuccess} = usePopularMovieQuery(page)
+    const {data = [], error, isFetching, isSuccess} = usePopularMovieQuery(page)
 
     useEffect(() => {
         if (data.length) {
@@ -25,7 +25,7 @@ const PopularMovie = () => {
     }, [isSuccess]);
 
     const loadMoreMovies = () => {
-        if (!isFetching && !isLoading && !error) {
+        if (!isFetching && !error) {
             setPage((prevPage) => prevPage + 1);
         }
     };

src/screens/movie/toprated/TopRatedMovie.tsx

@@ -16,7 +16,7 @@ const TopRatedMovie = () => {
     const navigation = useNavigation<TopRatedMovieNavigationProp>();
     const [page, setPage] = useState(1);
     const [movies, setMovies] = useState<Array<MovieItem>>([]);
-    const {data = [], error, isLoading, isFetching, isSuccess} = useTopRatedMovieQuery(page);
+    const {data = [], error, isFetching, isSuccess} = useTopRatedMovieQuery(page);
 
     useEffect(() => {
         if (data.length) {
@@ -25,7 +25,7 @@ const TopRatedMovie = () => {
     }, [isSuccess]);
 
     const loadMoreMovies = () => {
-        if (!isFetching && !isLoading && !error) {
+        if (!isFetching && !error) {
             setPage((prevPage) => prevPage + 1);
         }
     };

src/screens/movie/upcoming/UpComingMovie.tsx

@@ -16,7 +16,7 @@ const UpComingMovie = () => {
     const navigation = useNavigation<UpComingMovieNavigationProp>();
     const [page, setPage] = useState(1);
     const [movies, setMovies] = useState<Array<MovieItem>>([]);
-    const {data = [], error, isLoading, isFetching, isSuccess} = useUpcomingMovieQuery(page)
+    const {data = [], error, isFetching, isSuccess} = useUpcomingMovieQuery(page)
 
     useEffect(() => {
         if (data.length) {
@@ -25,12 +25,12 @@ const UpComingMovie = () => {
     }, [isSuccess]);
 
     const loadMoreMovies = () => {
-        if (!isFetching && !isLoading && !error) {
+        if (!isFetching && !error) {
             setPage((prevPage) => prevPage + 1);
         }
     };
 
-    if (isLoading) return <Loading/>;
+    if (isFetching) return <Loading/>;
     return (<View style={styles.mainView}>
         <MovieItemComponent
             movies={movies}

src/screens/tvseries/airing_today/AiringTodayTvSeries.tsx

@@ -16,7 +16,7 @@ const AiringTodayTvSeries = () => {
     const navigation = useNavigation<AiringTodayTvSeriesNavigationProp>();
     const [page, setPage] = useState(1);
     const [tvSeries, setTvSeries] = useState<Array<TvSeriesItem>>([]);
-    const {data = [], error, isLoading, isFetching, isSuccess} = useAiringTodayTvSeriesApiQuery(page)
+    const {data = [], error, isFetching, isSuccess} = useAiringTodayTvSeriesApiQuery(page)
 
     useEffect(() => {
         if (data.length) {
@@ -25,7 +25,7 @@ const AiringTodayTvSeries = () => {
     }, [isSuccess]);
 
     const loadMoreMovies = () => {
-        if (!isFetching && !isLoading && !error) {
+        if (!isFetching && !error) {
             setPage((prevPage) => prevPage + 1);
         }
     };

src/screens/tvseries/on_the_air/OnTheAirTvSeries.tsx

@@ -15,7 +15,7 @@ const OnTheAirTvSeries = () => {
     const navigation = useNavigation<OnTheAirTvNavigationProp>();
     const [page, setPage] = useState(1);
     const [tvSeries, setTvSeries] = useState<Array<TvSeriesItem>>([]);
-    const {data = [], error, isLoading, isFetching, isSuccess} = useOnTheAirTvSeriesApiQuery(page)
+    const {data = [], error, isFetching, isSuccess} = useOnTheAirTvSeriesApiQuery(page)
 
     useEffect(() => {
         if (data.length) {
@@ -24,7 +24,7 @@ const OnTheAirTvSeries = () => {
     }, [isSuccess]);
 
     const loadMoreMovies = () => {
-        if (!isFetching && !isLoading && !error) {
+        if (!isFetching && !error) {
             setPage((prevPage) => prevPage + 1);
         }
     };

src/screens/tvseries/popular/PopularTvSeries.tsx

@@ -16,7 +16,7 @@ const PopularTvSeries = () => {
     const navigation = useNavigation<PopularTvSeriesNavigationProp>();
     const [page, setPage] = useState(1);
     const [tvSeries, setTvSeries] = useState<Array<TvSeriesItem>>([]);
-    const {data = [], error, isLoading, isFetching, isSuccess} = usePopularTvSeriesApiQuery(page)
+    const {data = [], error, isFetching, isSuccess} = usePopularTvSeriesApiQuery(page)
 
     useEffect(() => {
         if (data.length) {
@@ -25,7 +25,7 @@ const PopularTvSeries = () => {
     }, [isSuccess]);
 
     const loadMoreMovies = () => {
-        if (!isFetching && !isLoading && !error) {
+        if (!isFetching && !error) {
             setPage((prevPage) => prevPage + 1);
         }
     };

src/screens/tvseries/top_rated/TopRatedTvSeries.tsx

@@ -16,7 +16,7 @@ const TopRatedTvSeries = () => {
     const navigation = useNavigation<TopRatedTvSeriesNavigationProp>();
     const [page, setPage] = useState(1);
     const [tvSeries, setTvSeries] = useState<Array<TvSeriesItem>>([]);
-    const {data = [], error, isLoading, isFetching, isSuccess} = useTopRatedTvSeriesApiQuery(page)
+    const {data = [], error, isFetching, isSuccess} = useTopRatedTvSeriesApiQuery(page)
 
     useEffect(() => {
         if (data.length) {
@@ -25,7 +25,7 @@ const TopRatedTvSeries = () => {
     }, [isSuccess]);
 
     const loadMoreMovies = () => {
-        if (!isFetching && !isLoading && !error) {
+        if (!isFetching && !error) {
             setPage((prevPage) => prevPage + 1);
         }
     };

src/screens/tvseries/tvseries-detail/TvSeriesDetail.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import Loading from '../../../components/loading/Loading.tsx';
+import {Loading} from '../../../components/loading/Loading.tsx';
 import styles from './TvSeriesDetail.Style.ts'
 import {FlatList, Image, Text, TouchableOpacity, View, ScrollView} from "react-native";
 import {Constants} from "../../../constant/AppConstants.ts";
@@ -25,9 +25,9 @@ const TvSeriesDetail = () => {
     const navigation = useNavigation<TvSeriesDetailNavigationProp>();
     const route = useRoute<RouteProp<{ params: RouteParams }, 'params'>>();
     const { tvSeriesId } = route.params;
-    const { data: tvSeriesDetail, isLoading: isLoadingMovieDetail } = useTvSeriesDetailApiQuery(Number(tvSeriesId))
-    const { data: similarMovies, isLoading: isLoadingSimilarMovies } = useRecommendedTvSeriesApiQuery(Number(tvSeriesId))
-    const { data: castAndCrew, isLoading: isLoadingCastAndCrew } = useTvSeriesArtistAndCrewApiQuery(Number(tvSeriesId))
+    const { data: tvSeriesDetail, isFetching: isLoadingMovieDetail } = useTvSeriesDetailApiQuery(Number(tvSeriesId))
+    const { data: similarMovies, isFetching: isLoadingSimilarMovies } = useRecommendedTvSeriesApiQuery(Number(tvSeriesId))
+    const { data: castAndCrew, isFetching: isLoadingCastAndCrew } = useTvSeriesArtistAndCrewApiQuery(Number(tvSeriesId))
 
     const isLoading = isLoadingMovieDetail || isLoadingSimilarMovies || isLoadingCastAndCrew