refactor(mobile): 💄 Refactor answer buttons in practice

Fixes #2232 Signed-off-by: Yunus Andréasson <yunus@edenmind.com>
edenmind · Aug 29, 2023 · c036ba2 · c036ba2
1 parent 73ec56f
commit c036ba2
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/mobile/.yarn/install-state.gz b/mobile/.yarn/install-state.gz
diff --git a/mobile/.yarn/versions/3b1fbbb3.yml b/mobile/.yarn/versions/3b1fbbb3.yml
diff --git a/mobile/package.json b/mobile/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "homepage": "https://openarabic.io",
   "repository": "https://github.com/edenmind/OpenArabic",
-  "version": "1445.2.345",
+  "version": "1445.2.346",
   "authors": [
     "Yunus Andreasson <yunus@edenmind.com> (https://github.com/YunusAndreasson)"
   ],

diff --git a/mobile/screens/text-practice-words.js b/mobile/screens/text-practice-words.js
@@ -23,7 +23,11 @@ const AnimatedButton = ({ word, handlePress }) => {
 
   return (
     <Animated.View style={{ opacity: fadeInValue }}>
-      <AnswerButton text={word.english} onPress={() => handlePress(word.id, word.arabic)} />
+      <AnswerButton
+        text={word.english}
+        onPress={() => handlePress(word.id, word.arabic)}
+        {...(word.correct ? { correct: true } : { incorrect: true })}
+      />
     </Animated.View>
   )
 }
@@ -44,7 +48,8 @@ AnimatedButton.propTypes = {
   word: PropTypes.shape({
     english: PropTypes.string.isRequired,
     id: PropTypes.number.isRequired,
-    arabic: PropTypes.string.isRequired
+    arabic: PropTypes.string.isRequired,
+    correct: PropTypes.bool.isRequired
   }).isRequired,
   handlePress: PropTypes.func.isRequired
 }
@@ -55,7 +60,8 @@ TextPracticeWords.propTypes = {
     PropTypes.shape({
       english: PropTypes.string.isRequired,
       id: PropTypes.number.isRequired,
-      arabic: PropTypes.string.isRequired
+      arabic: PropTypes.string.isRequired,
+      correct: PropTypes.bool.isRequired
     })
   ).isRequired
 }
diff --git a/mobile/screens/text-practice.js b/mobile/screens/text-practice.js
@@ -47,7 +47,14 @@ const TextPractice = () => {
     const englishWords = sentencesInText[currentSentence].englishWords
     const arabicWordId = sentencesInText[currentSentence].arabicWords[currentWord].id
 
-    setCurrentEnglishWordsInSentence(getThreeRandomWords(englishWords, arabicWordId, sentencesInText))
+    const randomWords = getThreeRandomWords(englishWords, arabicWordId, sentencesInText)
+
+    const enhancedEnglishWords = randomWords.map((word) => ({
+      ...word,
+      correct: word.id === currentWord
+    }))
+
+    setCurrentEnglishWordsInSentence(enhancedEnglishWords)
     setCurrentArabicWord(sentencesInText[currentSentence].arabicWords[currentWord])
   }, [currentSentence, currentWord, sentencesInText, textLoading])