bluejoyq / searchGuide

Go to a project
Toggle navigation Toggle navigation pinning
bluejoyq
1846fbc3 1 parent 81763fb6

last app design and delete useless fonts

Inline Side-by-side
Showing 18 changed files with 75 additions and 42 deletions
...@@ -9,13 +9,8 @@ const App = () => { ...@@ -9,13 +9,8 @@ const App = () => {
9 useEffect( () => { 9 useEffect( () => {
10 const fontLoading = async () => { 10 const fontLoading = async () => {
11 await Font.loadAsync({ 11 await Font.loadAsync({
12 - 'CustomFont': require('./assets/font/NanumBarunGothic.ttf'),
13 - 'CustomFontBold': require('./assets/font/NanumBarunGothicBold.ttf'),
14 'Pen' : require('./assets/font/NanumBarunPen.ttf'), 12 'Pen' : require('./assets/font/NanumBarunPen.ttf'),
15 - 'Son' : require('./assets/font/NanumSon.ttf'),
16 'Bold' : require('./assets/font/NanumSquareRoundBold.ttf'), 13 '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 'Regular' : require('./assets/font/NanumSquareRoundRegular.ttf'),
20 }); 15 });
21 setFontLoaded(true); 16 setFontLoaded(true);
......
No preview for this file type
...@@ -68,7 +68,7 @@ const styles = StyleSheet.create({ ...@@ -68,7 +68,7 @@ const styles = StyleSheet.create({
68 marginBottom: 10, 68 marginBottom: 10,
69 fontSize: 30, 69 fontSize: 30,
70 color:'#696969', 70 color:'#696969',
71 - fontFamily:"ExtraBold" 71 + fontFamily:"Bold"
72 }, 72 },
73 icon: { 73 icon: {
74 marginBottom: 20, 74 marginBottom: 20,
...@@ -79,7 +79,7 @@ const styles = StyleSheet.create({ ...@@ -79,7 +79,7 @@ const styles = StyleSheet.create({
79 marginBottom: 10, 79 marginBottom: 10,
80 fontSize: 30, 80 fontSize: 30,
81 color:'#999999', 81 color:'#999999',
82 - fontFamily: "Son" 82 + fontFamily: "Pen"
83 }, 83 },
84 wrapper: { 84 wrapper: {
85 flex:1, 85 flex:1,
......
...@@ -3,15 +3,16 @@ import { Text } from 'react-native-paper'; ...@@ -3,15 +3,16 @@ import { Text } from 'react-native-paper';
3 import { StyleSheet,View } from 'react-native'; 3 import { StyleSheet,View } from 'react-native';
4 4
5 export default PromptSearchRate = () => ( 5 export default PromptSearchRate = () => (
6 - <View style={{alignItems: 'center',justifyContent: 'center'}}> 6 + <View style={{alignItems: 'center',justifyContent: 'center', flex:1}}>
7 - <Text style={styles.Text}>아직까지 검색</Text> 7 + <Text style={styles.Text}>분석을 위한 검색</Text>
8 - <Text style={styles.Text}>결과가 없습니다!</Text> 8 + <Text style={styles.Text}>결과가 없습니다</Text>
9 </View> 9 </View>
10 ) 10 )
11 11
12 12
13 const styles = StyleSheet.create({ 13 const styles = StyleSheet.create({
14 Text:{ 14 Text:{
15 + fontFamily:'Regular',
15 fontSize: 20, 16 fontSize: 20,
16 color: '#123422' 17 color: '#123422'
17 }, 18 },
......
...@@ -17,7 +17,7 @@ export default RateBar = (props) => { ...@@ -17,7 +17,7 @@ export default RateBar = (props) => {
17 </View> 17 </View>
18 18
19 <View style={styles.container}> 19 <View style={styles.container}>
20 - <Text style={styles.message}>눌러서 각각의 점수를 알아보세요!</Text> 20 + <Text style={styles.message}>눌러서 각각의 점수를 알아보세요</Text>
21 </View> 21 </View>
22 <View style={styles.infoContainer}> 22 <View style={styles.infoContainer}>
23 <HelperText type={'info'} visible={click==2} style={styles.helper}>맞춤법 : {props.score.fix}</HelperText> 23 <HelperText type={'info'} visible={click==2} style={styles.helper}>맞춤법 : {props.score.fix}</HelperText>
...@@ -76,7 +76,7 @@ const styles = StyleSheet.create({ ...@@ -76,7 +76,7 @@ const styles = StyleSheet.create({
76 width: '100%', 76 width: '100%',
77 flexDirection:'row', 77 flexDirection:'row',
78 justifyContent:'center', 78 justifyContent:'center',
79 - marginTop : 8, 79 + marginTop : 3,
80 }, 80 },
81 colorContainer:{ 81 colorContainer:{
82 position:"absolute", 82 position:"absolute",
...@@ -102,6 +102,7 @@ const styles = StyleSheet.create({ ...@@ -102,6 +102,7 @@ const styles = StyleSheet.create({
102 flexDirection:'row', 102 flexDirection:'row',
103 justifyContent:"flex-start", 103 justifyContent:"flex-start",
104 alignItems:'flex-start', 104 alignItems:'flex-start',
105 + marginBottom: 10,
105 }, 106 },
106 chart:{ 107 chart:{
107 height: 125, 108 height: 125,
...@@ -138,9 +139,9 @@ const styles = StyleSheet.create({ ...@@ -138,9 +139,9 @@ const styles = StyleSheet.create({
138 fontFamily:"Bold", 139 fontFamily:"Bold",
139 }, 140 },
140 message:{ 141 message:{
141 - fontFamily:"Son", 142 + fontFamily:"Pen",
142 fontSize: 20, 143 fontSize: 20,
143 - marginBottom: 10, 144 + marginBottom: 3,
144 }, 145 },
145 helper:{ 146 helper:{
146 fontFamily:"Bold", 147 fontFamily:"Bold",
......
...@@ -15,10 +15,10 @@ const RateLine = ({load,pastRecords }) => { ...@@ -15,10 +15,10 @@ const RateLine = ({load,pastRecords }) => {
15 <Surface style={styles.surface}> 15 <Surface style={styles.surface}>
16 {pastRecords.length ? 16 {pastRecords.length ?
17 <> 17 <>
18 - <Text style={styles.message}>당신의 점수 변화를 확인하세요!</Text> 18 + <Text style={styles.message}>점수 변화를 확인하세요</Text>
19 <View style={styles.scoreContainer}> 19 <View style={styles.scoreContainer}>
20 {pastRecords.map((past,index)=> ( 20 {pastRecords.map((past,index)=> (
21 - pastRecords.length - 1 > index ? 21 + index != 0 ?
22 <View key={index} style={styles.past}> 22 <View key={index} style={styles.past}>
23 <Text style={styles.date, {fontSize:11}}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text> 23 <Text style={styles.date, {fontSize:11}}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text>
24 <Text style={styles.score}>{past.score}</Text> 24 <Text style={styles.score}>{past.score}</Text>
...@@ -26,7 +26,7 @@ const RateLine = ({load,pastRecords }) => { ...@@ -26,7 +26,7 @@ const RateLine = ({load,pastRecords }) => {
26 : 26 :
27 <View key={index} style={styles.past}> 27 <View key={index} style={styles.past}>
28 <Text style={styles.date, {fontSize:15}}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text> 28 <Text style={styles.date, {fontSize:15}}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text>
29 - <Text style={styles.score, {fontFamily:"ExtraBold", fontSize:25, color: "#4ea1d3"}}>{past.score}</Text> 29 + <Text style={styles.score, {fontFamily:"Bold", fontSize:22, color: "#4ea1d3"}}>{past.score}</Text>
30 </View> 30 </View>
31 ))} 31 ))}
32 32
...@@ -66,8 +66,8 @@ const styles = StyleSheet.create({ ...@@ -66,8 +66,8 @@ const styles = StyleSheet.create({
66 marginBottom : 10, 66 marginBottom : 10,
67 borderRadius:5, 67 borderRadius:5,
68 }, 68 },
69 - data:{ 69 + date:{
70 - fontFamily:"Son", 70 + fontFamily:"Pen",
71 textAlign:'center', 71 textAlign:'center',
72 marginBottom:10, 72 marginBottom:10,
73 }, 73 },
...@@ -80,9 +80,9 @@ const styles = StyleSheet.create({ ...@@ -80,9 +80,9 @@ const styles = StyleSheet.create({
80 marginBottom:5 80 marginBottom:5
81 }, 81 },
82 message:{ 82 message:{
83 - fontFamily:"Son", 83 + fontFamily:"Pen",
84 margin : 5, 84 margin : 5,
85 - fontSize: 25, 85 + fontSize: 20,
86 justifyContent: 'flex-start', 86 justifyContent: 'flex-start',
87 } 87 }
88 }); 88 });
......
...@@ -16,8 +16,8 @@ const RateMessage = ({keywordText, score }) => { ...@@ -16,8 +16,8 @@ const RateMessage = ({keywordText, score }) => {
16 <Surface style={styles.surface} > 16 <Surface style={styles.surface} >
17 { keywordText ? 17 { keywordText ?
18 <> 18 <>
19 - <View style={{textAlign:"center", height:35}}> 19 + <View style={{textAlign:"center", flex:0.9, flexDirection:'column'}}>
20 - <Text style={styles.message}>길잡이가 교정해준 문장을 확인하세요!</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>
...@@ -25,6 +25,14 @@ const RateMessage = ({keywordText, score }) => { ...@@ -25,6 +25,14 @@ const RateMessage = ({keywordText, score }) => {
25 <View> 25 <View>
26 <SentenceInfo Text={keywordText} color={'#281e94'} /> 26 <SentenceInfo Text={keywordText} color={'#281e94'} />
27 </View> 27 </View>
28 + <View style={styles.colorContainer}>
29 + <View style={styles.textContainer}>
30 + <View style={styles.colorA}></View><Text>평가</Text>
31 + </View>
32 + <View style={styles.textContainer}>
33 + <View style={styles.colorB}></View><Text>결과</Text>
34 + </View>
35 + </View>
28 </> 36 </>
29 : <PromptSearchRate /> 37 : <PromptSearchRate />
30 } 38 }
...@@ -44,22 +52,45 @@ const RateMessage = ({keywordText, score }) => { ...@@ -44,22 +52,45 @@ const RateMessage = ({keywordText, score }) => {
44 borderRadius: 5 52 borderRadius: 5
45 }, 53 },
46 Text:{ 54 Text:{
47 - fontSize: 25, 55 + fontSize: 18,
48 - textAlign:'center' 56 + textAlign:'center',
49 - },
50 - infoText:{
51 - fontSize: 20,
52 - textAlign:'center'
53 }, 57 },
54 msg:{ 58 msg:{
55 - fontSize: 20, 59 + fontSize: 18,
56 textAlign:'center', 60 textAlign:'center',
57 fontFamily:"Bold", 61 fontFamily:"Bold",
58 }, 62 },
59 message:{ 63 message:{
60 - fontFamily:"Son", 64 + fontFamily:"Pen",
61 fontSize: 20, 65 fontSize: 20,
62 - } 66 + },
67 + colorContainer:{
68 + position:"absolute",
69 + right:10,
70 + top: 5,
71 + },
72 + colorA:{
73 + backgroundColor:'#111111',
74 + height: 7,
75 + width: 7,
76 + marginRight: 5,
77 + fontFamily:"Regular",
78 + fontSize: 13,
79 + },
80 + colorB:{
81 + backgroundColor:'#281e94',
82 + height: 7,
83 + width: 7,
84 + marginRight: 5,
85 + fontFamily:"Regular",
86 + fontSize: 13,
87 + },
88 + textContainer:{
89 + flexDirection:'row',
90 + justifyContent:'center',
91 + alignItems:'center',
92 + fontFamily:"Bold",
93 + },
63 }); 94 });
64 95
65 96
......
...@@ -19,17 +19,20 @@ const RateSentence = ({originalText, fixedText, keywordText }) => { ...@@ -19,17 +19,20 @@ const RateSentence = ({originalText, fixedText, keywordText }) => {
19 else setCount(count+1); 19 else setCount(count+1);
20 } 20 }
21 21
22 +
22 return ( 23 return (
23 <Surface style={styles.surface} onTouchStart={calCount} > 24 <Surface style={styles.surface} onTouchStart={calCount} >
24 { keywordText ? 25 { keywordText ?
25 <> 26 <>
27 +
26 <View> 28 <View>
27 {count == 0 && ( <SentenceInfo Text={originalText} info={'원래 검색 문장'} color={'#B71C1C'} />) } 29 {count == 0 && ( <SentenceInfo Text={originalText} info={'원래 검색 문장'} color={'#B71C1C'} />) }
28 {count == 1 && ( <SentenceInfo Text={fixedText} info={'맞춤법 교정 문장'} color={'#2196F3'} />) } 30 {count == 1 && ( <SentenceInfo Text={fixedText} info={'맞춤법 교정 문장'} color={'#2196F3'} />) }
29 {count == 2 && ( <SentenceInfo Text={keywordText} info={'키워드 교정 문장'} color={'#00a676'} />) } 31 {count == 2 && ( <SentenceInfo Text={keywordText} info={'키워드 교정 문장'} color={'#00a676'} />) }
30 </View> 32 </View>
31 - <View style={{flexDirection:'column-reverse', height:50}}> 33 +
32 - <Text style={styles.message}>눌러서 변화 과정을 지켜보세요!</Text> 34 + <View style={{flexDirection:'column-reverse', flex:1}}>
35 + <Text style={styles.message}>터치해 변화 과정을 지켜보세요</Text>
33 </View> 36 </View>
34 37
35 </> 38 </>
...@@ -52,20 +55,22 @@ const RateSentence = ({originalText, fixedText, keywordText }) => { ...@@ -52,20 +55,22 @@ const RateSentence = ({originalText, fixedText, keywordText }) => {
52 borderRadius: 5 55 borderRadius: 5
53 }, 56 },
54 Text:{ 57 Text:{
55 - fontSize: 25, 58 + fontSize: 18,
56 textAlign:'center' 59 textAlign:'center'
57 }, 60 },
58 infoText:{ 61 infoText:{
59 - fontSize: 20, 62 + fontSize: 18,
60 textAlign:'center', 63 textAlign:'center',
61 fontFamily:"Bold", 64 fontFamily:"Bold",
62 - marginTop: 20, 65 + marginTop: 3,
63 }, 66 },
64 message:{ 67 message:{
65 - fontFamily:"Son", 68 + fontFamily:"Pen",
66 fontSize: 20, 69 fontSize: 20,
67 - marginBottom: 15, 70 + marginTop:2,
68 - } 71 + },
72 +
73 +
69 }); 74 });
70 75
71 76
......
...@@ -32,7 +32,7 @@ const SearchCard = (props) => ( ...@@ -32,7 +32,7 @@ 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',fontFamily:"Regular"}}>정확도 : {props.metric}%</Text> 35 + <Text style={{marginTop:7, marginLeft: 10,fontFamily:"Bold"}}>정확도 : {props.metric}%</Text>
36 <Button mode='contained' color= {BUTTON} labelStyle={{color:WHITE_MAIN,fontFamily:"Regular"}} 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>
......
...@@ -10,7 +10,7 @@ db.transaction( ( tx ) => { ...@@ -10,7 +10,7 @@ db.transaction( ( tx ) => {
10 10
11 sqlite.insert = ( score ) => { 11 sqlite.insert = ( score ) => {
12 db.transaction( ( tx ) => { 12 db.transaction( ( tx ) => {
13 - tx.executeSql( `INSERT INTO district (score, date) VALUES (${score}, date('now'));` ); 13 + tx.executeSql( `INSERT INTO district (score, date) VALUES (${score}, date('now','localtime'));` );
14 }); 14 });
15 } 15 }
16 16
......