Adding grade select in learn page

components/Header.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Text, View, StyleSheet } from 'react-native';
+import { Text, StyleSheet } from 'react-native';
 import { learnihonColors } from '../assets/colors';
 import { SafeAreaView } from 'react-native-safe-area-context';
 

components/KanjiCard.tsx

@@ -1,17 +1,14 @@
 import React, { useEffect, useState } from 'react';
-import { Button, KeyboardAvoidingView, Platform, ScrollView, StyleSheet, Text, useColorScheme } from 'react-native';
+import { Button, KeyboardAvoidingView, Platform, ScrollView, StyleSheet, Text, useColorScheme, View } from 'react-native';
 import { SvgXml } from 'react-native-svg';
 import { useSelector } from 'react-redux';
 import { learnihonColors } from '../assets/colors';
 import { Kanji } from '../model/kanji';
 import { KanjiListByGrade } from '../model/kanjiListByGrades';
+import GradeChipList from './GradeChipList';
 import KanjiAnswerField from './KanjiAnswerField';
 
-type KanjiProps = {
+const KanjiCard = () => {
-    kanji: string;
-}
-
-const KanjiCard = (props: KanjiProps) => {
 
     var kanjiCardStyle = useColorScheme() == 'light' ? kanjiCardStyle_light : kanjiCardStyle_dark;
     const [answerTextColor, setAnswerTextColor] = useState(kanjiCardStyle.text.color); 
@@ -23,7 +20,25 @@ const KanjiCard = (props: KanjiProps) => {
         }
     })
 
-    const nextKanji = () => allKanjis[Math.floor(Math.random() * allKanjis.length)];
+    const [selectedItems, setSelectedItems] = useState<{ title: string, data: Kanji[] }[]>([]);
+    const updateSelectedItems = (item: string, isSelected: Boolean) => {
+        if (!isSelected) {
+            setSelectedItems([...selectedItems, {
+                title: item,
+                data: kanjis[item]
+            }]);
+        } else {
+            setSelectedItems(selectedItems.filter((selectedItem) => selectedItem.title !== item));
+        }
+    };
+
+    const nextKanji = () => {
+        if (selectedItems.length) {
+            var items= [].concat(...Object.values(selectedItems.map(it => it.data)))
+            return items[Math.floor(Math.random() * items.length)]
+        }
+        return allKanjis[Math.floor(Math.random() * allKanjis.length)]
+    };
 
     const [kanji, setKanji] = useState((): Kanji | null => { return null });
     const [imgXml, setImgXml] = useState('<svg></svg>');
@@ -32,8 +47,7 @@ const KanjiCard = (props: KanjiProps) => {
 
     var kanjis: KanjiListByGrade = useSelector(state => state.kanjiReducer.kanjis);
 
-    const allKanjis: Kanji[] = [].concat(...Object.values(kanjis))
+    const allKanjis = [].concat(...Object.values(kanjis))
-
 
     const fetchXml = async () => {
         if (kanji) {
@@ -68,36 +82,41 @@ const KanjiCard = (props: KanjiProps) => {
     }
 
     return (
-        <KeyboardAvoidingView
+        <View style={kanjiCardStyle.container}>
-            behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+            <GradeChipList onSelect={updateSelectedItems} />
-            style={kanjiCardStyle.container}>
+
-            <ScrollView contentContainerStyle={kanjiCardStyle.container}
+            <KeyboardAvoidingView
-                showsVerticalScrollIndicator={false}>
+                behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-
+                style={kanjiCardStyle.container}>
-                <Text style={kanjiCardStyle.text}>{kanji?.onyomi}</Text>
+
-                <Text style={kanjiCardStyle.text}>{kanji?.kunyomi}</Text>
+
-
+                <ScrollView contentContainerStyle={kanjiCardStyle.container}
-                <SvgXml
+                    showsVerticalScrollIndicator={false}>
-                    xml={imgXml
+
-                        .replace(/fill="#[0-9a-f]{6}"/g, `fill=${kanjiCardStyle.svg.color}`)}
+                    <Text style={kanjiCardStyle.text}>{kanji?.onyomi}</Text>
-                    width="200"
+                    <Text style={kanjiCardStyle.text}>{kanji?.kunyomi}</Text>
-                    height="200"
+                    <SvgXml
-            />
+                        xml={imgXml
-
+                            .replace(/fill="#[0-9a-f]{6}"/g, `fill=${kanjiCardStyle.svg.color}`)}
-            {!hasAnswered && (
+                        width="200"
-                <>
+                        height="200"
-                    <KanjiAnswerField answer={answer} setAnswer={setAnswer} />
+                />
+
+                {!hasAnswered && (
+                    <>
+                        <KanjiAnswerField answer={answer} setAnswer={setAnswer} />
                         <Button title="OK" color={learnihonColors.main} onPress={computeAnswer} />
-                </>
+                    </>
-            ) || (
+                ) || (
-                <>
+                    <>
-                    <Text style={textAnswerStyle.text}>{kanji?.meaning}</Text>
+                        <Text style={textAnswerStyle.text}>{kanji?.meaning}</Text>
-                    <Text style={kanjiCardStyle.text}>{answer}</Text>
+                        <Text style={kanjiCardStyle.text}>{answer}</Text>
                         <Button title="NEXT" color={learnihonColors.main} onPress={computeNext}/>
-                </>
+                    </>
-                    )}
+                        )}
-            </ScrollView>
+                </ScrollView>
-        </KeyboardAvoidingView>
+            </KeyboardAvoidingView>
+        </View>
 
     );
 }; 

components/KanjiList.tsx

@@ -11,12 +11,7 @@ import KanjiListCell from './KanjiListCell';
 const KanjiList = () => {
 
     const kanjiListStyle = useColorScheme() == 'light' ? kanjiListStyle_light : kanjiListStyle_dark;
-    const dispatch = useDispatch();
 
-
-
-    const [res, setData] = useState(null);
-    const [loading, setLoading] = useState(true);
     var kanjis: KanjiListByGrade = useSelector(state => state.kanjiReducer.kanjis);
 
     const [selectedItems, setSelectedItems] = useState<{title: string, data: Kanji[]}[]>([]);
@@ -31,12 +26,6 @@ const KanjiList = () => {
         }
     };
 
-    useEffect(() => {
-
-
-
-    }, [dispatch]);
-
     return (
         <View>
             <GradeChipList onSelect={updateSelectedItems} />

pages/Learn.tsx

@@ -10,7 +10,7 @@ const Learn = () => {
 
     return (
         <View style={learnStyle.container}>
-            <KanjiCard kanji="所"></KanjiCard>
+            <KanjiCard></KanjiCard>
         </View>
     );
 };