bluejoyq / searchGuide

Go to a project
Toggle navigation Toggle navigation pinning
bluejoyq
b3458e1f 1 parent 88098c91

merge complete really

Inline Side-by-side
Showing 6 changed files with 1 additions and 56 deletions
...@@ -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": "#2C658E" 8 + "backgroundColor": "#20272F"
9 }, 9 },
10 "platforms": [ 10 "platforms": [
11 "ios", 11 "ios",
......
...@@ -46,13 +46,8 @@ export default PromptSearch = () => { ...@@ -46,13 +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 -<<<<<<< HEAD
50 - nextButton={<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>} 49 nextButton={<Text style={{color:'#002857', fontSize:60}}>›</Text>}
54 prevButton={<Text style={{color:'#002857', fontSize:60}}>‹</Text>} 50 prevButton={<Text style={{color:'#002857', fontSize:60}}>‹</Text>}
55 ->>>>>>> master
56 > 51 >
57 <FirstSlide /> 52 <FirstSlide />
58 <SecondSlide /> 53 <SecondSlide />
......
...@@ -84,11 +84,7 @@ const styles = StyleSheet.create({ ...@@ -84,11 +84,7 @@ const styles = StyleSheet.create({
84 fontSize: 13, 84 fontSize: 13,
85 }, 85 },
86 colorB:{ 86 colorB:{
87 -<<<<<<< HEAD
88 backgroundColor:'#2cc3c2', 87 backgroundColor:'#2cc3c2',
89 -=======
90 - backgroundColor:'#14a986',
91 ->>>>>>> master
92 height: 7, 88 height: 7,
93 width: 7, 89 width: 7,
94 marginRight: 5, 90 marginRight: 5,
...@@ -115,11 +111,7 @@ const styles = StyleSheet.create({ ...@@ -115,11 +111,7 @@ const styles = StyleSheet.create({
115 justifyContent: 'center', 111 justifyContent: 'center',
116 elevation: 2, 112 elevation: 2,
117 marginTop: 10, 113 marginTop: 10,
118 -<<<<<<< HEAD
119 - borderRadius: 5,
120 -=======
121 borderRadius: 5 114 borderRadius: 5
122 ->>>>>>> master
123 }, 115 },
124 Text:{ 116 Text:{
125 fontSize: 22, 117 fontSize: 22,
......
...@@ -23,19 +23,11 @@ const RateLine = ({load,pastRecords }) => { ...@@ -23,19 +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 -<<<<<<< HEAD
27 - <Text style={styles.date}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text>
28 - </View>
29 - ))}
30 - </View>
31 - <Text style={styles.message}>당신의 점수 변화를 확인하세요!</Text>
32 -=======
33 <Text style={styles.day}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text> 26 <Text style={styles.day}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text>
34 </View> 27 </View>
35 ))} 28 ))}
36 </View> 29 </View>
37 <Text style={styles.message}>당신의 점수 변화를 확인해 보세요!</Text> 30 <Text style={styles.message}>당신의 점수 변화를 확인해 보세요!</Text>
38 ->>>>>>> master
39 </> 31 </>
40 : <PromptSearchRate /> 32 : <PromptSearchRate />
41 } 33 }
...@@ -55,18 +47,6 @@ const styles = StyleSheet.create({ ...@@ -55,18 +47,6 @@ const styles = StyleSheet.create({
55 elevation: 2, 47 elevation: 2,
56 marginTop: 10, 48 marginTop: 10,
57 marginBottom: 10, 49 marginBottom: 10,
58 -<<<<<<< HEAD
59 - borderRadius: 5,
60 - },
61 - info:{
62 - fontSize:22,
63 - marginBottom: 5,
64 - fontFamily:"Bold",
65 - },
66 - score:{
67 - fontSize:20,
68 - fontFamily:"Bold",
69 -=======
70 borderRadius: 5 50 borderRadius: 5
71 }, 51 },
72 info:{ 52 info:{
...@@ -77,38 +57,24 @@ const styles = StyleSheet.create({ ...@@ -77,38 +57,24 @@ const styles = StyleSheet.create({
77 score:{ 57 score:{
78 fontSize:20, 58 fontSize:20,
79 color:"#002857" 59 color:"#002857"
80 ->>>>>>> master
81 }, 60 },
82 scoreContainer:{ 61 scoreContainer:{
83 flexDirection:'row', 62 flexDirection:'row',
84 justifyContent: 'space-around', 63 justifyContent: 'space-around',
85 width:'100%' 64 width:'100%'
86 }, 65 },
87 -<<<<<<< HEAD
88 - data:{
89 - fontSize:10,
90 - textAlign:'center',
91 - fontFamily:"Regular",
92 -=======
93 day:{ 66 day:{
94 fontSize: 10, 67 fontSize: 10,
95 textAlign:'center', 68 textAlign:'center',
96 marginBottom:5 69 marginBottom:5
97 ->>>>>>> master
98 }, 70 },
99 past:{ 71 past:{
100 alignItems:'center', 72 alignItems:'center',
101 marginBottom:5 73 marginBottom:5
102 }, 74 },
103 message:{ 75 message:{
104 -<<<<<<< HEAD
105 - fontFamily:"Son",
106 - marginTop : 10,
107 - fontSize: 20,
108 -=======
109 margin: 5, 76 margin: 5,
110 color:"#6e8fb4" 77 color:"#6e8fb4"
111 ->>>>>>> master
112 } 78 }
113 }); 79 });
114 80
......
...@@ -41,11 +41,7 @@ const RateMessage = ({keywordText, score }) => { ...@@ -41,11 +41,7 @@ const RateMessage = ({keywordText, score }) => {
41 justifyContent: 'center', 41 justifyContent: 'center',
42 elevation: 2, 42 elevation: 2,
43 marginTop: 10, 43 marginTop: 10,
44 -<<<<<<< HEAD
45 - borderRadius: 5,
46 -=======
47 borderRadius: 5 44 borderRadius: 5
48 ->>>>>>> master
49 }, 45 },
50 Text:{ 46 Text:{
51 fontSize: 25, 47 fontSize: 25,
......
...@@ -49,11 +49,7 @@ const RateSentence = ({originalText, fixedText, keywordText }) => { ...@@ -49,11 +49,7 @@ 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
53 - borderRadius: 5,
54 -=======
55 borderRadius: 5 52 borderRadius: 5
56 ->>>>>>> master
57 }, 53 },
58 Text:{ 54 Text:{
59 fontSize: 25, 55 fontSize: 25,
......