diff --git a/.vs/LEARNIHON/FileContentIndex/f90d9613-e24f-422a-a49b-fd9c36524d43.vsidx b/.vs/LEARNIHON/FileContentIndex/640efaf0-3efe-4d21-931a-62e19b7d329d.vsidx similarity index 100% rename from .vs/LEARNIHON/FileContentIndex/f90d9613-e24f-422a-a49b-fd9c36524d43.vsidx rename to .vs/LEARNIHON/FileContentIndex/640efaf0-3efe-4d21-931a-62e19b7d329d.vsidx diff --git a/.vs/LEARNIHON/FileContentIndex/a3ee16d6-10b2-47d0-b6f8-b16c60e10714.vsidx b/.vs/LEARNIHON/FileContentIndex/a3ee16d6-10b2-47d0-b6f8-b16c60e10714.vsidx deleted file mode 100644 index 81648ef..0000000 Binary files a/.vs/LEARNIHON/FileContentIndex/a3ee16d6-10b2-47d0-b6f8-b16c60e10714.vsidx and /dev/null differ diff --git a/.vs/LEARNIHON/FileContentIndex/aed33ea0-d65a-43ed-94ce-3fb5bf77a360.vsidx b/.vs/LEARNIHON/FileContentIndex/aed33ea0-d65a-43ed-94ce-3fb5bf77a360.vsidx new file mode 100644 index 0000000..e12a8d8 Binary files /dev/null and b/.vs/LEARNIHON/FileContentIndex/aed33ea0-d65a-43ed-94ce-3fb5bf77a360.vsidx differ diff --git a/.vs/LEARNIHON/v17/.wsuo b/.vs/LEARNIHON/v17/.wsuo index b094042..7c9c8c2 100644 Binary files a/.vs/LEARNIHON/v17/.wsuo and b/.vs/LEARNIHON/v17/.wsuo differ diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 59b50cc..28ddf47 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -1,6 +1,7 @@ { "ExpandedNodes": [ "", + "\\assets", "\\components", "\\model", "\\navigation", @@ -10,6 +11,6 @@ "\\redux\\reducers", "\\redux\\thunks" ], - "SelectedNode": "\\components\\KanjiCard.tsx", + "SelectedNode": "\\components\\DrawingCanva.tsx", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 25ace1b..784512e 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/components/DrawingCanva.tsx b/components/DrawingCanva.tsx index 5379cdc..039b0a2 100644 --- a/components/DrawingCanva.tsx +++ b/components/DrawingCanva.tsx @@ -120,7 +120,12 @@ const style_light = StyleSheet.create({ slider: { width: "75%", alignSelf: "center", - } + }, + visibility: { + position: "absolute", + right: 50, + top: -25 +} }); const style_dark = StyleSheet.create({ diff --git a/components/KanjiCard.tsx b/components/KanjiCard.tsx index 26cf42f..6510cb0 100644 --- a/components/KanjiCard.tsx +++ b/components/KanjiCard.tsx @@ -74,7 +74,9 @@ const KanjiCard = (props: KanjiProps) => { - {kanji?.onyomi} + {kanji?.onyomi} + {kanji?.kunyomi} + { {selectedItems.length ? ( } diff --git a/components/KanjiListCell.tsx b/components/KanjiListCell.tsx index 83099e1..32690c5 100644 --- a/components/KanjiListCell.tsx +++ b/components/KanjiListCell.tsx @@ -7,7 +7,7 @@ interface kanjiListCellProps { kanji: Kanji; } -const KanjiListCell = (props: kanjiListCellProps) => { +const KanjiListCell = React.memo((props: kanjiListCellProps) => { const cellStyle = useColorScheme() == 'light' ? cellStyle_light : cellStyle_dark; @@ -19,7 +19,7 @@ const KanjiListCell = (props: kanjiListCellProps) => { {props.kanji.meaning} ); -}; +}); const cellStyle_light = StyleSheet.create({ item: { diff --git a/navigation/TabBar.tsx b/navigation/TabBar.tsx index aa9795e..dfce63a 100644 --- a/navigation/TabBar.tsx +++ b/navigation/TabBar.tsx @@ -118,6 +118,10 @@ const TabBar = () => { ); } + + + + const tabOptions: BottomTabNavigationOptions = { tabBarShowLabel: false, headerShown: false,