diff --git a/packages/design-system/src/TextField.tsx b/packages/design-system/src/TextField.tsx index fa4ad4ab..e6bf1f70 100644 --- a/packages/design-system/src/TextField.tsx +++ b/packages/design-system/src/TextField.tsx @@ -12,6 +12,7 @@ interface TextField { withoutBorder?: boolean; isTitle?: boolean; style?: StyleProp; + maxLength?: number; } export function TextField({ @@ -26,6 +27,7 @@ export function TextField({ withoutBorder = false, isTitle = false, style, + maxLength, }: TextField) { const defaultClassName = 'text-SPOT-white text-body2 rounded-md p-4'; const incorrectClassName = 'border-SPOT-red border-[2px]'; @@ -46,13 +48,17 @@ export function TextField({ value={value} onChangeText={onChange} placeholder={placeholder} - placeholderTextColor='#ffffff' + placeholderTextColor="#ffffff" className={`${defaultClassName} ${border} ${getBorderClassName()}`} onSubmitEditing={onSubmit} + maxLength={maxLength} numberOfLines={Platform.OS === 'ios' ? undefined : numberOfLines} style={[ { - minHeight: Platform.OS === 'ios' && numberOfLines && numberOfLines ? 30 * numberOfLines : undefined, + minHeight: + Platform.OS === 'ios' && numberOfLines && numberOfLines + ? 30 * numberOfLines + : undefined, backgroundColor: bgColor, fontSize: isTitle ? 22 : undefined, lineHeight: isTitle ? 30 : undefined, diff --git a/packages/react-native/src/apis/queries/mypage/useMyBadgeQuery.ts b/packages/react-native/src/apis/queries/mypage/useMyBadgeQuery.ts index 78e72088..4de9fe72 100644 --- a/packages/react-native/src/apis/queries/mypage/useMyBadgeQuery.ts +++ b/packages/react-native/src/apis/queries/mypage/useMyBadgeQuery.ts @@ -3,7 +3,6 @@ import useAuthAxios from '@/apis/useAuthAxios'; import { BADGE_MAPPER, Region } from '@/constants/CITY'; import QUERY_KEYS from '@/constants/QUERY_KEYS'; import { ServerResponse } from '@/types/response'; -import unique from '@/utils/unique'; import { badgePath } from '@/components/common/Badge'; interface BadgeResponse { diff --git a/packages/react-native/src/assets/filters/thumb_dokkaebi1.png b/packages/react-native/src/assets/filters/thumb_dokkaebi1.png new file mode 100644 index 00000000..31c038fd Binary files /dev/null and b/packages/react-native/src/assets/filters/thumb_dokkaebi1.png differ diff --git a/packages/react-native/src/assets/filters/thumb_dokkaebi2.png b/packages/react-native/src/assets/filters/thumb_dokkaebi2.png new file mode 100644 index 00000000..dd0e2acb Binary files /dev/null and b/packages/react-native/src/assets/filters/thumb_dokkaebi2.png differ diff --git a/packages/react-native/src/assets/filters/thumb_dongbaekkkotPilMuryeop1.png b/packages/react-native/src/assets/filters/thumb_dongbaekkkotPilMuryeop1.png new file mode 100644 index 00000000..beb8dad4 Binary files /dev/null and b/packages/react-native/src/assets/filters/thumb_dongbaekkkotPilMuryeop1.png differ diff --git a/packages/react-native/src/assets/filters/thumb_dongbaekkkotPilMuryeop2.png b/packages/react-native/src/assets/filters/thumb_dongbaekkkotPilMuryeop2.png new file mode 100644 index 00000000..beb8dad4 Binary files /dev/null and b/packages/react-native/src/assets/filters/thumb_dongbaekkkotPilMuryeop2.png differ diff --git a/packages/react-native/src/assets/filters/thumb_itaewonClass.png b/packages/react-native/src/assets/filters/thumb_itaewonClass.png new file mode 100644 index 00000000..6663092d Binary files /dev/null and b/packages/react-native/src/assets/filters/thumb_itaewonClass.png differ diff --git a/packages/react-native/src/assets/filters/thumb_mrSunshine.png b/packages/react-native/src/assets/filters/thumb_mrSunshine.png new file mode 100644 index 00000000..b8e3dca6 Binary files /dev/null and b/packages/react-native/src/assets/filters/thumb_mrSunshine.png differ diff --git a/packages/react-native/src/assets/filters/thumb_saranguiBulsiChak1.png b/packages/react-native/src/assets/filters/thumb_saranguiBulsiChak1.png new file mode 100644 index 00000000..aeef68e3 Binary files /dev/null and b/packages/react-native/src/assets/filters/thumb_saranguiBulsiChak1.png differ diff --git a/packages/react-native/src/assets/filters/thumb_saranguiBulsiChak2.png b/packages/react-native/src/assets/filters/thumb_saranguiBulsiChak2.png new file mode 100644 index 00000000..aeef68e3 Binary files /dev/null and b/packages/react-native/src/assets/filters/thumb_saranguiBulsiChak2.png differ diff --git a/packages/react-native/src/assets/filters/thumb_seumuldaseotSeumulHana1.png b/packages/react-native/src/assets/filters/thumb_seumuldaseotSeumulHana1.png new file mode 100644 index 00000000..0842fd8a Binary files /dev/null and b/packages/react-native/src/assets/filters/thumb_seumuldaseotSeumulHana1.png differ diff --git a/packages/react-native/src/assets/filters/thumb_seumuldaseotSeumulHana2.png b/packages/react-native/src/assets/filters/thumb_seumuldaseotSeumulHana2.png new file mode 100644 index 00000000..d08d797e Binary files /dev/null and b/packages/react-native/src/assets/filters/thumb_seumuldaseotSeumulHana2.png differ diff --git a/packages/react-native/src/assets/plan.png b/packages/react-native/src/assets/plan.png deleted file mode 100644 index 62ffa18d..00000000 Binary files a/packages/react-native/src/assets/plan.png and /dev/null differ diff --git a/packages/react-native/src/components/camera/FilterCarousel.tsx b/packages/react-native/src/components/camera/FilterCarousel.tsx index b00aec33..3d68f1c1 100644 --- a/packages/react-native/src/components/camera/FilterCarousel.tsx +++ b/packages/react-native/src/components/camera/FilterCarousel.tsx @@ -5,7 +5,7 @@ import Animated, { interpolate, useAnimatedStyle, } from 'react-native-reanimated'; -import FILTER_PATHS from '@/constants/FILTER_PATHS'; +import { THUMBNAIL_PATHS } from '@/constants/FILTER_PATHS'; const { width } = Dimensions.get('window'); @@ -18,7 +18,7 @@ interface FilterCarouselProps { } interface FilterItemProps { - item: (typeof FILTER_PATHS)[number]; + item: (typeof THUMBNAIL_PATHS)[number]; animationValue: Animated.SharedValue; onPress: () => void; } @@ -76,7 +76,7 @@ function FilterCarousel({ handleSnap, }: FilterCarouselProps) { const carouselRef = useRef(null); - const experienceFilterLength = FILTER_PATHS.length; + const experienceFilterLength = THUMBNAIL_PATHS.length; const snapToIndex = (index: number) => { const moveMent = Math.abs(filterIndex - index); @@ -119,7 +119,7 @@ function FilterCarousel({ : experienceFilterLength - 2 + filterIndex } scrollAnimationDuration={500} - data={FILTER_PATHS} + data={THUMBNAIL_PATHS} onSnapToItem={(index) => { handleSnap((index + 2) % experienceFilterLength); }} diff --git a/packages/react-native/src/components/editPlan/EditPlanTitle.tsx b/packages/react-native/src/components/editPlan/EditPlanTitle.tsx index 8131ae24..3baf2e1e 100644 --- a/packages/react-native/src/components/editPlan/EditPlanTitle.tsx +++ b/packages/react-native/src/components/editPlan/EditPlanTitle.tsx @@ -1,6 +1,5 @@ import { Font } from 'design-system'; -import { View, TouchableOpacity } from 'react-native'; -import BackIcon from '@/assets/BackIcon'; +import { View } from 'react-native'; import { City, Region } from '@/constants/CITY'; import { getDateString } from '@/utils/date'; import { getDisplayRegion } from '@/utils/getDisplayRegionName'; @@ -24,9 +23,6 @@ export default function EditPlanTitle({ className="items-center justify-center flex-row" style={{ gap: 30 }} > - - - {getDisplayRegion({ @@ -40,9 +36,6 @@ export default function EditPlanTitle({ {getDateString(endDate, '.')} - - - ); diff --git a/packages/react-native/src/components/home/contents/SetJetting.tsx b/packages/react-native/src/components/home/contents/SetJetting.tsx index e473bf2e..94f3553e 100644 --- a/packages/react-native/src/components/home/contents/SetJetting.tsx +++ b/packages/react-native/src/components/home/contents/SetJetting.tsx @@ -1,6 +1,5 @@ import { Font } from 'design-system'; import { Image, ImageSourcePropType, View } from 'react-native'; -import ContentImage from '../ContentImage'; import SetJettingContent from '../SetJettingContent'; interface SetJettingContent { diff --git a/packages/react-native/src/components/maps/RecordFormDescription.tsx b/packages/react-native/src/components/maps/RecordFormDescription.tsx index b29dadbe..eb69ba00 100644 --- a/packages/react-native/src/components/maps/RecordFormDescription.tsx +++ b/packages/react-native/src/components/maps/RecordFormDescription.tsx @@ -17,6 +17,7 @@ export default function RecordFormDescription() { value={description} onChange={handleDescriptionChange} placeholder="내용을 작성해주세요." + maxLength={255} /> diff --git a/packages/react-native/src/components/maps/RecordFormTitle.tsx b/packages/react-native/src/components/maps/RecordFormTitle.tsx index 28a604e4..7a20d171 100644 --- a/packages/react-native/src/components/maps/RecordFormTitle.tsx +++ b/packages/react-native/src/components/maps/RecordFormTitle.tsx @@ -16,6 +16,7 @@ export default function RecordFormTitle() { value={title} onChange={handleTitleChange} placeholder="제목" + maxLength={255} /> item.filter); +const THUMBNAIL_PATHS = FILTER_FULL_PATHS.map((item) => item.thumbnail); + +export { FILTER_PATHS, THUMBNAIL_PATHS }; diff --git a/packages/react-native/src/pages/CameraPage.tsx b/packages/react-native/src/pages/CameraPage.tsx index 7bd331e0..64b105ed 100644 --- a/packages/react-native/src/pages/CameraPage.tsx +++ b/packages/react-native/src/pages/CameraPage.tsx @@ -7,7 +7,7 @@ import useGallery from '@/hooks/useGallery'; import CheckPhoto from '@/components/camera/CheckPhoto'; import SpotCamera from '@/components/camera/SpotCamera'; import { StackRouteProps } from '@/types/navigation'; -import FILTER_PATHS from '@/constants/FILTER_PATHS'; +import { FILTER_PATHS } from '@/constants/FILTER_PATHS'; import FilterCarousel from '@/components/camera/FilterCarousel'; export default function CameraPage() { diff --git a/packages/react-native/src/pages/Landing/Landing1.tsx b/packages/react-native/src/pages/Landing/Landing1.tsx index 02d0b226..9dd10b74 100644 --- a/packages/react-native/src/pages/Landing/Landing1.tsx +++ b/packages/react-native/src/pages/Landing/Landing1.tsx @@ -30,7 +30,6 @@ export default function Landing1() { }} > - 로그보기 + 여행기록보기 diff --git a/packages/react-native/src/pages/TripPlanner/TripPlannerDetail.tsx b/packages/react-native/src/pages/TripPlanner/TripPlannerDetail.tsx index 605dede6..8ea45ed8 100644 --- a/packages/react-native/src/pages/TripPlanner/TripPlannerDetail.tsx +++ b/packages/react-native/src/pages/TripPlanner/TripPlannerDetail.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { Image, ScrollView, TouchableOpacity, View } from 'react-native'; -import { Font } from 'design-system'; +import { ScrollView, TouchableOpacity, View } from 'react-native'; +import { Button, Font } from 'design-system'; import { useNavigation, useRoute } from '@react-navigation/native'; import CardSlider from '@/components/common/CardSlider'; import Header from '@/components/common/Header'; @@ -52,22 +52,6 @@ export default withSuspense(function TripPlannerDetail() { - - 나의 일정 - - - - navigation.navigate('TripPlanner/EditPlan', { tripId }) - } - > - - + + +