김서영

conflict problem solved

{
"devToolsPort": 19002,
"expoServerPort": 19000,
"packagerPort": null,
"packagerPid": null,
"expoServerNgrokUrl": "https://7f-yzp.anonymous.searchguide.exp.direct",
"packagerNgrokUrl": "https://packager.7f-yzp.anonymous.searchguide.exp.direct",
"ngrokPid": 2900
"packagerPort": 19001,
"packagerPid": 2240,
"expoServerNgrokUrl": "https://bm-jd7.anonymous.searchguide.exp.direct",
"packagerNgrokUrl": "https://packager.bm-jd7.anonymous.searchguide.exp.direct",
"ngrokPid": 21352
}
......
{
"hostType": "tunnel",
"hostType": "lan",
"lanType": "ip",
"dev": true,
"minify": false,
"urlRandomness": "7f-yzp",
"urlRandomness": "bm-jd7",
"https": false
}
......
......@@ -15,40 +15,10 @@ export default RateBar = (props) => {
<View style={styles.container}>
<Text style={styles.Text}> 점수 : {props.score.full}</Text>
</View>
<<<<<<< HEAD
<View style={styles.container}>
<Text style={styles.message}>눌러서 각각의 점수를 알아보세요!</Text>
</View>
=======
<StackedBarChart
data={ [{
keyword: {
value: props.score.key,
svg: {
onPressIn: () => {setClick(1)},
onPressOut: ()=>{setClick(0)}
},
},
korean: {
value: props.score.fix,
svg: {
onPressIn: () => {setClick(2)},
onPressOut: ()=>{setClick(0)}
},
},
rest: {
value: (100-(props.score.key+props.score.fix)),
}
}]}
style={{height:50, width:'90%'}}
keys={['keyword','korean','rest']}
colors={['#f98a1a','#14a986','#ffffff']}
showGrid={ false }
horizontal={ true }
contentInset={ { top: 10 } }
valueAccessor={({ item, key }) => item[key].value}
/>
>>>>>>> master
<View style={styles.infoContainer}>
<HelperText type={'info'} visible={click==2} style={styles.helper}>맞춤법 : {props.score.fix}</HelperText>
<HelperText type={'info'} visible={click==1} style={styles.helper}>키워드 : {props.score.key}</HelperText>
......@@ -112,11 +82,7 @@ const styles = StyleSheet.create({
right:10,
},
colorA:{
<<<<<<< HEAD
backgroundColor:'#e85a71',
=======
backgroundColor:'#f98a1a',
>>>>>>> master
height: 7,
width: 7,
marginRight: 5,
......