-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #53 from dnd-side-project/feature/20
[#20] ์ถ์ฒ ๋ฉ์ธ ํ์ด์ง ์ ์ (๋ฏธ์)
- Loading branch information
Showing
15 changed files
with
209 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
export const TestData = [ | ||
{ | ||
title: '๋ด ์ฌ์ง 1', | ||
url: 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTEX7G8-sgp2THgvgbzQIU_bZUfD17tCnPkXQ&usqp=CAU', | ||
id: '1', | ||
}, | ||
{ | ||
title: '๋ด ์ฌ์ง 2', | ||
url: 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcT_NHQH8W9koZ55iRPtxTaRnbNdQPk8sW1qfQ&usqp=CAU', | ||
id: '2', | ||
}, | ||
{ | ||
title: '๋ด ์ฌ์ง 3', | ||
url: 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcS1WiqMjj0m-M2oAso4DSt_fJTCIg789uDnQQ&usqp=CAU', | ||
id: '3', | ||
}, | ||
{ | ||
title: '๋ด ์ฌ์ง 4', | ||
url: 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRKwYVEk9ka6g5S3pg6vA3pj7M9lNVV0e73Wg&usqp=CAU', | ||
id: '4', | ||
}, | ||
]; |
9 changes: 9 additions & 0 deletions
9
src/components/DefaultScrollView/DefaultScrollView.styles.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import styled from '@emotion/native'; | ||
|
||
import theme from 'src/styles/Theme'; | ||
|
||
export const DefaultScroll = styled.ScrollView({ | ||
backgroundColor: theme.colors.grayscale[1], | ||
width: '100%', | ||
height: '100%', | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import React, {PropsWithChildren} from 'react'; | ||
|
||
import {DefaultScroll} from './DefaultScrollView.styles'; | ||
|
||
const DefaultScrollView = ({children}: PropsWithChildren) => { | ||
return <DefaultScroll bounces={false}>{children}</DefaultScroll>; | ||
}; | ||
|
||
export default DefaultScrollView; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
import DefaultScrollView from './DefaultScrollView'; | ||
|
||
export default DefaultScrollView; |
16 changes: 16 additions & 0 deletions
16
src/components/FrameRecommendOrganism/FrameRecommendOrganism.styles.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import styled from '@emotion/native'; | ||
|
||
import {heightPercentage, widthPercentage} from 'src/styles/ScreenResponse'; | ||
|
||
export const TitleWrapper = styled.View({ | ||
marginLeft: widthPercentage(16), | ||
}); | ||
|
||
export const OrganismView = styled.View({ | ||
marginTop: heightPercentage(8), | ||
}); | ||
|
||
export const ButtonWrapper = styled.View({ | ||
marginTop: heightPercentage(32), | ||
paddingLeft: widthPercentage(16), | ||
}); |
37 changes: 37 additions & 0 deletions
37
src/components/FrameRecommendOrganism/FrameRecommendOrganism.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
import React, {PropsWithChildren} from 'react'; | ||
|
||
import PressableAddition from '../PressableAddition'; | ||
import RecommendPreviewFourCard from '../RecommendPreviewFourCard'; | ||
import {SubHeadline2} from '../utils/Text'; | ||
import {ButtonWrapper, OrganismView, TitleWrapper} from './FrameRecommendOrganism.styles'; | ||
|
||
import {TestData} from 'src/TestData'; | ||
|
||
export interface Props { | ||
data: ReadonlyArray<renderItemList['item']>; | ||
} | ||
|
||
export type renderItemList = { | ||
item: { | ||
url: string; | ||
id: string; | ||
title: string; | ||
}; | ||
}; | ||
|
||
const FrameRecommendOrganism = ({children}: PropsWithChildren) => { | ||
//TO-DO data fetching | ||
return ( | ||
<OrganismView> | ||
<TitleWrapper> | ||
<SubHeadline2>{children}</SubHeadline2> | ||
</TitleWrapper> | ||
<RecommendPreviewFourCard data={TestData} /> | ||
<ButtonWrapper> | ||
<PressableAddition>์ฌ์ง ๋๋ณด๊ธฐ</PressableAddition> | ||
</ButtonWrapper> | ||
</OrganismView> | ||
); | ||
}; | ||
|
||
export default FrameRecommendOrganism; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
import FrameRecommendOrganism from './FrameRecommendOrganism'; | ||
|
||
export default FrameRecommendOrganism; |
16 changes: 16 additions & 0 deletions
16
src/components/PoseRecommendOrganism/PoseRecommendOrganism.styles.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import styled from '@emotion/native'; | ||
|
||
import {heightPercentage, widthPercentage} from 'src/styles/ScreenResponse'; | ||
|
||
export const TitleWrapper = styled.View({ | ||
marginLeft: widthPercentage(16), | ||
}); | ||
|
||
export const OrganismView = styled.View({ | ||
marginTop: heightPercentage(8), | ||
}); | ||
|
||
export const ButtonWrapper = styled.View({ | ||
marginTop: heightPercentage(32), | ||
paddingLeft: widthPercentage(16), | ||
}); |
37 changes: 37 additions & 0 deletions
37
src/components/PoseRecommendOrganism/PoseRecommendOrganism.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
import React, {PropsWithChildren} from 'react'; | ||
|
||
import PressableAddition from '../PressableAddition'; | ||
import RecommendPreviewFourCard from '../RecommendPreviewFourCard'; | ||
import {SubHeadline2} from '../utils/Text'; | ||
import {ButtonWrapper, OrganismView, TitleWrapper} from './PoseRecommendOrganism.styles'; | ||
|
||
import {TestData} from 'src/TestData'; | ||
|
||
export interface Props { | ||
data: ReadonlyArray<renderItemList['item']>; | ||
} | ||
|
||
export type renderItemList = { | ||
item: { | ||
url: string; | ||
id: string; | ||
title: string; | ||
}; | ||
}; | ||
|
||
const PoseRecommendOrganism = ({children}: PropsWithChildren) => { | ||
//TO-DO data fetching | ||
return ( | ||
<OrganismView> | ||
<TitleWrapper> | ||
<SubHeadline2>{children}</SubHeadline2> | ||
</TitleWrapper> | ||
<RecommendPreviewFourCard data={TestData} /> | ||
<ButtonWrapper> | ||
<PressableAddition>์ฌ์ง ๋๋ณด๊ธฐ</PressableAddition> | ||
</ButtonWrapper> | ||
</OrganismView> | ||
); | ||
}; | ||
|
||
export default PoseRecommendOrganism; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
import PoseRecommendOrganism from './PoseRecommendOrganism'; | ||
|
||
export default PoseRecommendOrganism; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 5 additions & 24 deletions
29
src/components/RecommendPreviewFourCard/RecommendPreviewFourCard.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
import styled from '@emotion/native'; | ||
import * as React from 'react'; | ||
|
||
import {RecommendScreenProps} from './RecommendScreen'; | ||
|
||
import {Headline2} from 'src/components/utils/Text'; | ||
import {widthPercentage} from 'src/styles/ScreenResponse'; | ||
|
||
export const RecommendHeaderStyle = ({navigation}: RecommendScreenProps) => { | ||
navigation.setOptions({ | ||
headerShown: true, | ||
headerTitle: RecommendHeaderTitle, | ||
headerShadowVisible: false, | ||
}); | ||
}; | ||
|
||
const RecommendHeaderTitle = () => { | ||
return ( | ||
<HeaderHeadlineView> | ||
<Headline2>์ถ์ฒ</Headline2> | ||
</HeaderHeadlineView> | ||
); | ||
}; | ||
|
||
const HeaderHeadlineView = styled.View({ | ||
flex: 1, | ||
marginLeft: -8 + widthPercentage(16), //Native Issue ๋ฐ์ | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters