Merge branch 'master' into 2018102169/searchGuide-design2

# Conflicts:
#	searchGuide/.expo/packager-info.json
#	searchGuide/.expo/settings.json
#	searchGuide/app.json
#	searchGuide/components/PromptSearch/PromptSearch.js
#	searchGuide/components/RateBar/RateBar.js
#	searchGuide/components/RateLine/RateLine.js
#	searchGuide/components/RateMessage/RateMessage.js
#	searchGuide/components/RateSentence/RateSentence.js

@@ -3,7 +3,8 @@ temp
 temp.js
 *.env
 node_modules/**/*
-.expo/*
+searchGuide/.expo/*
+searchGuide/.expo-shared/*
 npm-debug.*
 *.jks
 *.p8
@@ -13,6 +14,8 @@ npm-debug.*
 *.orig.*
 web-build/
 web-report/
+*/.expo
+*/.expo-shared
 
 # macOS
 .DS_Store
\ No newline at end of file

@@ -5,7 +5,11 @@
     "privacy": "public",
     "sdkVersion": "35.0.0",
     "androidStatusBar": {
+<<<<<<< HEAD
       "backgroundColor": "#20272F"
+=======
+      "backgroundColor": "#2C658E"
+>>>>>>> master
     },
     "platforms": [
       "ios",

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

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

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

@@ -41,7 +41,11 @@ const RateMessage = ({keywordText, score }) => {
         justifyContent: 'center',
         elevation: 2,
         marginTop: 10,
+<<<<<<< HEAD
         borderRadius: 5,
+=======
+        borderRadius: 5
+>>>>>>> master
     },
     Text:{
         fontSize: 25,

@@ -49,7 +49,11 @@ const RateSentence = ({originalText, fixedText, keywordText }) => {
         justifyContent: 'center',
         elevation: 2,
         marginTop: 10,
+<<<<<<< HEAD
         borderRadius: 5,
+=======
+        borderRadius: 5
+>>>>>>> master
     },
     Text:{
         fontSize: 25,

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