Commit 95f3c966 authored by Malsha Jayakody's avatar Malsha Jayakody

Merge remote-tracking branch 'origin/feature/skin-manage' into final-app

parents cc8603af 1cc146cc
...@@ -12,7 +12,7 @@ export default { ...@@ -12,7 +12,7 @@ export default {
sk_5: require('../assets/sk_5.png'), sk_5: require('../assets/sk_5.png'),
sk_8: require('../assets/sk_8.png'), sk_8: require('../assets/sk_8.png'),
sk_9: require('../assets/sk_9.png'), sk_9: require('../assets/sk_9.png'),
sk_14: require('../assets/sk_14.png'), sk_14: require('../assets/sk_14.jpg'),
sk_15: require('../assets/sk_15.png'), sk_15: require('../assets/sk_15.png'),
sk_16: require('../assets/sk_16.png'), sk_16: require('../assets/sk_16.png'),
......
...@@ -36,8 +36,8 @@ export default { ...@@ -36,8 +36,8 @@ export default {
SKIN_VIDEO3: 'Skin_Video3', SKIN_VIDEO3: 'Skin_Video3',
SKIN_VIDEO4: 'Skin_Video4', SKIN_VIDEO4: 'Skin_Video4',
SKIN_VIDEO5: 'Skin_Video5', SKIN_VIDEO5: 'Skin_Video5',
EXERCISE_PROGRESS: 'Exercise_PROGRESS',
SKIN_INFO:'skin_info',
//GAMES //GAMES
GAME_HOME: 'Game_Home', GAME_HOME: 'Game_Home',
......
...@@ -9,6 +9,7 @@ import AdditionalSymptoms2 from '../screens/home/skin/AdditionalSymptoms2'; ...@@ -9,6 +9,7 @@ import AdditionalSymptoms2 from '../screens/home/skin/AdditionalSymptoms2';
import AdditionalSymptoms3 from '../screens/home/skin/AdditionalSymptoms3'; import AdditionalSymptoms3 from '../screens/home/skin/AdditionalSymptoms3';
import AdditionalSymptoms4 from '../screens/home/skin/AdditionalSymptoms4'; import AdditionalSymptoms4 from '../screens/home/skin/AdditionalSymptoms4';
import AdditionalSymptoms5 from '../screens/home/skin/AdditionalSymptoms5'; import AdditionalSymptoms5 from '../screens/home/skin/AdditionalSymptoms5';
import Additionalinformation from '../screens/home/skin/information1';
import {COLORS, ROUTES} from "../constants" import {COLORS, ROUTES} from "../constants"
const Stack = createStackNavigator(); const Stack = createStackNavigator();
...@@ -28,6 +29,7 @@ function SkinNavigator() { ...@@ -28,6 +29,7 @@ function SkinNavigator() {
<Stack.Screen name={ROUTES.SKIN_VIDEO3} component={AdditionalSymptoms3} /> <Stack.Screen name={ROUTES.SKIN_VIDEO3} component={AdditionalSymptoms3} />
<Stack.Screen name={ROUTES.SKIN_VIDEO4} component={AdditionalSymptoms4} /> <Stack.Screen name={ROUTES.SKIN_VIDEO4} component={AdditionalSymptoms4} />
<Stack.Screen name={ROUTES.SKIN_VIDEO5} component={AdditionalSymptoms5} /> <Stack.Screen name={ROUTES.SKIN_VIDEO5} component={AdditionalSymptoms5} />
<Stack.Screen name={ROUTES.SKIN_INFO} component={Additionalinformation} />
......
...@@ -79,7 +79,7 @@ const AdditionalSymptomsScreen = ({ navigation }) => { ...@@ -79,7 +79,7 @@ const AdditionalSymptomsScreen = ({ navigation }) => {
if (toSkinRisk) { if (toSkinRisk) {
navigation.navigate(ROUTES.SKIN_RISK); navigation.navigate(ROUTES.SKIN_RISK);
} else { } else {
navigation.navigate(ROUTES.SKIN_UPLOAD); navigation.navigate(ROUTES.SKIN_INFO);
} }
}; };
......
...@@ -73,7 +73,7 @@ const AdditionalSymptomsScreen = ({ navigation }) => { ...@@ -73,7 +73,7 @@ const AdditionalSymptomsScreen = ({ navigation }) => {
if (toSkinRisk) { if (toSkinRisk) {
navigation.navigate(ROUTES.SKIN_RISK); navigation.navigate(ROUTES.SKIN_RISK);
} else { } else {
navigation.navigate(ROUTES.SKIN_UPLOAD); navigation.navigate(ROUTES.SKIN_INFO);
} }
}; };
......
...@@ -62,14 +62,14 @@ const AdditionalSymptomsScreen = ({ navigation }) => { ...@@ -62,14 +62,14 @@ const AdditionalSymptomsScreen = ({ navigation }) => {
const handleSubmit = () => { const handleSubmit = () => {
// Checking for specific symptoms that lead to SKIN_RISK // Checking for specific symptoms that lead to SKIN_RISK
const skinRiskSymptoms = ['symptom3', 'symptom4', 'symptom4','symptom10', 'symptom8', 'symptom6']; const skinRiskSymptoms = ['symptom3', 'symptom5', 'symptom4'];
const toSkinRisk = skinRiskSymptoms.some(symptom => selectedSymptoms[symptom]); const toSkinRisk = skinRiskSymptoms.some(symptom => selectedSymptoms[symptom]);
// Navigate based on condition // Navigate based on condition
if (toSkinRisk) { if (toSkinRisk) {
navigation.navigate(ROUTES.SKIN_RISK); navigation.navigate(ROUTES.SKIN_RISK);
} else { } else {
navigation.navigate(ROUTES.SKIN_UPLOAD); navigation.navigate(ROUTES.SKIN_INFO);
} }
}; };
......
...@@ -57,14 +57,14 @@ const AdditionalSymptomsScreen = ({ navigation }) => { ...@@ -57,14 +57,14 @@ const AdditionalSymptomsScreen = ({ navigation }) => {
const handleSubmit = () => { const handleSubmit = () => {
// Checking for specific symptoms that lead to SKIN_RISK // Checking for specific symptoms that lead to SKIN_RISK
const skinRiskSymptoms = ['symptom3', 'symptom4', 'symptom4','symptom10', 'symptom8', 'symptom6']; const skinRiskSymptoms = ['symptom3', 'symptom5'];
const toSkinRisk = skinRiskSymptoms.some(symptom => selectedSymptoms[symptom]); const toSkinRisk = skinRiskSymptoms.some(symptom => selectedSymptoms[symptom]);
// Navigate based on condition // Navigate based on condition
if (toSkinRisk) { if (toSkinRisk) {
navigation.navigate(ROUTES.SKIN_RISK); navigation.navigate(ROUTES.SKIN_RISK);
} else { } else {
navigation.navigate(ROUTES.SKIN_UPLOAD); navigation.navigate(ROUTES.SKIN_INFO);
} }
}; };
...@@ -106,7 +106,7 @@ const AdditionalSymptomsScreen = ({ navigation }) => { ...@@ -106,7 +106,7 @@ const AdditionalSymptomsScreen = ({ navigation }) => {
<SafeAreaView style={styles.container}> <SafeAreaView style={styles.container}>
<ScrollView style={styles.scrollContainer} contentContainerStyle={styles.contentContainer}> <ScrollView style={styles.scrollContainer} contentContainerStyle={styles.contentContainer}>
<View style={styles.topContainer}> <View style={styles.topContainer}>
<Text style={styles.topicText}>Cytomegalovirus Additional Symptoms</Text> <Text style={styles.topicText}>Herpes Additional Symptoms</Text>
<View style={styles.videoBox}> <View style={styles.videoBox}>
<View style={styles.videoDescriptionBox}> <View style={styles.videoDescriptionBox}>
<Text style={styles.descriptionText}> <Text style={styles.descriptionText}>
......
...@@ -25,7 +25,7 @@ const RiskEvaluationScreen = ({ navigation }) => { ...@@ -25,7 +25,7 @@ const RiskEvaluationScreen = ({ navigation }) => {
</Text> </Text>
<Text style={styles.subTopicText}>Why High Risk ?</Text> <Text style={styles.subTopicText}>Why High Risk ?</Text>
<View style={styles.audioPlayerContainer}> <View style={styles.audioPlayerContainer}>
<Video {/* <Video
source={require("./skinassets/pause.png")} source={require("./skinassets/pause.png")}
style={styles.audioPlayer} style={styles.audioPlayer}
controls={true} controls={true}
...@@ -35,7 +35,7 @@ const RiskEvaluationScreen = ({ navigation }) => { ...@@ -35,7 +35,7 @@ const RiskEvaluationScreen = ({ navigation }) => {
repeat={true} repeat={true}
onLoad={() => setAudioPaused(false)} onLoad={() => setAudioPaused(false)}
/> /> */}
</View> </View>
<Image style={styles.babyImage} source={IMGS.sk_14} /> <Image style={styles.babyImage} source={IMGS.sk_14} />
...@@ -48,7 +48,7 @@ const RiskEvaluationScreen = ({ navigation }) => { ...@@ -48,7 +48,7 @@ const RiskEvaluationScreen = ({ navigation }) => {
<Button <Button
title="Continue for more information" title="Continue for more information"
style={styles.nextButton} style={styles.nextButton}
onPress={handleContinue} onPress={() => navigation.navigate(ROUTES.SKIN_INFO)}
/> />
</View> </View>
</View> </View>
......
...@@ -143,7 +143,7 @@ const Camera = ({ navigation }) => { ...@@ -143,7 +143,7 @@ const Camera = ({ navigation }) => {
<Button <Button
title="Continue for more information" title="Continue for more information"
style={styles.nextButton} style={styles.nextButton}
onPress={() => navigation.navigate(ROUTES.SKIN_VIDEO2)} onPress={handleContinue}
/> />
</View> </View>
</View> </View>
......
This diff is collapsed.
import axios from 'axios'; import axios from 'axios';
const BASE_PATH = 'http://16.16.97.48/api/mother'; const BASE_PATH = 'http://10.0.2.2:8070/api/mother';
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
//signIn API Call //signIn API Call
......
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