Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/assets/icons/calendarwhite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/assets/icons/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;
Expand Down
13 changes: 9 additions & 4 deletions src/components/ui/TripDetailCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const TripDetailCard: React.FC<TripDetailCardProps> = ({
startTime,
endTime,
isCurrentSchedule = false,
currentStatusText = '현재 진행되는 일정입니다',
currentStatusText = '현재 진행 중인 일정입니다',
actionLabel = '방문지 저장',
onPressAction,
actionLayout = 'inline',
Expand Down Expand Up @@ -65,7 +65,7 @@ const navigation = useNavigation<TripDetailNavigation>();

<View className="justify-between py-[13px] items-end">
<Text className="text-p font-pretendardBold" style={{ color: accentColor }}>{startTime}</Text>
<Text className="mt-1 text-p text-gray">{endTime}</Text>
<Text className="mt-[2px] text-p text-gray">{endTime}</Text>
</View>
</View>

Expand All @@ -88,10 +88,15 @@ const navigation = useNavigation<TripDetailNavigation>();
<TouchableOpacity
activeOpacity={0.8}
onPress={() => 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 }}
>
<Text className="text-p text-white">{actionLabel}</Text>
<Text
className="text-p text-center text-white"
style={{ includeFontPadding: false, textAlignVertical: 'center' }}
>
{actionLabel}
</Text>
</TouchableOpacity>
</View>
)
Expand Down
8 changes: 4 additions & 4 deletions src/screens/tripDetail/TripDetailScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => {
Expand Down
4 changes: 2 additions & 2 deletions src/screens/tripDetail/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<RootStackParamList, 'TripDetailScreen'>;

Expand Down Expand Up @@ -53,7 +53,7 @@ const Header = ({ onPressKebab }: HeaderProps) => {
<View className="absolute bottom-[19px] left-4">
<Text className="mb-[6px] text-title font-pretendardBold text-white">도쿄 여행</Text>
<View className="flex-row items-center">
<CalendarIcon width={16} height={16} />
<CalendarWhiteIcon width={16} height={16} />
<Text className="ml-[6px] text-p text-white">2026.02.28 - 2026.03.03</Text>
</View>
</View>
Expand Down
11 changes: 5 additions & 6 deletions src/screens/tripDetail/components/KebabMenuSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ const KebabMenuSheet = ({ isVisible, translateY, onClose }: KebabMenuSheetProps)
<Animated.View
className="absolute bottom-0 left-0 right-0 z-50"
style={sheetStyle}>
<View className="w-full rounded-t-[12px] bg-white px-4 pb-[28px] pt-[28px]">
<View className="w-full rounded-t-[12px] bg-white px-4 py-4">
<TouchableOpacity
activeOpacity={0.8}
onPress={onClose}
className="flex-row items-center px-4 pb-3">
className="h-14 w-full flex-row items-center px-4">
<View className="mr-3">
<KebabEditIcon />
</View>
Expand All @@ -58,7 +58,7 @@ const KebabMenuSheet = ({ isVisible, translateY, onClose }: KebabMenuSheetProps)
<TouchableOpacity
activeOpacity={0.8}
onPress={onClose}
className="flex-row items-center px-4 py-3">
className="h-14 w-full flex-row items-center px-4">
<View className="mr-3">
<KebabCalIcon />
</View>
Expand All @@ -68,7 +68,7 @@ const KebabMenuSheet = ({ isVisible, translateY, onClose }: KebabMenuSheetProps)
<TouchableOpacity
activeOpacity={0.8}
onPress={onClose}
className="flex-row items-center px-4 py-3">
className="h-14 w-full flex-row items-center px-4">
<View className="mr-3">
<KebabShareIcon />
</View>
Expand All @@ -78,7 +78,7 @@ const KebabMenuSheet = ({ isVisible, translateY, onClose }: KebabMenuSheetProps)
<TouchableOpacity
activeOpacity={0.8}
onPress={onClose}
className="flex-row items-center px-4 py-3">
className="h-14 w-full flex-row items-center px-4">
<View className="mr-3">
<KebabTrashIcon />
</View>
Expand All @@ -91,4 +91,3 @@ const KebabMenuSheet = ({ isVisible, translateY, onClose }: KebabMenuSheetProps)
};

export default KebabMenuSheet;