Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 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
2 changes: 1 addition & 1 deletion .script/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

sh ./.script/pre-install.sh

yarn install
yarn install --immutable

sh ./.script/post-install.sh
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@react-navigation/native": "^6.1.18",
"@react-navigation/stack": "^6.4.1",
"@tanstack/react-query": "^5.66.9",
"@ummgoban/shared": "0.0.1-alpha.6",
"@ummgoban/shared": "0.0.5",
"axios": "^1.7.4",
"dayjs": "^1.11.13",
"react": "18.3.1",
Expand Down
23 changes: 23 additions & 0 deletions src/components/common/Checkbox/CustomCheckbox.style.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import styled from '@emotion/native';

const S = {
Container: styled.View`
display: flex;
background-color: ${({theme}) => theme.colors.secondary};

border-radius: 8px;
justify-content: center;
align-items: center;
width: 32px;
height: 32px;
`,

TouchWrapper: styled.Pressable`
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
`,
};

export default S;
27 changes: 27 additions & 0 deletions src/components/common/Checkbox/CustomCheckbox.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from 'react';
import Icon from 'react-native-vector-icons/Entypo';
import S from './CustomCheckbox.style';

type CustomCheckboxProps = {
checked: boolean;
onPress: () => void;
size?: number;
color?: string;
};

const CustomCheckbox = ({
checked,
onPress,
size = 18,
color = 'black',
}: CustomCheckboxProps) => {
return (
<S.Container>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

그냥 Checkbox 라는 이름으로 사용해도 될 것같아요

아니면 사각형이니까 SquareCheckbox로 작명하고 추후 변경사항이 생기면 CircleCheckbox,...등등 추가하고 한 단계 추상화 컴포넌트를 만드는 것으로 확장하죠

Copy link
Contributor Author

@l-lyun l-lyun Aug 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵 좋습니다~! SquareCheckbox로 진행하겠습니다 👍

<S.TouchWrapper onPress={onPress}>
{checked && <Icon name="check" size={size} color={color} />}
</S.TouchWrapper>
</S.Container>
);
};

export default CustomCheckbox;
1 change: 1 addition & 0 deletions src/components/common/Checkbox/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {default as CustomCheckbox} from './CustomCheckbox';
1 change: 0 additions & 1 deletion src/components/common/TextInput/TextInput.style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ const S = {

ErrorText: styled(Text)`
color: ${({theme}) => theme.colors.error};

font-family: Pretendard;
font-size: 14px;
font-style: normal;
Expand Down
2 changes: 2 additions & 0 deletions src/components/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ export {default as BottomButton} from './BottomButton';
export {default as Label} from './Label';

export {ToggleButton, ToggleButtonGroup} from './ToggleButton';

export {CustomCheckbox} from './Checkbox';
78 changes: 65 additions & 13 deletions src/screens/MarketInfoScreen/MarketInfoScreen.style.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from '@emotion/native';
import {Button, Text} from 'react-native-paper';
import {Button} from 'react-native-paper';

export const HORIZONTAL_MARGIN = 16;
export const IMAGE_CARD_GAP = 8;
Expand All @@ -8,6 +8,7 @@ const S = {
Container: styled.View`
flex: 1;
`,

ScrollView: styled.ScrollView`
padding: 16px;

Expand All @@ -21,19 +22,75 @@ const S = {
gap: 8px;
`,

BusinessTimeInput: styled.View`
padding: 12px 40px;
`,

TimeHeader: styled.View`
flex-direction: row;
align-items: center;
margin-bottom: 4px;
padding: 0 12px;
`,

DayHeaderText: styled.Text`
flex: 1;
text-align: left;
padding-left: 4px;
${({theme}) => theme.fonts.body2}
`,

TimeHeaderText: styled.Text`
${({theme}) => theme.fonts.body2}
flex: 1;
text-align: center;
`,

ClosedHeaderText: styled.Text`
flex: 1;
${({theme}) => theme.fonts.body2}
text-align: right;
margin-left: 0px;
`,

TimeContainer: styled.View`
display: flex;
flex-direction: row;
align-items: center;
margin-bottom: 4px;
padding: 0 8px;
`,

DayText: styled.Text`
flex: 1;
${({theme}) => theme.fonts.body2};
text-align: left;
`,

TimeRange: styled.View`
flex: 1;
flex-direction: row;
align-items: center;
justify-content: center;
`,

TimePickerButton: styled(Button)``,
ClosedCheckboxWrapper: styled.View`
display: flex;
flex: 1;
align-items: flex-end;
`,

ClosedCheckboxContainer: styled.View`
width: 36px;
justify-content: center;
align-items: center;
background-color: white;
border-radius: 8px;
margin: 4px;
`,

BusinessTimeInput: styled.View``,
TimePickerButton: styled(Button)``,

ImageCardGrid: styled.View`
display: flex;
flex-direction: row;
flex-wrap: wrap;

Expand All @@ -42,17 +99,12 @@ const S = {
margin: 16px 0;
`,

DayText: styled(Text)`
${({theme}) => theme.fonts.body2}
`,

ImageCardPlusButton: styled(Button)`
border: 1px solid #e0e0e0;

width: 100%;

margin: 16px 0;
`,

ImageCard: styled.View<{width: number}>`
position: relative;

Expand All @@ -65,6 +117,7 @@ const S = {

box-sizing: border-box;

height: 92px;
border: 1px solid #e0e0e0;
`,

Expand All @@ -83,9 +136,8 @@ const S = {

border-radius: 16px;

background-color: #fff;

display: flex;
background-color: #fff;
justify-content: center;
align-items: center;
`,
Expand Down
Loading
Loading