bluejoyq / searchGuide

Go to a project
Toggle navigation Toggle navigation pinning
bluejoyq
86b8c027 2 parents 8016738c eeff34a9

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
Inline Side-by-side
Showing 13 changed files with 70 additions and 4 deletions
...@@ -3,7 +3,8 @@ temp ...@@ -3,7 +3,8 @@ temp
3 temp.js 3 temp.js
4 *.env 4 *.env
5 node_modules/**/* 5 node_modules/**/*
6 -.expo/* 6 +searchGuide/.expo/*
7 +searchGuide/.expo-shared/*
7 npm-debug.* 8 npm-debug.*
8 *.jks 9 *.jks
9 *.p8 10 *.p8
...@@ -13,6 +14,8 @@ npm-debug.* ...@@ -13,6 +14,8 @@ npm-debug.*
13 *.orig.* 14 *.orig.*
14 web-build/ 15 web-build/
15 web-report/ 16 web-report/
17 +*/.expo
18 +*/.expo-shared
16 19
17 # macOS 20 # macOS
18 .DS_Store 21 .DS_Store
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -5,7 +5,11 @@ ...@@ -5,7 +5,11 @@
5 "privacy": "public", 5 "privacy": "public",
6 "sdkVersion": "35.0.0", 6 "sdkVersion": "35.0.0",
7 "androidStatusBar": { 7 "androidStatusBar": {
8 +<<<<<<< HEAD
8 "backgroundColor": "#20272F" 9 "backgroundColor": "#20272F"
10 +=======
11 + "backgroundColor": "#2C658E"
12 +>>>>>>> master
9 }, 13 },
10 "platforms": [ 14 "platforms": [
11 "ios", 15 "ios",
......
...@@ -46,8 +46,13 @@ export default PromptSearch = () => { ...@@ -46,8 +46,13 @@ 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 +<<<<<<< HEAD
49 nextButton={<Text style={{color:DARK_MAIN, fontSize:60}}>›</Text>} 50 nextButton={<Text style={{color:DARK_MAIN, fontSize:60}}>›</Text>}
50 prevButton={<Text style={{color:DARK_MAIN, fontSize:60}}>‹</Text>} 51 prevButton={<Text style={{color:DARK_MAIN, fontSize:60}}>‹</Text>}
52 +=======
53 + nextButton={<Text style={{color:'#002857', fontSize:60}}>›</Text>}
54 + prevButton={<Text style={{color:'#002857', fontSize:60}}>‹</Text>}
55 +>>>>>>> master
51 > 56 >
52 <FirstSlide /> 57 <FirstSlide />
53 <SecondSlide /> 58 <SecondSlide />
......
...@@ -45,7 +45,7 @@ export default RateBar = (props) => { ...@@ -45,7 +45,7 @@ export default RateBar = (props) => {
45 }]} 45 }]}
46 style={{height:50, width:'90%'}} 46 style={{height:50, width:'90%'}}
47 keys={['keyword','korean','rest']} 47 keys={['keyword','korean','rest']}
48 - colors={['#ffaa5a','#2cc3c2','#ffffff']} 48 + colors={['#f98a1a','#14a986','#ffffff']}
49 showGrid={ false } 49 showGrid={ false }
50 horizontal={ true } 50 horizontal={ true }
51 contentInset={ { top: 10 } } 51 contentInset={ { top: 10 } }
...@@ -76,7 +76,7 @@ const styles = StyleSheet.create({ ...@@ -76,7 +76,7 @@ const styles = StyleSheet.create({
76 right:0, 76 right:0,
77 }, 77 },
78 colorA:{ 78 colorA:{
79 - backgroundColor:'#ffaa5a', 79 + backgroundColor:'#f98a1a',
80 height: 7, 80 height: 7,
81 width: 7, 81 width: 7,
82 marginRight: 5, 82 marginRight: 5,
...@@ -84,7 +84,11 @@ const styles = StyleSheet.create({ ...@@ -84,7 +84,11 @@ const styles = StyleSheet.create({
84 fontSize: 13, 84 fontSize: 13,
85 }, 85 },
86 colorB:{ 86 colorB:{
87 +<<<<<<< HEAD
87 backgroundColor:'#2cc3c2', 88 backgroundColor:'#2cc3c2',
89 +=======
90 + backgroundColor:'#14a986',
91 +>>>>>>> master
88 height: 7, 92 height: 7,
89 width: 7, 93 width: 7,
90 marginRight: 5, 94 marginRight: 5,
...@@ -111,7 +115,11 @@ const styles = StyleSheet.create({ ...@@ -111,7 +115,11 @@ const styles = StyleSheet.create({
111 justifyContent: 'center', 115 justifyContent: 'center',
112 elevation: 2, 116 elevation: 2,
113 marginTop: 10, 117 marginTop: 10,
118 +<<<<<<< HEAD
114 borderRadius: 5, 119 borderRadius: 5,
120 +=======
121 + borderRadius: 5
122 +>>>>>>> master
115 }, 123 },
116 Text:{ 124 Text:{
117 fontSize: 22, 125 fontSize: 22,
......
...@@ -23,11 +23,19 @@ const RateLine = ({load,pastRecords }) => { ...@@ -23,11 +23,19 @@ 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 +<<<<<<< HEAD
26 <Text style={styles.date}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text> 27 <Text style={styles.date}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text>
27 </View> 28 </View>
28 ))} 29 ))}
29 </View> 30 </View>
30 <Text style={styles.message}>당신의 점수 변화를 확인하세요!</Text> 31 <Text style={styles.message}>당신의 점수 변화를 확인하세요!</Text>
32 +=======
33 + <Text style={styles.day}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text>
34 + </View>
35 + ))}
36 + </View>
37 + <Text style={styles.message}>당신의 점수 변화를 확인해 보세요!</Text>
38 +>>>>>>> master
31 </> 39 </>
32 : <PromptSearchRate /> 40 : <PromptSearchRate />
33 } 41 }
...@@ -47,6 +55,7 @@ const styles = StyleSheet.create({ ...@@ -47,6 +55,7 @@ const styles = StyleSheet.create({
47 elevation: 2, 55 elevation: 2,
48 marginTop: 10, 56 marginTop: 10,
49 marginBottom: 10, 57 marginBottom: 10,
58 +<<<<<<< HEAD
50 borderRadius: 5, 59 borderRadius: 5,
51 }, 60 },
52 info:{ 61 info:{
...@@ -57,25 +66,49 @@ const styles = StyleSheet.create({ ...@@ -57,25 +66,49 @@ const styles = StyleSheet.create({
57 score:{ 66 score:{
58 fontSize:20, 67 fontSize:20,
59 fontFamily:"Bold", 68 fontFamily:"Bold",
69 +=======
70 + borderRadius: 5
71 + },
72 + info:{
73 + fontSize:23,
74 + fontWeight:'bold',
75 + marginBottom: 5,
76 + },
77 + score:{
78 + fontSize:20,
79 + color:"#002857"
80 +>>>>>>> master
60 }, 81 },
61 scoreContainer:{ 82 scoreContainer:{
62 flexDirection:'row', 83 flexDirection:'row',
63 justifyContent: 'space-around', 84 justifyContent: 'space-around',
64 width:'100%' 85 width:'100%'
65 }, 86 },
87 +<<<<<<< HEAD
66 data:{ 88 data:{
67 fontSize:10, 89 fontSize:10,
68 textAlign:'center', 90 textAlign:'center',
69 fontFamily:"Regular", 91 fontFamily:"Regular",
92 +=======
93 + day:{
94 + fontSize: 10,
95 + textAlign:'center',
96 + marginBottom:5
97 +>>>>>>> master
70 }, 98 },
71 past:{ 99 past:{
72 alignItems:'center', 100 alignItems:'center',
73 marginBottom:5 101 marginBottom:5
74 }, 102 },
75 message:{ 103 message:{
104 +<<<<<<< HEAD
76 fontFamily:"Son", 105 fontFamily:"Son",
77 marginTop : 10, 106 marginTop : 10,
78 fontSize: 20, 107 fontSize: 20,
108 +=======
109 + margin: 5,
110 + color:"#6e8fb4"
111 +>>>>>>> master
79 } 112 }
80 }); 113 });
81 114
......
...@@ -41,7 +41,11 @@ const RateMessage = ({keywordText, score }) => { ...@@ -41,7 +41,11 @@ const RateMessage = ({keywordText, score }) => {
41 justifyContent: 'center', 41 justifyContent: 'center',
42 elevation: 2, 42 elevation: 2,
43 marginTop: 10, 43 marginTop: 10,
44 +<<<<<<< HEAD
44 borderRadius: 5, 45 borderRadius: 5,
46 +=======
47 + borderRadius: 5
48 +>>>>>>> master
45 }, 49 },
46 Text:{ 50 Text:{
47 fontSize: 25, 51 fontSize: 25,
......
...@@ -49,7 +49,11 @@ const RateSentence = ({originalText, fixedText, keywordText }) => { ...@@ -49,7 +49,11 @@ const RateSentence = ({originalText, fixedText, keywordText }) => {
49 justifyContent: 'center', 49 justifyContent: 'center',
50 elevation: 2, 50 elevation: 2,
51 marginTop: 10, 51 marginTop: 10,
52 +<<<<<<< HEAD
52 borderRadius: 5, 53 borderRadius: 5,
54 +=======
55 + borderRadius: 5
56 +>>>>>>> master
53 }, 57 },
54 Text:{ 58 Text:{
55 fontSize: 25, 59 fontSize: 25,
......
...@@ -39,5 +39,10 @@ ...@@ -39,5 +39,10 @@
39 "babel-preset-expo": "^7.1.0", 39 "babel-preset-expo": "^7.1.0",
40 "react-native-dotenv": "^0.2.0" 40 "react-native-dotenv": "^0.2.0"
41 }, 41 },
42 - "private": true 42 + "private": true,
43 + "rnpm": {
44 + "assets": [
45 + "./assets/fonts/"
46 + ]
47 + }
43 } 48 }
......