Skip to content

hotfix: qa 1002 #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 6, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
10 changes: 8 additions & 2 deletions packages/design-system/src/TextField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ interface TextField {
withoutBorder?: boolean;
isTitle?: boolean;
style?: StyleProp<TextStyle>;
maxLength?: number;
}

export function TextField({
Expand All @@ -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]';
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Font } from 'design-system';
import { View, TouchableOpacity } from 'react-native';

Check warning on line 2 in packages/react-native/src/components/editPlan/EditPlanTitle.tsx

View workflow job for this annotation

GitHub Actions / build

'TouchableOpacity' is defined but never used
import BackIcon from '@/assets/BackIcon';

Check warning on line 3 in packages/react-native/src/components/editPlan/EditPlanTitle.tsx

View workflow job for this annotation

GitHub Actions / build

'BackIcon' is defined but never used
import { City, Region } from '@/constants/CITY';
import { getDateString } from '@/utils/date';
import { getDisplayRegion } from '@/utils/getDisplayRegionName';
Expand All @@ -24,9 +24,6 @@
className="items-center justify-center flex-row"
style={{ gap: 30 }}
>
<TouchableOpacity className="p-2">
<BackIcon />
</TouchableOpacity>
<View className="items-center">
<Font.Bold type="title1" color="white">
{getDisplayRegion({
Expand All @@ -40,9 +37,6 @@
{getDateString(endDate, '.')}
</Font.Light>
</View>
<TouchableOpacity className="rotate-180 p-2">
<BackIcon />
</TouchableOpacity>
</View>
</View>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export default function RecordFormDescription() {
value={description}
onChange={handleDescriptionChange}
placeholder="내용을 작성해주세요."
maxLength={255}
/>
</View>
</View>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export default function RecordFormTitle() {
value={title}
onChange={handleTitleChange}
placeholder="제목"
maxLength={255}
/>
<View className="w-full justify-center items-end mt-2.5">
<Font
Expand Down
1 change: 0 additions & 1 deletion packages/react-native/src/pages/Landing/Landing1.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export default function Landing1() {
}}
>
<Image
// eslint-disable-next-line global-require
source={require('../../assets/landing/landing1.png')}
style={{
width,
Expand Down
1 change: 0 additions & 1 deletion packages/react-native/src/pages/Landing/Landing2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export default function Landing2() {
}}
>
<Image
// eslint-disable-next-line global-require
source={require('../../assets/landing/landing2.png')}
style={{ width, height: undefined, aspectRatio: 2.9 / 5 }}
resizeMode="contain"
Expand Down
1 change: 0 additions & 1 deletion packages/react-native/src/pages/Landing/Landing3.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export default function Landing3() {
}}
>
<Image
// eslint-disable-next-line global-require
source={require('../../assets/landing/landing3.png')}
style={{ width, height: undefined, aspectRatio: 2.9 / 5 }}
resizeMode="contain"
Expand Down
1 change: 0 additions & 1 deletion packages/react-native/src/pages/Landing/Landing4.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export default function Landing4() {
}}
>
<Image
// eslint-disable-next-line global-require
source={require('../../assets/landing/landing4.png')}
style={{ width, height: undefined, aspectRatio: 2.9 / 5 }}
resizeMode="contain"
Expand Down
1 change: 0 additions & 1 deletion packages/react-native/src/pages/Landing/Landing5.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export default function Landing5() {
}}
>
<Image
// eslint-disable-next-line global-require
source={require('../../assets/landing/landing5.png')}
style={{ width, height: undefined, aspectRatio: 2.9 / 5 }}
resizeMode="contain"
Expand Down
1 change: 0 additions & 1 deletion packages/react-native/src/pages/Landing/Landing6.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export default function Landing6() {
}}
>
<Image
// eslint-disable-next-line global-require
source={require('../../assets/landing/landing6.png')}
style={{ width, height: undefined, aspectRatio: 2.9 / 5 }}
resizeMode="contain"
Expand Down
1 change: 0 additions & 1 deletion packages/react-native/src/pages/Landing/Landing7.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export default function Landing7() {
}}
>
<Image
// eslint-disable-next-line global-require
source={require('../../assets/landing/landing7.png')}
style={{ width, height: undefined, aspectRatio: 2.9 / 5 }}
resizeMode="contain"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/src/pages/Maps/Maps.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ export default withSuspense(function Maps({ navigation }: MapsMainProps) {
}}
>
<Font type="title1" color="black">
로그보기
여행기록보기
</Font>
</TouchableOpacity>
</View>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export default withSuspense(function TripPlannerDetail() {
}
>
<Image
// eslint-disable-next-line global-require
source={require('../../assets/plan.png')}
style={{ width: 'auto', height: undefined, aspectRatio: 5 / 2 }}
/>
Expand Down
Loading