diff --git a/api/handleApiFetchDays.ts b/api/handleApiFetchDays.ts new file mode 100644 index 0000000..c071ecd --- /dev/null +++ b/api/handleApiFetchDays.ts @@ -0,0 +1,95 @@ +import { ImperativeRouter } from 'expo-router' + +import { API_TIMEOUT_MS, URL } from '@/constants/api' +import { clearData } from '@/helper/storeData' + +export type RecordingDay = { + count: number + date: string + thumbnail: string +} + +type handleApiFetchDaysProps = { + router: ImperativeRouter + setDays: React.Dispatch> + setError: (value: React.SetStateAction) => void + setIsLoading: (value: React.SetStateAction) => void + setIsUserLoggedIn: React.Dispatch> + setRetryFn: React.Dispatch void) | null>> + userToken: string +} + +export const handleApiFetchDays = async ({ + router, + setDays, + setError, + setIsLoading, + setIsUserLoggedIn, + setRetryFn, + userToken, +}: handleApiFetchDaysProps) => { + const controller = new AbortController() + const timeoutId = setTimeout(() => { + controller.abort() + }, API_TIMEOUT_MS) + + setIsLoading(true) + try { + const response = await fetch(`${URL}/days`, { + headers: { + Authorization: `Bearer ${userToken}`, + }, + signal: controller.signal, + }) + + clearTimeout(timeoutId) + + if (!response.ok) { + if (response.status === 403) { + setIsUserLoggedIn(false) + setError('') + await clearData(['authToken', 'authRole', 'authName']) + router.replace('/') + return + } + + const data = await response.json().catch(() => ({})) + const message = data.error || response.statusText || 'Unknown error' + throw new Error(`Error ${response.status}: ${message}`) + } + + const data: { days: RecordingDay[] } = await response.json() + setDays(data.days) + + setError('') + setRetryFn(() => {}) + } catch (error: any) { + clearTimeout(timeoutId) + + const errorMessage = + error.name === 'AbortError' || error.message.includes('Aborted') + ? 'Response from Server took too long' + : error.message + setError(errorMessage) + + queueMicrotask(() => { + setRetryFn(() => () => { + handleApiFetchDays({ + router, + setDays, + setError, + setIsLoading, + setIsUserLoggedIn, + setRetryFn, + userToken, + }) + }) + router.push({ + pathname: '/(tabs)/error', + params: { from: 'gallery' }, + }) + }) + } finally { + setIsLoading(false) + } +} diff --git a/api/handleApiFetchImages.ts b/api/handleApiFetchImages.ts index bdfda37..ca1d5f3 100644 --- a/api/handleApiFetchImages.ts +++ b/api/handleApiFetchImages.ts @@ -4,6 +4,7 @@ import { API_TIMEOUT_MS, ITEMS_PER_PAGE, URL } from '@/constants/api' import { clearData } from '@/helper/storeData' type handleApiFetchImagesProps = { + day: string page: number router: ImperativeRouter setError: (value: React.SetStateAction) => void @@ -19,6 +20,7 @@ type handleApiFetchImagesProps = { } export const handleApiFetchImages = async ({ + day, page, router, setError, @@ -41,7 +43,7 @@ export const handleApiFetchImages = async ({ setIsLoading(true) try { - const response = await fetch(`${URL}/images?page=${page}`, { + const response = await fetch(`${URL}/images?day=${day}&page=${page}`, { headers: { Authorization: `Bearer ${userToken}`, }, @@ -101,6 +103,7 @@ export const handleApiFetchImages = async ({ queueMicrotask(() => { setRetryFn(() => () => { handleApiFetchImages({ + day, page, router, setError, diff --git a/app.json b/app.json index c0dbd97..2be3c65 100644 --- a/app.json +++ b/app.json @@ -2,7 +2,7 @@ "expo": { "name": "Security Application", "slug": "security-app", - "version": "1.1.1", + "version": "1.2.0", "orientation": "portrait", "icon": "./assets/images/icon.png", "scheme": "securityapp", diff --git a/app/(tabs)/gallery.tsx b/app/(tabs)/gallery.tsx index 509b886..eff5657 100644 --- a/app/(tabs)/gallery.tsx +++ b/app/(tabs)/gallery.tsx @@ -1,15 +1,18 @@ -import { useBottomTabBarHeight } from 'expo-router/tabs' import { useFocusEffect, useRouter } from 'expo-router' +import { useBottomTabBarHeight } from 'expo-router/tabs' import { useCallback, useContext, useState } from 'react' import { ActivityIndicator, + BackHandler, RefreshControl, StyleSheet, View, } from 'react-native' +import { handleApiFetchDays, RecordingDay } from '@/api/handleApiFetchDays' import { handleApiFetchImages } from '@/api/handleApiFetchImages' import Button from '@/components/button' +import DayGrid from '@/components/day-grid' import HighlightImage from '@/components/highlight-image' import { noFile } from '@/components/icon-symbol' import ImageGrid from '@/components/image-grid' @@ -22,6 +25,7 @@ import { ContextImageRotation } from '@/context/ContextImageRotation' import { ContextPage } from '@/context/ContextPage' import { ContextUser } from '@/context/ContextUser' import { useThemeColor } from '@/hooks/use-theme-color' +import { formatDay } from '@/utils/formatDay' const GalleryScreen = () => { const contextError = useContext(ContextError) @@ -65,69 +69,132 @@ const GalleryScreen = () => { null ) + const [days, setDays] = useState(null) const [images, setImages] = useState(null) const [isLoading, setIsLoading] = useState(true) - const [isLoadingInitially, setIsLoadingInitially] = useState(true) const [isLoadingPull, setIsLoadingPull] = useState(false) + const [selectedDay, setSelectedDay] = useState(null) const [totalImages, setTotalImages] = useState(1) - const handleFetchImages = useCallback( + const handleFetch = useCallback( (setIsLoading: React.Dispatch>) => { - handleApiFetchImages({ - page, - router, - setError, - setImages, - setIsLoading, - setIsNextDisabled, - setIsPreviousDisabled, - setIsUserLoggedIn, - setPage, - setRetryFn, - setTotalImages, - userToken, - }) + if (selectedDay) { + handleApiFetchImages({ + day: selectedDay, + page, + router, + setError, + setImages, + setIsLoading, + setIsNextDisabled, + setIsPreviousDisabled, + setIsUserLoggedIn, + setPage, + setRetryFn, + setTotalImages, + userToken, + }) + } else { + handleApiFetchDays({ + router, + setDays, + setError, + setIsLoading, + setIsUserLoggedIn, + setRetryFn, + userToken, + }) + } }, [ page, router, + selectedDay, setError, - setImages, setIsNextDisabled, setIsPreviousDisabled, setIsUserLoggedIn, setPage, setRetryFn, - setTotalImages, userToken, ] ) - const handleFetchImagesManual = useCallback(() => { - handleFetchImages(setIsLoading) - setIsLoadingInitially(false) - }, [handleFetchImages, setIsLoading, setIsLoadingInitially]) + const handleFetchManual = useCallback(() => { + handleFetch(setIsLoading) + }, [handleFetch]) - const handleFetchImagesPull = () => { - handleFetchImages(setIsLoadingPull) + const handleFetchPull = () => { + handleFetch(setIsLoadingPull) } const handleRotateImage = () => { setImageRotation((prev) => (prev + 180) % 360) } + const handleSelectDay = (date: string) => { + setImages(null) + setPage(1) + setIsPreviousDisabled(true) + setSelectedDay(date) + } + + const handleShowDays = useCallback(() => { + setImageHighlighted(null) + setImages(null) + setSelectedDay(null) + }, []) + useFocusEffect( useCallback(() => { - handleFetchImagesManual() + handleFetchManual() const refresh = setInterval(() => { - handleFetchImagesManual() + handleFetchManual() }, 300000) return () => { clearInterval(refresh) } - }, [handleFetchImagesManual]) + }, [handleFetchManual]) + ) + + useFocusEffect( + useCallback(() => { + const subscription = BackHandler.addEventListener( + 'hardwareBackPress', + () => { + if (imageHighlighted) { + setImageHighlighted(null) + return true + } + if (selectedDay) { + handleShowDays() + return true + } + return false + } + ) + return () => subscription.remove() + }, [handleShowDays, imageHighlighted, selectedDay]) ) + const actions = ( + +