김서영 / searchGuide

Go to a project
Toggle navigation Toggle navigation pinning
김서영
432249b7 1 parent 4e6dc209

change design

Inline Side-by-side
Showing 17 changed files with 83 additions and 39 deletions
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
2 "devToolsPort": 19002, 2 "devToolsPort": 19002,
3 "expoServerPort": 19000, 3 "expoServerPort": 19000,
4 "packagerPort": 19001, 4 "packagerPort": 19001,
5 - "packagerPid": 27784, 5 + "packagerPid": 28304,
6 - "expoServerNgrokUrl": "https://ru-c66.bluejoy.searchguide.exp.direct", 6 + "expoServerNgrokUrl": "https://x2-7pb.anonymous.searchguide.exp.direct",
7 - "packagerNgrokUrl": "https://packager.ru-c66.bluejoy.searchguide.exp.direct", 7 + "packagerNgrokUrl": "https://packager.x2-7pb.anonymous.searchguide.exp.direct",
8 - "ngrokPid": 16708 8 + "ngrokPid": 9432
9 } 9 }
......
1 { 1 {
2 - "hostType": "lan", 2 + "hostType": "tunnel",
3 "lanType": "ip", 3 "lanType": "ip",
4 "dev": true, 4 "dev": true,
5 "minify": false, 5 "minify": false,
6 - "urlRandomness": "ru-c66", 6 + "urlRandomness": "x2-7pb",
7 "https": false 7 "https": false
8 } 8 }
......
...@@ -10,12 +10,19 @@ const App = () => { ...@@ -10,12 +10,19 @@ const App = () => {
10 const fontLoading = async () => { 10 const fontLoading = async () => {
11 await Font.loadAsync({ 11 await Font.loadAsync({
12 'CustomFont': require('./assets/font/NanumBarunGothic.ttf'), 12 'CustomFont': require('./assets/font/NanumBarunGothic.ttf'),
13 - 'CustomFontBold': require('./assets/font/NanumBarunGothicBold.ttf') 13 + 'CustomFontBold': require('./assets/font/NanumBarunGothicBold.ttf'),
14 + 'Pen' : require('./assets/font/NanumBarunPen.ttf'),
15 + 'Son' : require('./assets/font/NanumSon.ttf'),
16 + 'Bold' : require('./assets/font/NanumSquareRoundBold.ttf'),
17 + 'ExtraBold' : require('./assets/font/NanumSquareRoundExtraBold.ttf'),
18 + 'Light' : require('./assets/font/NanumSquareRoundLight.ttf'),
19 + 'Regular' : require('./assets/font/NanumSquareRoundRegular.ttf'),
14 }); 20 });
15 setFontLoaded(true); 21 setFontLoaded(true);
16 } 22 }
17 fontLoading(); 23 fontLoading();
18 }, [] ) 24 }, [] )
25 +
19 return ( 26 return (
20 <Provider store={Store}> 27 <Provider store={Store}>
21 { 28 {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 "privacy": "public", 5 "privacy": "public",
6 "sdkVersion": "35.0.0", 6 "sdkVersion": "35.0.0",
7 "androidStatusBar": { 7 "androidStatusBar": {
8 - "backgroundColor": "#226557" 8 + "backgroundColor": "#20272F"
9 }, 9 },
10 "platforms": [ 10 "platforms": [
11 "ios", 11 "ios",
......
No preview for this file type
No preview for this file type
...@@ -5,7 +5,7 @@ import {createMaterialTopTabNavigator} from 'react-navigation-tabs'; ...@@ -5,7 +5,7 @@ import {createMaterialTopTabNavigator} from 'react-navigation-tabs';
5 import Home from '../Home/Home'; 5 import Home from '../Home/Home';
6 import Rate from '../Rate/Rate'; 6 import Rate from '../Rate/Rate';
7 7
8 - 8 +
9 const AppTabNavigator = createMaterialTopTabNavigator ( 9 const AppTabNavigator = createMaterialTopTabNavigator (
10 { 10 {
11 Home: Home, 11 Home: Home,
......
...@@ -38,7 +38,7 @@ const LastSlide = () => ( ...@@ -38,7 +38,7 @@ const LastSlide = () => (
38 <Text style={styles.subtext}>검색을 시작하세요!</Text> 38 <Text style={styles.subtext}>검색을 시작하세요!</Text>
39 </View> 39 </View>
40 ) 40 )
41 - 41 +
42 export default PromptSearch = () => { 42 export default PromptSearch = () => {
43 return( 43 return(
44 <> 44 <>
...@@ -46,8 +46,8 @@ export default PromptSearch = () => { ...@@ -46,8 +46,8 @@ export default PromptSearch = () => {
46 showsButtons={true} 46 showsButtons={true}
47 loop={false} height={400} 47 loop={false} height={400}
48 activeDotColor={LIGHT_MAIN} 48 activeDotColor={LIGHT_MAIN}
49 - nextButton={<Text style={{color:'#3BAD87', fontSize:60}}>›</Text>} 49 + nextButton={<Text style={{color:DARK_MAIN, fontSize:60}}>›</Text>}
50 - prevButton={<Text style={{color:'#3BAD87', fontSize:60}}>‹</Text>} 50 + prevButton={<Text style={{color:DARK_MAIN, fontSize:60}}>‹</Text>}
51 > 51 >
52 <FirstSlide /> 52 <FirstSlide />
53 <SecondSlide /> 53 <SecondSlide />
...@@ -67,18 +67,19 @@ const styles = StyleSheet.create({ ...@@ -67,18 +67,19 @@ const styles = StyleSheet.create({
67 text:{ 67 text:{
68 marginBottom: 10, 68 marginBottom: 10,
69 fontSize: 30, 69 fontSize: 30,
70 - fontWeight: 'bold',
71 color:'#696969', 70 color:'#696969',
71 + fontFamily:"ExtraBold"
72 }, 72 },
73 icon: { 73 icon: {
74 marginBottom: 20, 74 marginBottom: 20,
75 color: '#696969' 75 color: '#696969'
76 }, 76 },
77 subtext:{ 77 subtext:{
78 + marginTop:10,
78 marginBottom: 10, 79 marginBottom: 10,
79 - fontSize: 20, 80 + fontSize: 30,
80 - fontWeight: 'bold',
81 color:'#999999', 81 color:'#999999',
82 + fontFamily: "Son"
82 }, 83 },
83 wrapper: { 84 wrapper: {
84 flex:1, 85 flex:1,
......
...@@ -13,7 +13,7 @@ export default RateBar = (props) => { ...@@ -13,7 +13,7 @@ export default RateBar = (props) => {
13 {props.score.msg ? 13 {props.score.msg ?
14 <> 14 <>
15 <View style={styles.container}> 15 <View style={styles.container}>
16 - <Text style={styles.Text}>총 점수 : {props.score.full}</Text> 16 + <Text style={styles.Text}>총 점수 : {props.score.full}점</Text>
17 <View style={styles.colorContainer}> 17 <View style={styles.colorContainer}>
18 <View style={styles.textContainer}> 18 <View style={styles.textContainer}>
19 <View style={styles.colorA}></View><Text>키워드 점수</Text> 19 <View style={styles.colorA}></View><Text>키워드 점수</Text>
...@@ -52,10 +52,10 @@ export default RateBar = (props) => { ...@@ -52,10 +52,10 @@ export default RateBar = (props) => {
52 valueAccessor={({ item, key }) => item[key].value} 52 valueAccessor={({ item, key }) => item[key].value}
53 /> 53 />
54 <View style={styles.infoContainer}> 54 <View style={styles.infoContainer}>
55 - <HelperText type={'info'} visible={click==1} style={{fontSize:20}}>키워드 : {props.score.key}</HelperText> 55 + <HelperText type={'info'} visible={click==1} style={styles.helper}>키워드 : {props.score.key}</HelperText>
56 - <HelperText type={'info'} visible={click==2} style={{fontSize:20}}>맞춤법 : {props.score.fix}</HelperText> 56 + <HelperText type={'info'} visible={click==2} style={styles.helper}>맞춤법 : {props.score.fix}</HelperText>
57 </View> 57 </View>
58 - <Text>눌러서 각각의 점수를 알아보세요!</Text> 58 + <Text style={styles.message}>눌러서 각각의 점수를 알아보세요!</Text>
59 </> 59 </>
60 : <PromptSearchRate />} 60 : <PromptSearchRate />}
61 </Surface> 61 </Surface>
...@@ -80,17 +80,22 @@ const styles = StyleSheet.create({ ...@@ -80,17 +80,22 @@ const styles = StyleSheet.create({
80 height: 7, 80 height: 7,
81 width: 7, 81 width: 7,
82 marginRight: 5, 82 marginRight: 5,
83 + fontFamily:"Regular",
84 + fontSize: 13,
83 }, 85 },
84 colorB:{ 86 colorB:{
85 - backgroundColor:'#2cc3c2', 87 + backgroundColor:'#2cc3c2',
86 height: 7, 88 height: 7,
87 width: 7, 89 width: 7,
88 marginRight: 5, 90 marginRight: 5,
91 + fontFamily:"Regular",
92 + fontSize: 13,
89 }, 93 },
90 textContainer:{ 94 textContainer:{
91 flexDirection:'row', 95 flexDirection:'row',
92 justifyContent:'center', 96 justifyContent:'center',
93 - alignItems:'center' 97 + alignItems:'center',
98 + fontFamily:"Bold",
94 }, 99 },
95 infoContainer:{ 100 infoContainer:{
96 flexDirection:'row', 101 flexDirection:'row',
...@@ -105,9 +110,20 @@ const styles = StyleSheet.create({ ...@@ -105,9 +110,20 @@ const styles = StyleSheet.create({
105 alignItems: 'center', 110 alignItems: 'center',
106 justifyContent: 'center', 111 justifyContent: 'center',
107 elevation: 2, 112 elevation: 2,
108 - marginTop: 10 113 + marginTop: 10,
114 + borderRadius: 5,
109 }, 115 },
110 Text:{ 116 Text:{
111 - fontSize: 25, 117 + fontSize: 22,
118 + marginBottom:5,
119 + fontFamily:"Bold",
120 + },
121 + message:{
122 + fontFamily:"Son",
123 + fontSize: 20,
112 }, 124 },
125 + helper:{
126 + fontFamily:"Regular",
127 + fontSize:15
128 + }
113 }); 129 });
......
...@@ -23,11 +23,11 @@ const RateLine = ({load,pastRecords }) => { ...@@ -23,11 +23,11 @@ const RateLine = ({load,pastRecords }) => {
23 {pastRecords.map((past,index)=> ( 23 {pastRecords.map((past,index)=> (
24 <View key={index} style={styles.past}> 24 <View key={index} style={styles.past}>
25 <Text style={styles.score}>{past.score}</Text> 25 <Text style={styles.score}>{past.score}</Text>
26 - <Text style={styles.date}>{past.date.substring(5,7)+'월 '+past.date.substring(8,10)+'일'}</Text> 26 + <Text style={styles.date}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text>
27 </View> 27 </View>
28 ))} 28 ))}
29 </View> 29 </View>
30 - <Text>최근 점수 추세</Text> 30 + <Text style={styles.message}>당신의 점수 변화를 확인하세요!</Text>
31 </> 31 </>
32 : <PromptSearchRate /> 32 : <PromptSearchRate />
33 } 33 }
...@@ -47,14 +47,16 @@ const styles = StyleSheet.create({ ...@@ -47,14 +47,16 @@ const styles = StyleSheet.create({
47 elevation: 2, 47 elevation: 2,
48 marginTop: 10, 48 marginTop: 10,
49 marginBottom: 10, 49 marginBottom: 10,
50 + borderRadius: 5,
50 }, 51 },
51 info:{ 52 info:{
52 - fontSize:25, 53 + fontSize:22,
53 - fontWeight:'bold', 54 + marginBottom: 5,
54 - marginBottom: 5 55 + fontFamily:"Bold",
55 }, 56 },
56 score:{ 57 score:{
57 - fontSize:20 58 + fontSize:20,
59 + fontFamily:"Bold",
58 }, 60 },
59 scoreContainer:{ 61 scoreContainer:{
60 flexDirection:'row', 62 flexDirection:'row',
...@@ -62,12 +64,18 @@ const styles = StyleSheet.create({ ...@@ -62,12 +64,18 @@ const styles = StyleSheet.create({
62 width:'100%' 64 width:'100%'
63 }, 65 },
64 data:{ 66 data:{
65 - fontSize:13, 67 + fontSize:10,
66 textAlign:'center', 68 textAlign:'center',
69 + fontFamily:"Regular",
67 }, 70 },
68 past:{ 71 past:{
69 alignItems:'center', 72 alignItems:'center',
70 marginBottom:5 73 marginBottom:5
74 + },
75 + message:{
76 + fontFamily:"Son",
77 + marginTop : 10,
78 + fontSize: 20,
71 } 79 }
72 }); 80 });
73 81
......
...@@ -17,7 +17,7 @@ const RateMessage = ({keywordText, score }) => { ...@@ -17,7 +17,7 @@ const RateMessage = ({keywordText, score }) => {
17 { keywordText ? 17 { keywordText ?
18 <> 18 <>
19 <View style={{textAlign:"center", height:35}}> 19 <View style={{textAlign:"center", height:35}}>
20 - <Text >길잡이가 교정해준 문장을 확인하세요!</Text> 20 + <Text style={styles.message}>길잡이가 교정해준 문장을 확인하세요!</Text>
21 </View> 21 </View>
22 <View> 22 <View>
23 <Text style={styles.msg} >{score.msg}</Text> 23 <Text style={styles.msg} >{score.msg}</Text>
...@@ -40,7 +40,8 @@ const RateMessage = ({keywordText, score }) => { ...@@ -40,7 +40,8 @@ const RateMessage = ({keywordText, score }) => {
40 alignItems: 'center', 40 alignItems: 'center',
41 justifyContent: 'center', 41 justifyContent: 'center',
42 elevation: 2, 42 elevation: 2,
43 - marginTop: 10 43 + marginTop: 10,
44 + borderRadius: 5,
44 }, 45 },
45 Text:{ 46 Text:{
46 fontSize: 25, 47 fontSize: 25,
...@@ -53,7 +54,12 @@ const RateMessage = ({keywordText, score }) => { ...@@ -53,7 +54,12 @@ const RateMessage = ({keywordText, score }) => {
53 msg:{ 54 msg:{
54 fontSize: 20, 55 fontSize: 20,
55 textAlign:'center', 56 textAlign:'center',
57 + fontFamily:"Bold",
56 }, 58 },
59 + message:{
60 + fontFamily:"Son",
61 + fontSize: 20,
62 + }
57 }); 63 });
58 64
59 65
......
...@@ -29,7 +29,7 @@ const RateSentence = ({originalText, fixedText, keywordText }) => { ...@@ -29,7 +29,7 @@ const RateSentence = ({originalText, fixedText, keywordText }) => {
29 {count == 2 && ( <SentenceInfo Text={keywordText} info={'키워드 교정 문장'} color={'#00a676'} />) } 29 {count == 2 && ( <SentenceInfo Text={keywordText} info={'키워드 교정 문장'} color={'#00a676'} />) }
30 </View> 30 </View>
31 <View style={{flexDirection:'column-reverse', height:50}}> 31 <View style={{flexDirection:'column-reverse', height:50}}>
32 - <Text >눌러서 변화 과정을 지켜보세요!</Text> 32 + <Text style={styles.message}>눌러서 변화 과정을 지켜보세요!</Text>
33 </View> 33 </View>
34 34
35 </> 35 </>
...@@ -48,7 +48,8 @@ const RateSentence = ({originalText, fixedText, keywordText }) => { ...@@ -48,7 +48,8 @@ const RateSentence = ({originalText, fixedText, keywordText }) => {
48 alignItems: 'center', 48 alignItems: 'center',
49 justifyContent: 'center', 49 justifyContent: 'center',
50 elevation: 2, 50 elevation: 2,
51 - marginTop: 10 51 + marginTop: 10,
52 + borderRadius: 5,
52 }, 53 },
53 Text:{ 54 Text:{
54 fontSize: 25, 55 fontSize: 25,
...@@ -56,7 +57,12 @@ const RateSentence = ({originalText, fixedText, keywordText }) => { ...@@ -56,7 +57,12 @@ const RateSentence = ({originalText, fixedText, keywordText }) => {
56 }, 57 },
57 infoText:{ 58 infoText:{
58 fontSize: 20, 59 fontSize: 20,
59 - textAlign:'center' 60 + textAlign:'center',
61 + fontFamily:"Bold",
62 + },
63 + message:{
64 + fontFamily:"Son",
65 + fontSize: 20,
60 } 66 }
61 }); 67 });
62 68
......
1 import React from 'react'; 1 import React from 'react';
2 -import { DARK_MAIN,LIGHT_MAIN, WHITE_MAIN} from 'react-native-dotenv'; 2 +import { DARK_MAIN,LIGHT_MAIN, WHITE_MAIN, BUTTON} from 'react-native-dotenv';
3 import { Avatar, Button, Card, Title, Paragraph, Text } from 'react-native-paper'; 3 import { Avatar, Button, Card, Title, Paragraph, Text } from 'react-native-paper';
4 import {Linking, Image, StyleSheet } from 'react-native'; 4 import {Linking, Image, StyleSheet } from 'react-native';
5 5
...@@ -20,7 +20,7 @@ const SearchIcon = (props) => { ...@@ -20,7 +20,7 @@ const SearchIcon = (props) => {
20 default: 20 default:
21 return(<Image source={require('../../assets/img/etc-logo.png')} style={styles.image}/>) 21 return(<Image source={require('../../assets/img/etc-logo.png')} style={styles.image}/>)
22 } 22 }
23 -} 23 +}
24 24
25 25
26 26
...@@ -32,8 +32,8 @@ const SearchCard = (props) => ( ...@@ -32,8 +32,8 @@ const SearchCard = (props) => (
32 <Paragraph>{props.content}</Paragraph> 32 <Paragraph>{props.content}</Paragraph>
33 </Card.Content> 33 </Card.Content>
34 <Card.Actions style={{flexDirection:'row', justifyContent:'space-between'}}> 34 <Card.Actions style={{flexDirection:'row', justifyContent:'space-between'}}>
35 - <Text style={{marginTop:7, marginLeft: 10,fontStyle:'italic'}}>정확도 : {props.metric}%</Text> 35 + <Text style={{marginTop:7, marginLeft: 10,fontStyle:'italic',fontFamily:"Regular"}}>정확도 : {props.metric}%</Text>
36 - <Button mode='contained' color= {LIGHT_MAIN} labelStyle={{color:WHITE_MAIN}} onPress={()=>{Linking.openURL(props.url)}}> 36 + <Button mode='contained' color= {BUTTON} labelStyle={{color:WHITE_MAIN,fontFamily:"Regular"}} onPress={()=>{Linking.openURL(props.url)}}>
37 자세히보기 37 자세히보기
38 </Button> 38 </Button>
39 </Card.Actions> 39 </Card.Actions>
......