Update UI for color consistency, Further testing on harded Data for demo - INCOMPLETE need fix (Bug all data marked as Dangerous)

This commit is contained in:
2024-06-19 22:10:21 +08:00
parent b64e03d774
commit c84c93df36
9 changed files with 90 additions and 50 deletions

View File

@@ -66,10 +66,10 @@ const CustomTabBar: React.FC<CustomTabBarProps> = ({ state, descriptors, naviga
onLongPress={onLongPress}
style={styles.tabButton}
>
<Ionicons name={iconName} size={24} color={isFocused ? '#673ab7' : '#222'} />
<Ionicons name={iconName} size={24} color={isFocused ? '#ff69b4' : '#222'} />
{/* Check if label is a string before rendering */}
{typeof label === 'string' ? (
<Text style={{ color: isFocused ? '#673ab7' : '#222' }}>
<Text style={{ color: isFocused ? '#ff69b4' : '#222' }}>
{label}
</Text>
) : null}
@@ -122,7 +122,7 @@ const styles = StyleSheet.create({
width: 60,
height: 60,
borderRadius: 30,
backgroundColor: '#673ab7',
backgroundColor: '#ff69b4',
justifyContent: 'center',
alignItems: 'center',
shadowColor: '#000',

View File

@@ -11,24 +11,27 @@ interface ScannedDataBoxProps {
const ScannedDataBox: React.FC<ScannedDataBoxProps> = ({ data, scanResult, dataType }) => {
const extractedData = data.split('\n')[1]?.split('Data: ')[1] || '';
let resultText = 'SAFE';
let resultColor = styles.safeResult;
if (scanResult) {
if (!scanResult.secureConnection || !scanResult.virusTotalCheck) {
resultText = 'DANGEROUS';
resultColor = styles.dangerousResult;
} else if (scanResult.secureConnection && scanResult.virusTotalCheck) {
resultText = 'SAFE';
resultColor = styles.safeResult;
const getResultText = () => {
if (!scanResult || (!scanResult.secureConnection && !scanResult.virusTotalCheck)) {
return 'DANGEROUS';
} else if (scanResult.redirects > 0) {
return 'WARNING';
} else {
resultText = 'WARNING';
resultColor = styles.warningResult;
return 'SAFE';
}
} else {
resultText = 'WARNING';
resultColor = styles.warningResult;
}
};
const getResultColor = () => {
const result = getResultText();
if (result === 'DANGEROUS') {
return '#ff0000'; // Red
} else if (result === 'WARNING') {
return '#ffa500'; // Orange
} else {
return '#00ff00'; // Green
}
};
return (
<View style={styles.dataBox}>
@@ -40,8 +43,8 @@ const ScannedDataBox: React.FC<ScannedDataBoxProps> = ({ data, scanResult, dataT
<Text style={styles.timestampText}>{new Date().toLocaleString()}</Text>
<View style={styles.qrContainer}>
<QRCode value={extractedData} size={100} backgroundColor="transparent" />
<Text style={[styles.resultText, resultColor]}>
Result: {resultText}
<Text style={[styles.resultText, { color: getResultColor() }]}>
Result: {getResultText()}
</Text>
</View>
<View style={styles.divider} />
@@ -114,15 +117,6 @@ const styles = StyleSheet.create({
marginBottom: 10,
textAlign: 'center',
},
safeResult: {
color: 'green',
},
warningResult: {
color: 'orange',
},
dangerousResult: {
color: 'red',
},
typeText: {
fontSize: 16,
color: '#000',