-
Notifications
You must be signed in to change notification settings - Fork 1
Feature/chat result pub #7
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
Open
chaeeun037
wants to merge
4
commits into
master
Choose a base branch
from
feature/chat-result-pub
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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 @@ | ||
| enum Color { | ||
| PVBlue = "#5988FF", | ||
| PVSkyblue = "#31BDFF", | ||
| PVRed = "#EF5D5D", | ||
| PVYellow = "#FCDE41", | ||
| PVGreen = "#00AD78", | ||
| PVBlack01 = "#303134", | ||
| PVBlack02 = "#6E7081", | ||
| PVBlack03 = "#AFB1C3", | ||
| PVBlack04 = "#CBCBD8", | ||
| PVBlack05 = "#E7E8F0", | ||
| PVBlack06 = "#F6F6F9", | ||
| White = "white" | ||
| } | ||
|
|
||
| export { Color } |
This file contains hidden or 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,12 @@ | ||
| enum FontWeight { | ||
| Regular = 400, | ||
| Bold = 700 | ||
| } | ||
|
|
||
| enum FontSize { | ||
| Small = "12px", | ||
| Medium = "16px", | ||
| Large = "20px" | ||
| } | ||
|
|
||
| export { FontWeight, FontSize } |
This file contains hidden or 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,148 @@ | ||
| import React from "react"; | ||
| import { Button, View, Text, Image, StyleSheet, PixelRatio } from "react-native"; | ||
| import Styled from 'styled-components/native' | ||
| import { LinearGradient } from "expo-linear-gradient" | ||
| import { Color } from "../constants/color"; | ||
| import { FontSize, FontWeight } from "../constants/font"; | ||
|
|
||
| const CLOSE_IMAGE_URL = "../assets/image/close.png"; | ||
| const CHAT_RESULT_IMAGE_URL = "../assets/image/chat_result.png"; | ||
|
|
||
| const styles = StyleSheet.create({ | ||
| root: { | ||
| flex: 1, | ||
| backgroundColor: "white" | ||
| }, | ||
| p20: { | ||
| padding: 20 | ||
| }, | ||
| pt10: { | ||
| paddingTop: 10 | ||
| }, | ||
| pt30: { | ||
| paddingTop: 30 | ||
| }, | ||
| px20: { | ||
| paddingLeft: 20, | ||
| paddingRight: 20 | ||
| }, | ||
| pr10: { | ||
| paddingRight: 10 | ||
| }, | ||
| flexCenter: { | ||
| flex: 1, | ||
| justifyContent: "center", | ||
| alignItems: "center" | ||
| }, | ||
| colorPVBlue: { | ||
| color: Color.PVBlue | ||
| }, | ||
| colorWhite: { | ||
| color: Color.White | ||
| }, | ||
| button: { | ||
| justifyContent: "center", | ||
| alignItems: "center", | ||
| height: 60, | ||
| borderRadius: 33.5 | ||
| } | ||
| }) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. stylesheet이랑 styled-component방식을 혼합해서 쓰셨는데 styled component로 처리하는게 좋지않을까요? |
||
|
|
||
| const Title = Styled.Text` | ||
| color: ${Color.PVBlack01}; | ||
| font-size: ${FontSize.Large}; | ||
| font-weight: ${FontWeight.Bold}; | ||
| line-height: 32px; | ||
| `; | ||
|
|
||
| const CloseImage = Styled.Image` | ||
| resize-mode: contain; | ||
| height: 24px; | ||
| width: 24px; | ||
| ` | ||
|
|
||
| const ListItem = Styled.View` | ||
| padding-top: 30px; | ||
| padding-left: 20px; | ||
| padding-right: 20px; | ||
| flex-direction: row; | ||
| `; | ||
|
|
||
| const ListIndex = Styled.Text` | ||
| color: ${Color.PVBlack03}; | ||
| font-size: ${FontSize.Medium}; | ||
| font-weight: ${FontWeight.Bold}; | ||
| line-height: 26px; | ||
| `; | ||
|
|
||
| const ListText = Styled.Text` | ||
| color: ${Color.PVBlack01}; | ||
| font-size: ${FontSize.Medium}; | ||
| font-weight: ${FontWeight.Bold}; | ||
| line-height: 26px; | ||
| `; | ||
|
|
||
| const SectionBar = Styled.View` | ||
| margin-top: 30px; | ||
| height: 9px; | ||
| background-color: ${Color.PVBlack06}; | ||
| ` | ||
|
|
||
| const ButtonText = Styled.Text` | ||
| color: ${Color.White}; | ||
| font-size: ${FontSize.Medium}; | ||
| font-weight: ${FontWeight.Bold}; | ||
| `; | ||
|
|
||
| const ChatResult = ({ navigation }) => { | ||
| return ( | ||
| <View style={styles.root}> | ||
| <View style={styles.p20}> | ||
| <CloseImage source={require(CLOSE_IMAGE_URL)}></CloseImage> | ||
| </View> | ||
| <View style={[styles.px20, styles.pt10]}> | ||
| <Title>대화가 종료되었어요 :)</Title> | ||
| </View> | ||
| <View> | ||
| <ListItem> | ||
| <View style={styles.pr10}> | ||
| <ListIndex>01</ListIndex> | ||
| </View> | ||
| <View> | ||
| <ListText>이번 대화에서</ListText> | ||
| <ListText>총 <Text style={styles.colorPVBlue}>23개</Text>의 반응을 받았어요!</ListText> | ||
| </View> | ||
| </ListItem> | ||
| <ListItem> | ||
| <View style={styles.pr10}> | ||
| <ListIndex>01</ListIndex> | ||
| </View> | ||
| <View> | ||
| <ListText>이번 대화에서</ListText> | ||
| <ListText>총 <Text style={styles.colorPVBlue}>23개</Text>의 반응을 받았어요!</ListText> | ||
| </View> | ||
| </ListItem> | ||
| </View> | ||
| <SectionBar /> | ||
| <View style={[styles.px20, styles.pt30]}> | ||
| <Title>이번 대화에 대한 피드백을 남기고</Title> | ||
| <Title>서로의 피드백을 확인해보세요</Title> | ||
| </View> | ||
| <View style={styles.flexCenter}> | ||
| <Image source={require(CHAT_RESULT_IMAGE_URL)}></Image> | ||
| </View> | ||
| <View style={styles.p20}> | ||
| <LinearGradient | ||
| colors={[Color.PVBlue, Color.PVSkyblue]} | ||
| start={{x: 0, y:0}} | ||
| end={{x: 1, y: 1}} | ||
| style={styles.button} | ||
| > | ||
| <ButtonText>피드백 남기기</ButtonText> | ||
| </LinearGradient> | ||
| </View> | ||
| </View> | ||
| ); | ||
| }; | ||
|
|
||
| export default ChatResult; | ||
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -5,7 +5,9 @@ | |
| "esModuleInterop": true, | ||
| "isolatedModules": true, | ||
| "jsx": "react-native", | ||
| "lib": ["es2017"], | ||
| "lib": [ | ||
| "es2017" | ||
| ], | ||
| "moduleResolution": "node", | ||
| "noEmit": true, | ||
| "strict": true, | ||
|
|
@@ -16,5 +18,6 @@ | |
| "babel.config.js", | ||
| "metro.config.js", | ||
| "jest.config.js" | ||
| ] | ||
| ], | ||
| "extends": "expo/tsconfig.base" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 엇 이건모죠? |
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.