Commit d5cdb71a authored by norhalimah's avatar norhalimah

fixed

parent 194a1e62
...@@ -77,7 +77,7 @@ class LogBook extends React.PureComponent { ...@@ -77,7 +77,7 @@ class LogBook extends React.PureComponent {
backgroundColor: 'white', backgroundColor: 'white',
borderBottomWidth:1, borderBottomWidth:1,
}}> }}>
<View style={{alignItems: 'center',marginRight:5}}> <View style={{alignItems: 'center',marginRight:8}}>
<View> <View>
<Text style={{color:'black', fontSize: 40,textAlign: 'center'}}>{(item.date !== undefined) ? item.date.split(' ')[0].trim() : ''}</Text> <Text style={{color:'black', fontSize: 40,textAlign: 'center'}}>{(item.date !== undefined) ? item.date.split(' ')[0].trim() : ''}</Text>
<Text style={{color:'black', fontSize: 15, textAlign: 'center'}}>{(item.date !== undefined) ? item.date.split(' ')[1].trim() : ''}</Text> <Text style={{color:'black', fontSize: 15, textAlign: 'center'}}>{(item.date !== undefined) ? item.date.split(' ')[1].trim() : ''}</Text>
......
...@@ -59,7 +59,6 @@ const NOTESFF1 = [{name: 'F#2', url: require('../sound/f_ff.mp3')}]; ...@@ -59,7 +59,6 @@ const NOTESFF1 = [{name: 'F#2', url: require('../sound/f_ff.mp3')}];
const NOTESGG1 = [{name: 'G#2', url: require('../sound/g_gg.mp3')}]; const NOTESGG1 = [{name: 'G#2', url: require('../sound/g_gg.mp3')}];
const NOTESAA1 = [{name: 'A#2', url: require('../sound/a_aa.mp3')}]; const NOTESAA1 = [{name: 'A#2', url: require('../sound/a_aa.mp3')}];
const keywordsList = []; const keywordsList = [];
const exitApp = () => BackHandler.exitApp();
var imageN = ''; var imageN = '';
var indexN = 0; var indexN = 0;
...@@ -781,8 +780,15 @@ this.setState({records: []}); ...@@ -781,8 +780,15 @@ this.setState({records: []});
SbuttonB51, SbuttonB51,
} = styles; } = styles;
const CorrectAlertBox = () =>{
return ( return (
<View style={styles.container}>
<ImageBackground
source={require('../img/background.jpg')}
style={{
width: '100%',
height: '100%',
}}>
<Modal transparent={true} visible={this.state.showC} animationType="slide"> <Modal transparent={true} visible={this.state.showC} animationType="slide">
<View style={{backgroundColor: '#000000aa', flex: 1}}> <View style={{backgroundColor: '#000000aa', flex: 1}}>
<View <View
...@@ -819,11 +825,7 @@ this.setState({records: []}); ...@@ -819,11 +825,7 @@ this.setState({records: []});
</View> </View>
</View> </View>
</Modal> </Modal>
);
};
const WrongAlertBox = () =>{
return (
<Modal transparent={true} visible={this.state.showW} animationType="slide"> <Modal transparent={true} visible={this.state.showW} animationType="slide">
<View style={{backgroundColor: '#000000aa', flex: 1}}> <View style={{backgroundColor: '#000000aa', flex: 1}}>
<View <View
...@@ -860,11 +862,7 @@ this.setState({records: []}); ...@@ -860,11 +862,7 @@ this.setState({records: []});
</View> </View>
</View> </View>
</Modal> </Modal>
);
};
const DoneAlertBox = () =>{
return (
<Modal transparent={true} visible={this.state.showDone} animationType="slide"> <Modal transparent={true} visible={this.state.showDone} animationType="slide">
<View style={{backgroundColor: '#000000aa', flex: 1}}> <View style={{backgroundColor: '#000000aa', flex: 1}}>
<View <View
...@@ -895,20 +893,7 @@ this.setState({records: []}); ...@@ -895,20 +893,7 @@ this.setState({records: []});
</View> </View>
</View> </View>
</Modal> </Modal>
);
};
return (
<View style={styles.container}>
<ImageBackground
source={require('../img/background.jpg')}
style={{
width: '100%',
height: '100%',
}}>
<CorrectAlertBox />
<WrongAlertBox />
<DoneAlertBox />
<StatusBar hidden /> <StatusBar hidden />
<View style={styles.c1}> <View style={styles.c1}>
<View style={styles.cc1}> <View style={styles.cc1}>
......
...@@ -6,13 +6,14 @@ import { ...@@ -6,13 +6,14 @@ import {
ImageBackground, ImageBackground,
Text, Text,
View, View,
TouchableOpacity, //TouchableOpacity,
StyleSheet, StyleSheet,
Image, Image,
ScrollView, ScrollView,
Dimensions, Dimensions,
// TextInput, // TextInput,
BackHandler, BackHandler,
Pressable,
} from 'react-native'; } from 'react-native';
import Orientation from 'react-native-orientation'; import Orientation from 'react-native-orientation';
import Notes from './data'; import Notes from './data';
...@@ -229,14 +230,14 @@ export default class Settings extends React.Component { ...@@ -229,14 +230,14 @@ export default class Settings extends React.Component {
}}> }}>
{Notes.map((item, id) => ( {Notes.map((item, id) => (
<View key={id}> <View key={id}>
<TouchableOpacity <Pressable
style={ style={
notes.find((element) => element === item.name) notes.find((element) => element === item.name)
? styles.selectedKeywordStyle ? styles.selectedKeywordStyle
: styles.buttonStyle : styles.buttonStyle
} }
onPress={() => this.toggleKeyword(item.name)} onPress={() => this.toggleKeyword(item.name)}
key={id} activeOpacity={1.0}> key={id}>
<Image <Image
source={item.image} source={item.image}
style={{ style={{
...@@ -247,7 +248,7 @@ export default class Settings extends React.Component { ...@@ -247,7 +248,7 @@ export default class Settings extends React.Component {
<Text style={{textAlign: 'center', paddingBottom: 10}}> <Text style={{textAlign: 'center', paddingBottom: 10}}>
{item.name} {item.name}
</Text> </Text>
</TouchableOpacity> </Pressable>
</View> </View>
))} ))}
</View> </View>
...@@ -274,7 +275,7 @@ const styles = StyleSheet.create({ ...@@ -274,7 +275,7 @@ const styles = StyleSheet.create({
borderColor: 'white', borderColor: 'white',
borderRadius: 10, borderRadius: 10,
backgroundColor: 'rgba(52, 52, 52, 0.0)', backgroundColor: 'rgba(52, 52, 52, 0.0)',
//opacity: 0.5, opacity:0.4,
padding: 10, padding: 10,
marginRight: config.deviceWidth * 0.03, marginRight: config.deviceWidth * 0.03,
marginBottom: config.deviceHeight * 0.03, marginBottom: config.deviceHeight * 0.03,
...@@ -287,7 +288,6 @@ const styles = StyleSheet.create({ ...@@ -287,7 +288,6 @@ const styles = StyleSheet.create({
borderColor: 'black', borderColor: 'black',
backgroundColor: 'white', backgroundColor: 'white',
// backgroundColor: 'rgba(0,0,0,0)', // backgroundColor: 'rgba(0,0,0,0)',
// opacity: 0.5,
borderRadius: 10, borderRadius: 10,
marginRight: config.deviceWidth * 0.03, marginRight: config.deviceWidth * 0.03,
marginBottom: config.deviceHeight * 0.03, marginBottom: config.deviceHeight * 0.03,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment