Merge branch '2018102169/searchGuide-design' into 'master'

2018102169/search guide design

merge conflict 해결중

See merge request !10

@@ -13,6 +13,8 @@ npm-debug.*
 *.orig.*
 *.orig.*
 web-build/
 web-build/
 web-report/
 web-report/
+*/.expo/*
+*/.expo-shared/*
 
 
 # macOS
 # macOS
 .DS_Store
 .DS_Store
\ No newline at end of file

 {
 {
-  "hostType": "lan",
+  "hostType": "tunnel",
   "lanType": "ip",
   "lanType": "ip",
   "dev": true,
   "dev": true,
   "minify": false,
   "minify": false,

@@ -5,7 +5,7 @@
     "privacy": "public",
     "privacy": "public",
     "sdkVersion": "35.0.0",
     "sdkVersion": "35.0.0",
     "androidStatusBar": {
     "androidStatusBar": {
-      "backgroundColor": "#226557"
+      "backgroundColor": "#06182d"
     },
     },
     "platforms": [
     "platforms": [
       "ios",
       "ios",

@@ -46,8 +46,8 @@ export default PromptSearch = () => {
         showsButtons={true} 
         showsButtons={true} 
         loop={false} height={400}
         loop={false} height={400}
         activeDotColor={LIGHT_MAIN}
         activeDotColor={LIGHT_MAIN}
-        nextButton={<Text style={{color:'#3BAD87', fontSize:60}}>›</Text>}
-        prevButton={<Text style={{color:'#3BAD87', fontSize:60}}>‹</Text>}
+        nextButton={<Text style={{color:'#002857', fontSize:60}}>›</Text>}
+        prevButton={<Text style={{color:'#002857', fontSize:60}}>‹</Text>}
         >
         >
             <FirstSlide />
             <FirstSlide />
             <SecondSlide />
             <SecondSlide />

@@ -45,7 +45,7 @@ export default RateBar = (props) => {
             }]} 
             }]} 
             style={{height:50, width:'90%'}}
             style={{height:50, width:'90%'}}
             keys={['keyword','korean','rest']} 
             keys={['keyword','korean','rest']} 
-            colors={['#ffaa5a','#2cc3c2','#ffffff']}
+            colors={['#f98a1a','#14a986','#ffffff']}
             showGrid={ false }
             showGrid={ false }
             horizontal={ true }
             horizontal={ true }
             contentInset={ { top: 10 } }  
             contentInset={ { top: 10 } }  
@@ -76,13 +76,13 @@ const styles = StyleSheet.create({
         right:0,
         right:0,
     },
     },
     colorA:{
     colorA:{
-        backgroundColor:'#ffaa5a',
+        backgroundColor:'#f98a1a',
         height: 7,
         height: 7,
         width: 7,
         width: 7,
         marginRight: 5,
         marginRight: 5,
     },
     },
     colorB:{
     colorB:{
-        backgroundColor:'#2cc3c2',
+        backgroundColor:'#14a986',
         height: 7,
         height: 7,
         width: 7,
         width: 7,
         marginRight: 5,
         marginRight: 5,
@@ -105,7 +105,8 @@ const styles = StyleSheet.create({
         alignItems: 'center',
         alignItems: 'center',
         justifyContent: 'center',
         justifyContent: 'center',
         elevation: 2,
         elevation: 2,
-        marginTop: 10
+        marginTop: 10,
+        borderRadius: 5
     },
     },
     Text:{
     Text:{
         fontSize: 25,
         fontSize: 25,

@@ -23,11 +23,11 @@ const RateLine = ({load,pastRecords }) => {
                 {pastRecords.map((past,index)=> (
                 {pastRecords.map((past,index)=> (
                     <View  key={index} style={styles.past}>
                     <View  key={index} style={styles.past}>
                         <Text style={styles.score}>{past.score}</Text>
                         <Text style={styles.score}>{past.score}</Text>
-                        <Text style={styles.date}>{past.date.substring(5,7)+'월 '+past.date.substring(8,10)+'일'}</Text>
+                        <Text style={styles.day}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text>
                     </View>
                     </View>
                 ))} 
                 ))} 
                 </View>
                 </View>
-                <Text>최근 점수 추세</Text>
+                <Text style={styles.message}>당신의 점수 변화를 확인해 보세요!</Text>
             </>
             </>
              : <PromptSearchRate />
              : <PromptSearchRate />
             }
             }
@@ -47,27 +47,34 @@ const styles = StyleSheet.create({
         elevation: 2,
         elevation: 2,
         marginTop: 10,
         marginTop: 10,
         marginBottom: 10,
         marginBottom: 10,
+        borderRadius: 5
     },
     },
     info:{
     info:{
-        fontSize:25,
+        fontSize:23,
         fontWeight:'bold',
         fontWeight:'bold',
-        marginBottom: 5
+        marginBottom: 5,
     },
     },
     score:{
     score:{
-        fontSize:20
+        fontSize:20,
+        color:"#002857"
     },
     },
     scoreContainer:{
     scoreContainer:{
         flexDirection:'row',
         flexDirection:'row',
         justifyContent: 'space-around',
         justifyContent: 'space-around',
         width:'100%'
         width:'100%'
     },
     },
-    data:{
-        fontSize:13,
+    day:{
+        fontSize: 10,
         textAlign:'center',
         textAlign:'center',
+        marginBottom:5
     },
     },
     past:{
     past:{
         alignItems:'center',
         alignItems:'center',
         marginBottom:5
         marginBottom:5
+    },
+    message:{
+        margin: 5,
+        color:"#6e8fb4"
     }
     }
 });
 });
 
 

@@ -40,7 +40,8 @@ const RateMessage = ({keywordText, score }) => {
         alignItems: 'center',
         alignItems: 'center',
         justifyContent: 'center',
         justifyContent: 'center',
         elevation: 2,
         elevation: 2,
-        marginTop: 10
+        marginTop: 10,
+        borderRadius: 5
     },
     },
     Text:{
     Text:{
         fontSize: 25,
         fontSize: 25,

@@ -48,7 +48,8 @@ const RateSentence = ({originalText, fixedText, keywordText }) => {
         alignItems: 'center',
         alignItems: 'center',
         justifyContent: 'center',
         justifyContent: 'center',
         elevation: 2,
         elevation: 2,
-        marginTop: 10
+        marginTop: 10,
+        borderRadius: 5
     },
     },
     Text:{
     Text:{
         fontSize: 25,
         fontSize: 25,

 import React from 'react';
 import React from 'react';
-import { DARK_MAIN,LIGHT_MAIN, WHITE_MAIN} from 'react-native-dotenv';
+import { DARK_MAIN,LIGHT_MAIN, WHITE_MAIN, BUTTON} from 'react-native-dotenv';
 import { Avatar, Button, Card, Title, Paragraph, Text } from 'react-native-paper';
 import { Avatar, Button, Card, Title, Paragraph, Text } from 'react-native-paper';
 import {Linking, Image, StyleSheet } from 'react-native';
 import {Linking, Image, StyleSheet } from 'react-native';
  
  
@@ -33,7 +33,7 @@ const SearchCard = (props) => (
     </Card.Content>
     </Card.Content>
     <Card.Actions style={{flexDirection:'row', justifyContent:'space-between'}}>
     <Card.Actions style={{flexDirection:'row', justifyContent:'space-between'}}>
         <Text style={{marginTop:7, marginLeft: 10,fontStyle:'italic'}}>정확도 : {props.metric}%</Text>
         <Text style={{marginTop:7, marginLeft: 10,fontStyle:'italic'}}>정확도 : {props.metric}%</Text>
-        <Button mode='contained' color= {LIGHT_MAIN} labelStyle={{color:WHITE_MAIN}} onPress={()=>{Linking.openURL(props.url)}}>
+        <Button mode='contained' color= {BUTTON} labelStyle={{color:WHITE_MAIN}} onPress={()=>{Linking.openURL(props.url)}}>
         자세히보기
         자세히보기
         </Button>
         </Button>
     </Card.Actions>
     </Card.Actions>

@@ -39,5 +39,10 @@
     "babel-preset-expo": "^7.1.0",
     "babel-preset-expo": "^7.1.0",
     "react-native-dotenv": "^0.2.0"
     "react-native-dotenv": "^0.2.0"
   },
   },
-  "private": true
+  "private": true,
+  "rnpm": {
+    "assets": [
+      "./assets/fonts/"
+    ]
+  }
 }
 }