bluejoyq

last app design and delete useless fonts

......@@ -9,13 +9,8 @@ const App = () => {
useEffect( () => {
const fontLoading = async () => {
await Font.loadAsync({
'CustomFont': require('./assets/font/NanumBarunGothic.ttf'),
'CustomFontBold': require('./assets/font/NanumBarunGothicBold.ttf'),
'Pen' : require('./assets/font/NanumBarunPen.ttf'),
'Son' : require('./assets/font/NanumSon.ttf'),
'Bold' : require('./assets/font/NanumSquareRoundBold.ttf'),
'ExtraBold' : require('./assets/font/NanumSquareRoundExtraBold.ttf'),
'Light' : require('./assets/font/NanumSquareRoundLight.ttf'),
'Regular' : require('./assets/font/NanumSquareRoundRegular.ttf'),
});
setFontLoaded(true);
......
No preview for this file type
......@@ -68,7 +68,7 @@ const styles = StyleSheet.create({
marginBottom: 10,
fontSize: 30,
color:'#696969',
fontFamily:"ExtraBold"
fontFamily:"Bold"
},
icon: {
marginBottom: 20,
......@@ -79,7 +79,7 @@ const styles = StyleSheet.create({
marginBottom: 10,
fontSize: 30,
color:'#999999',
fontFamily: "Son"
fontFamily: "Pen"
},
wrapper: {
flex:1,
......
......@@ -3,15 +3,16 @@ import { Text } from 'react-native-paper';
import { StyleSheet,View } from 'react-native';
export default PromptSearchRate = () => (
<View style={{alignItems: 'center',justifyContent: 'center'}}>
<Text style={styles.Text}>아직까지 검색</Text>
<Text style={styles.Text}>결과가 없습니다!</Text>
<View style={{alignItems: 'center',justifyContent: 'center', flex:1}}>
<Text style={styles.Text}>분석을 위한 검색</Text>
<Text style={styles.Text}>결과가 없습니다</Text>
</View>
)
const styles = StyleSheet.create({
Text:{
fontFamily:'Regular',
fontSize: 20,
color: '#123422'
},
......
......@@ -17,7 +17,7 @@ export default RateBar = (props) => {
</View>
<View style={styles.container}>
<Text style={styles.message}>눌러서 각각의 점수를 알아보세요!</Text>
<Text style={styles.message}>눌러서 각각의 점수를 알아보세요</Text>
</View>
<View style={styles.infoContainer}>
<HelperText type={'info'} visible={click==2} style={styles.helper}>맞춤법 : {props.score.fix}</HelperText>
......@@ -76,7 +76,7 @@ const styles = StyleSheet.create({
width: '100%',
flexDirection:'row',
justifyContent:'center',
marginTop : 8,
marginTop : 3,
},
colorContainer:{
position:"absolute",
......@@ -102,6 +102,7 @@ const styles = StyleSheet.create({
flexDirection:'row',
justifyContent:"flex-start",
alignItems:'flex-start',
marginBottom: 10,
},
chart:{
height: 125,
......@@ -138,9 +139,9 @@ const styles = StyleSheet.create({
fontFamily:"Bold",
},
message:{
fontFamily:"Son",
fontFamily:"Pen",
fontSize: 20,
marginBottom: 10,
marginBottom: 3,
},
helper:{
fontFamily:"Bold",
......
......@@ -15,10 +15,10 @@ const RateLine = ({load,pastRecords }) => {
<Surface style={styles.surface}>
{pastRecords.length ?
<>
<Text style={styles.message}>당신의 점수 변화를 확인하세요!</Text>
<Text style={styles.message}>점수 변화를 확인하세요</Text>
<View style={styles.scoreContainer}>
{pastRecords.map((past,index)=> (
pastRecords.length - 1 > index ?
index != 0 ?
<View key={index} style={styles.past}>
<Text style={styles.date, {fontSize:11}}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text>
<Text style={styles.score}>{past.score}</Text>
......@@ -26,7 +26,7 @@ const RateLine = ({load,pastRecords }) => {
:
<View key={index} style={styles.past}>
<Text style={styles.date, {fontSize:15}}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text>
<Text style={styles.score, {fontFamily:"ExtraBold", fontSize:25, color: "#4ea1d3"}}>{past.score}</Text>
<Text style={styles.score, {fontFamily:"Bold", fontSize:22, color: "#4ea1d3"}}>{past.score}</Text>
</View>
))}
......@@ -66,8 +66,8 @@ const styles = StyleSheet.create({
marginBottom : 10,
borderRadius:5,
},
data:{
fontFamily:"Son",
date:{
fontFamily:"Pen",
textAlign:'center',
marginBottom:10,
},
......@@ -80,9 +80,9 @@ const styles = StyleSheet.create({
marginBottom:5
},
message:{
fontFamily:"Son",
fontFamily:"Pen",
margin : 5,
fontSize: 25,
fontSize: 20,
justifyContent: 'flex-start',
}
});
......
......@@ -16,8 +16,8 @@ const RateMessage = ({keywordText, score }) => {
<Surface style={styles.surface} >
{ keywordText ?
<>
<View style={{textAlign:"center", height:35}}>
<Text style={styles.message}>길잡이가 교정해준 문장을 확인하세요!</Text>
<View style={{textAlign:"center", flex:0.9, flexDirection:'column'}}>
<Text style={styles.message}>평가와 결과를 확인하세요</Text>
</View>
<View>
<Text style={styles.msg} >{score.msg}</Text>
......@@ -25,6 +25,14 @@ const RateMessage = ({keywordText, score }) => {
<View>
<SentenceInfo Text={keywordText} color={'#281e94'} />
</View>
<View style={styles.colorContainer}>
<View style={styles.textContainer}>
<View style={styles.colorA}></View><Text>평가</Text>
</View>
<View style={styles.textContainer}>
<View style={styles.colorB}></View><Text>결과</Text>
</View>
</View>
</>
: <PromptSearchRate />
}
......@@ -44,22 +52,45 @@ const RateMessage = ({keywordText, score }) => {
borderRadius: 5
},
Text:{
fontSize: 25,
textAlign:'center'
},
infoText:{
fontSize: 20,
textAlign:'center'
fontSize: 18,
textAlign:'center',
},
msg:{
fontSize: 20,
fontSize: 18,
textAlign:'center',
fontFamily:"Bold",
},
message:{
fontFamily:"Son",
fontFamily:"Pen",
fontSize: 20,
}
},
colorContainer:{
position:"absolute",
right:10,
top: 5,
},
colorA:{
backgroundColor:'#111111',
height: 7,
width: 7,
marginRight: 5,
fontFamily:"Regular",
fontSize: 13,
},
colorB:{
backgroundColor:'#281e94',
height: 7,
width: 7,
marginRight: 5,
fontFamily:"Regular",
fontSize: 13,
},
textContainer:{
flexDirection:'row',
justifyContent:'center',
alignItems:'center',
fontFamily:"Bold",
},
});
......
......@@ -19,17 +19,20 @@ const RateSentence = ({originalText, fixedText, keywordText }) => {
else setCount(count+1);
}
return (
<Surface style={styles.surface} onTouchStart={calCount} >
{ keywordText ?
<>
<View>
{count == 0 && ( <SentenceInfo Text={originalText} info={'원래 검색 문장'} color={'#B71C1C'} />) }
{count == 1 && ( <SentenceInfo Text={fixedText} info={'맞춤법 교정 문장'} color={'#2196F3'} />) }
{count == 2 && ( <SentenceInfo Text={keywordText} info={'키워드 교정 문장'} color={'#00a676'} />) }
</View>
<View style={{flexDirection:'column-reverse', height:50}}>
<Text style={styles.message}>눌러서 변화 과정을 지켜보세요!</Text>
<View style={{flexDirection:'column-reverse', flex:1}}>
<Text style={styles.message}>터치해 변화 과정을 지켜보세요</Text>
</View>
</>
......@@ -52,20 +55,22 @@ const RateSentence = ({originalText, fixedText, keywordText }) => {
borderRadius: 5
},
Text:{
fontSize: 25,
fontSize: 18,
textAlign:'center'
},
infoText:{
fontSize: 20,
fontSize: 18,
textAlign:'center',
fontFamily:"Bold",
marginTop: 20,
marginTop: 3,
},
message:{
fontFamily:"Son",
fontFamily:"Pen",
fontSize: 20,
marginBottom: 15,
}
marginTop:2,
},
});
......
......@@ -32,7 +32,7 @@ const SearchCard = (props) => (
<Paragraph>{props.content}</Paragraph>
</Card.Content>
<Card.Actions style={{flexDirection:'row', justifyContent:'space-between'}}>
<Text style={{marginTop:7, marginLeft: 10,fontStyle:'italic',fontFamily:"Regular"}}>정확도 : {props.metric}%</Text>
<Text style={{marginTop:7, marginLeft: 10,fontFamily:"Bold"}}>정확도 : {props.metric}%</Text>
<Button mode='contained' color= {BUTTON} labelStyle={{color:WHITE_MAIN,fontFamily:"Regular"}} onPress={()=>{Linking.openURL(props.url)}}>
자세히보기
</Button>
......
......@@ -10,7 +10,7 @@ db.transaction( ( tx ) => {
sqlite.insert = ( score ) => {
db.transaction( ( tx ) => {
tx.executeSql( `INSERT INTO district (score, date) VALUES (${score}, date('now'));` );
tx.executeSql( `INSERT INTO district (score, date) VALUES (${score}, date('now','localtime'));` );
});
}
......