diff --git a/src/assets/icons/calendarwhite.svg b/src/assets/icons/calendarwhite.svg new file mode 100644 index 0000000..03e83b8 --- /dev/null +++ b/src/assets/icons/calendarwhite.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/icons/index.ts b/src/assets/icons/index.ts index 93745e2..da6ca54 100644 --- a/src/assets/icons/index.ts +++ b/src/assets/icons/index.ts @@ -53,6 +53,7 @@ export { default as KebabShareIcon } from './kebabshare.svg'; export { default as KebabTrashIcon } from './kebabtrash.svg'; export { default as KebabMapIcon } from './kebabmap.svg'; export { default as PlusGrayIcon } from './plusgray.svg'; +export { default as CalendarWhiteIcon } from './calendarwhite.svg'; export { default as SearchingIcon } from './searching.svg'; @@ -83,6 +84,7 @@ export { default as StarOffIconV2 } from './StarOffV2.svg'; export { default as ActiveStar } from './active-star.svg'; export { default as BackArrowGray } from './backarrowgray.svg'; export { default as MapMarker } from './mapmarker.svg'; + // 타입 정의 export interface IconProps { fill?: string; diff --git a/src/components/ui/TripDetailCard.tsx b/src/components/ui/TripDetailCard.tsx index 7834f49..ac41435 100644 --- a/src/components/ui/TripDetailCard.tsx +++ b/src/components/ui/TripDetailCard.tsx @@ -29,7 +29,7 @@ const TripDetailCard: React.FC = ({ startTime, endTime, isCurrentSchedule = false, - currentStatusText = '현재 진행되는 일정입니다', + currentStatusText = '현재 진행 중인 일정입니다', actionLabel = '방문지 저장', onPressAction, actionLayout = 'inline', @@ -65,7 +65,7 @@ const navigation = useNavigation(); {startTime} - {endTime} + {endTime} @@ -88,10 +88,15 @@ const navigation = useNavigation(); navigation.navigate('ScheduleMap')} - className="h-[36px] w-[75px] items-center justify-center rounded-[6px]" + className="h-[36px] flex-row items-center justify-center rounded-[6px] p-[10px]" style={{ backgroundColor: accentColor }} > - {actionLabel} + + {actionLabel} + ) diff --git a/src/screens/tripDetail/TripDetailScreen.tsx b/src/screens/tripDetail/TripDetailScreen.tsx index 3e0c3e9..181a2a8 100644 --- a/src/screens/tripDetail/TripDetailScreen.tsx +++ b/src/screens/tripDetail/TripDetailScreen.tsx @@ -37,10 +37,10 @@ const day1Cards = [ ]; const DAY_SECTIONS = [ - { dayLabel: '1일차 / 02/28', cards: day1Cards, showMapIcon: true }, - { dayLabel: '2일차 / 03/01', cards: [], showMapIcon: false }, - { dayLabel: '3일차 / 03/02', cards: [], showMapIcon: false }, - { dayLabel: '4일차 / 03/03', cards: [], showMapIcon: false }, + { dayLabel: '1일차 / 02.28', cards: day1Cards, showMapIcon: true }, + { dayLabel: '2일차 / 03.01', cards: [], showMapIcon: false }, + { dayLabel: '3일차 / 03.02', cards: [], showMapIcon: false }, + { dayLabel: '4일차 / 03.03', cards: [], showMapIcon: false }, ]; const TripDetailScreen: React.FC = () => { diff --git a/src/screens/tripDetail/components/Header.tsx b/src/screens/tripDetail/components/Header.tsx index 7c38287..ac75d3f 100644 --- a/src/screens/tripDetail/components/Header.tsx +++ b/src/screens/tripDetail/components/Header.tsx @@ -3,7 +3,7 @@ import { Image, Text, TouchableOpacity, View } from 'react-native'; import { useNavigation } from '@react-navigation/native'; import type { NativeStackNavigationProp } from '@react-navigation/native-stack'; import type { RootStackParamList } from '@/navigation/types'; -import { WishIcon, LeftArrowIcon, KebabMenuIcon, CalendarIcon } from '@/assets/icons'; +import { WishIcon, LeftArrowIcon, KebabMenuIcon, CalendarWhiteIcon } from '@/assets/icons'; type TripDetailNavigation = NativeStackNavigationProp; @@ -53,7 +53,7 @@ const Header = ({ onPressKebab }: HeaderProps) => { 도쿄 여행 - + 2026.02.28 - 2026.03.03 diff --git a/src/screens/tripDetail/components/KebabMenuSheet.tsx b/src/screens/tripDetail/components/KebabMenuSheet.tsx index d8c74c6..4d87a5f 100644 --- a/src/screens/tripDetail/components/KebabMenuSheet.tsx +++ b/src/screens/tripDetail/components/KebabMenuSheet.tsx @@ -44,11 +44,11 @@ const KebabMenuSheet = ({ isVisible, translateY, onClose }: KebabMenuSheetProps) - + + className="h-14 w-full flex-row items-center px-4"> @@ -58,7 +58,7 @@ const KebabMenuSheet = ({ isVisible, translateY, onClose }: KebabMenuSheetProps) + className="h-14 w-full flex-row items-center px-4"> @@ -68,7 +68,7 @@ const KebabMenuSheet = ({ isVisible, translateY, onClose }: KebabMenuSheetProps) + className="h-14 w-full flex-row items-center px-4"> @@ -78,7 +78,7 @@ const KebabMenuSheet = ({ isVisible, translateY, onClose }: KebabMenuSheetProps) + className="h-14 w-full flex-row items-center px-4"> @@ -91,4 +91,3 @@ const KebabMenuSheet = ({ isVisible, translateY, onClose }: KebabMenuSheetProps) }; export default KebabMenuSheet; -