refactor: 남은 시간 계산 함수 분리

* util 파일로 분리하고 여러 곳에서 이용 가능하도록 리팩토링
LikeKNU · Sep 17, 2024 · 0d3b753 · 0d3b753
1 parent b90548c
commit 0d3b753
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/app/bus/timetable/components/BusArrivalTimeListItem.tsx b/app/bus/timetable/components/BusArrivalTimeListItem.tsx
@@ -5,6 +5,7 @@ import FontText from '@/common/text/FontText';
 import colors, { campusColors } from '@/constants/colors';
 import { BusArrivalProps } from '@/types/busTypes';
 import { hexToRgba } from '@/utils/color';
+import { calculateTimeRemaining } from '@/utils/date';
 import { useEffect, useRef } from 'react';
 import { Animated, StyleSheet, View } from 'react-native';
 import AnimatedValue = Animated.AnimatedValue;
@@ -19,25 +20,6 @@ const BusArrivalTimeListItem = ({ arrivalBus, isNext }: BusArrivalTimeListItemPr
   const { campus } = useCampus();
   const animatedBackgroundOpacity = useRef<AnimatedValue>(new Animated.Value(0)).current;
 
-  const calculateTimeRemaining = (arrivalTime: string): string => {
-    const now = new Date();
-    const [hours, minutes] = arrivalTime.split(':').map(Number);
-    const arrival = new Date(now.getFullYear(), now.getMonth(), now.getDate(), hours, minutes);
-    if (arrival < now) {
-      return '';
-    }
-    const diffInMinutes = Math.round((arrival.getTime() - now.getTime()) / 60000);
-    if (diffInMinutes < 1) {
-      return '도착';
-    } else if (diffInMinutes < 60) {
-      return `${diffInMinutes}분 후`;
-    } else {
-      const hours = Math.floor(diffInMinutes / 60);
-      const minutes = diffInMinutes % 60;
-      return `${hours}시간 ${minutes}분 후`;
-    }
-  };
-
   useEffect(() => {
     if (isNext) {
       const animation = Animated.sequence([

diff --git a/app/bus/timetable/index.tsx b/app/bus/timetable/index.tsx
@@ -6,6 +6,7 @@ import PageLayout from '@/common/components/PageLayout';
 import { useTheme } from '@/common/contexts/ThemeContext';
 import colors from '@/constants/colors';
 import { CityBusRouteProps } from '@/types/busTypes';
+import { calculateTimeRemaining } from '@/utils/date';
 import {
   BottomSheetBackdrop,
   BottomSheetBackdropProps,
@@ -37,7 +38,7 @@ const CityBusTimetablePage = () => {
   ), []);
 
   const busRouteListItem = useCallback((item: CityBusRouteProps) => {
-    const time = item.nextArrivalTime && item.nextArrivalTime.slice(0, -3);
+    const time = item.nextArrivalTime && calculateTimeRemaining(item.nextArrivalTime);
     return (
       <BusRouteListItem
         origin={item.origin}
@@ -60,6 +61,7 @@ const CityBusTimetablePage = () => {
           showsVerticalScrollIndicator={false}
           refreshControl={
             <RefreshControl
+              tintColor={colors[theme].gray100}
               refreshing={isLoading}
               onRefresh={mutate}
             />

diff --git a/utils/date.ts b/utils/date.ts
@@ -25,3 +25,22 @@ export const determineTimeStatus = (timeRange: string): OperatingType => {
     return OperatingStatus.OPERATE as OperatingType;
   }
 };
+
+export const calculateTimeRemaining = (arrivalTime: string): string => {
+  const now = new Date();
+  const [hours, minutes] = arrivalTime.split(':').map(Number);
+  const arrival = new Date(now.getFullYear(), now.getMonth(), now.getDate(), hours, minutes);
+  if (arrival < now) {
+    return '';
+  }
+  const diffInMinutes = Math.round((arrival.getTime() - now.getTime()) / 60000);
+  if (diffInMinutes < 1) {
+    return '곧 도착';
+  } else if (diffInMinutes < 60) {
+    return `${diffInMinutes}분 후`;
+  } else {
+    const hours = Math.floor(diffInMinutes / 60);
+    const minutes = diffInMinutes % 60;
+    return `${hours}시간 ${minutes}분 후`;
+  }
+};