Merge branch 'it18256888' into 'master'

It18256888

See merge request !197

frontend/src/screen/Home.js

@@ -44,7 +44,7 @@ export default function Home({ navigation }){
             <View style={styles.imageView}>
               <Image
                 style={styles.image}
-                source={require('../assets/color/background.png')}
+                source={require('../memory/images/assets/mh.jpg')}
                 resizeMode="contain"></Image>
               <ImageButton path="GameList" title="Memory Activities" />
             </View>

frontend/src/screen/memory/GameOverScreen.js

@@ -93,9 +93,14 @@ const GameOverScreen = ({navigation}) => {
         // <Text style={styles.resultText}>
         //     <Text>Child's disorder level is </Text> <Text style={styles.highlight}>{disorderLevel}</Text>
         // </Text>
-        <Text style={styles.resultText}>
-            {disorderLevel == 'High' ? `Hmm...It looks like you have to keep remember more...` : disorderLevel == 'Medium' ? `Hey...nicely played! Good!` : 'Wow! You are Excellent!'}
-        </Text>
+        <View>
+            <Text style={styles.resultText}>
+                {disorderLevel == 'High' ? `Hmm...It looks like you have to keep remember more...` : disorderLevel == 'Medium' ? `Hey...nicely played! Good!` : 'Wow! You are Excellent!'}
+            </Text>
+            <Text style={styles.resultTextDown}>
+                ( <Text>Child's disorder level is </Text> <Text style={styles.highlight}>{disorderLevel}</Text> )
+            </Text>
+        </View>
         );
     }
 
@@ -164,6 +169,11 @@ const styles = StyleSheet.create({
         fontSize: 22,
         fontWeight: 'bold'
     },
+    resultTextDown: {
+        textAlign: 'center',
+        fontSize: 18,
+        fontWeight: 'bold'
+    },
     buttonContainer: {
         flexDirection: 'row',
         width: 300,

frontend/src/screen/memory/MemoryResult.js

@@ -4,7 +4,7 @@ import {View, Text, StyleSheet} from 'react-native';
 const MemoryResult = () => {
     return(
         <View style={styles.screen}>
-            <Text>Result Screen</Text>
+            
         </View>
     );
 }

frontend/src/screen/memory/elementry/GameScreenFive.js

@@ -14,6 +14,7 @@ const GameScreenFive = ({navigation}) => {
                         style={styles.image}
                     />
                 </View>
+                <Text style={styles.imageText}>Fish</Text>
                 <CountDown
                     size={40}
                     until={Countdown.elementry}
@@ -27,7 +28,7 @@ const GameScreenFive = ({navigation}) => {
                     timeLabels={{s: 'Seconds'}}
                     style={styles.counter}
                 />
-                <Text style={styles.imageText}>Fish</Text>
+                
             </View>
         );
     }
@@ -57,7 +58,7 @@ const GameScreenFive = ({navigation}) => {
             height: '100%'
         },
         imageText: {
-            fontSize: 24,
+            fontSize: 36,
             fontWeight: 'bold',
             marginTop: 30
         },

frontend/src/screen/memory/elementry/GameScreenFour.js

@@ -57,7 +57,7 @@ const GameScreenFour = ({navigation}) => {
             height: '100%'
         },
         imageText: {
-            fontSize: 24,
+            fontSize: 36,
             fontWeight: 'bold',
             marginTop: 30
         },

frontend/src/screen/memory/elementry/GameScreenOne.js

@@ -72,7 +72,7 @@ const styles = StyleSheet.create({
         height: '100%'
     },
     imageText: {
-        fontSize: 24,
+        fontSize: 36,
         fontWeight: 'bold',
         marginTop: 30
     },

frontend/src/screen/memory/elementry/GameScreenSix.js

@@ -14,7 +14,7 @@ const GameScreenSix = ({navigation}) => {
                         style={styles.image}
                     />
                 </View>
-                <Text style={styles.imageText}>Pencil</Text>
+                <Text style={styles.imageText}>Kite</Text>
                 <CountDown
                     size={40}
                     until={Countdown.elementry}
@@ -57,7 +57,7 @@ const GameScreenSix = ({navigation}) => {
             height: '100%'
         },
         imageText: {
-            fontSize: 24,
+            fontSize: 36,
             fontWeight: 'bold',
             marginTop: 30
         },

frontend/src/screen/memory/elementry/GameScreenThree.js

@@ -57,7 +57,7 @@ const GameScreenThree = ({navigation}) => {
             height: '100%'
         },
         imageText: {
-            fontSize: 24,
+            fontSize: 36,
             fontWeight: 'bold',
             marginTop: 30
         },

frontend/src/screen/memory/elementry/GameScreenTwo.js

@@ -57,7 +57,7 @@ const GameScreenTwo = ({navigation}) => {
             height: '100%'
         },
         imageText: {
-            fontSize: 24,
+            fontSize: 36,
             fontWeight: 'bold',
             marginTop: 30
         },

frontend/src/screen/memory/medium/MediumGameScreenFive.js

@@ -58,7 +58,7 @@ const MediumGameScreenFive = ({navigation}) => {
             height: '100%'
         },
         imageText: {
-            fontSize: 24,
+            fontSize: 36,
             fontWeight: 'bold',
             marginTop: 30
         },

frontend/src/screen/memory/medium/MediumGameScreenFour.js

@@ -57,7 +57,7 @@ const MediumGameScreenFour = ({navigation}) => {
             height: '100%'
         },
         imageText: {
-            fontSize: 24,
+            fontSize: 36,
             fontWeight: 'bold',
             marginTop: 30
         },

frontend/src/screen/memory/medium/MediumGameScreenOne.js

@@ -72,7 +72,7 @@ const styles = StyleSheet.create({
         height: '100%'
     },
     imageText: {
-        fontSize: 24,
+        fontSize: 36,
         fontWeight: 'bold',
         marginTop: 30
     },

frontend/src/screen/memory/medium/MediumGameScreenSix.js

@@ -57,7 +57,7 @@ const MediumGameScreenSix = ({navigation}) => {
             height: '100%'
         },
         imageText: {
-            fontSize: 24,
+            fontSize: 36,
             fontWeight: 'bold',
             marginTop: 30
         },

frontend/src/screen/memory/medium/MediumGameScreenThree.js

@@ -57,7 +57,7 @@ const MediumGameScreenThree = ({navigation}) => {
             height: '100%'
         },
         imageText: {
-            fontSize: 24,
+            fontSize: 36,
             fontWeight: 'bold',
             marginTop: 30
         },

frontend/src/screen/memory/medium/MediumGameScreenTwo.js

@@ -57,7 +57,7 @@ const MediumGameScreenTwo = ({navigation}) => {
             height: '100%'
         },
         imageText: {
-            fontSize: 24,
+            fontSize: 36,
             fontWeight: 'bold',
             marginTop: 30
         },