diff --git a/.vs/iut-expo-starter/FileContentIndex/649d2f79-1a77-4f95-9c56-b66231769698.vsidx b/.vs/iut-expo-starter/FileContentIndex/649d2f79-1a77-4f95-9c56-b66231769698.vsidx
new file mode 100644
index 0000000..ec0cfa9
Binary files /dev/null and b/.vs/iut-expo-starter/FileContentIndex/649d2f79-1a77-4f95-9c56-b66231769698.vsidx differ
diff --git a/.vs/iut-expo-starter/FileContentIndex/6f00d05b-710b-46f8-80a5-7097d8f9f9bc.vsidx b/.vs/iut-expo-starter/FileContentIndex/6f00d05b-710b-46f8-80a5-7097d8f9f9bc.vsidx
deleted file mode 100644
index a9971d2..0000000
Binary files a/.vs/iut-expo-starter/FileContentIndex/6f00d05b-710b-46f8-80a5-7097d8f9f9bc.vsidx and /dev/null differ
diff --git a/.vs/iut-expo-starter/FileContentIndex/d8115e4e-75d1-4e55-a65a-9d8df64c4298.vsidx b/.vs/iut-expo-starter/FileContentIndex/d8115e4e-75d1-4e55-a65a-9d8df64c4298.vsidx
deleted file mode 100644
index 47f597a..0000000
Binary files a/.vs/iut-expo-starter/FileContentIndex/d8115e4e-75d1-4e55-a65a-9d8df64c4298.vsidx and /dev/null differ
diff --git a/.vs/iut-expo-starter/FileContentIndex/3188341e-9feb-49f7-ba32-3d888084197c.vsidx b/.vs/iut-expo-starter/FileContentIndex/e6ed3b01-6190-4726-99df-f51713052ec2.vsidx
similarity index 57%
rename from .vs/iut-expo-starter/FileContentIndex/3188341e-9feb-49f7-ba32-3d888084197c.vsidx
rename to .vs/iut-expo-starter/FileContentIndex/e6ed3b01-6190-4726-99df-f51713052ec2.vsidx
index b9b9f1f..2e4b6db 100644
Binary files a/.vs/iut-expo-starter/FileContentIndex/3188341e-9feb-49f7-ba32-3d888084197c.vsidx and b/.vs/iut-expo-starter/FileContentIndex/e6ed3b01-6190-4726-99df-f51713052ec2.vsidx differ
diff --git a/.vs/iut-expo-starter/FileContentIndex/f7aea257-a7b4-4f1d-91e2-7e59888cb833.vsidx b/.vs/iut-expo-starter/FileContentIndex/f7aea257-a7b4-4f1d-91e2-7e59888cb833.vsidx
new file mode 100644
index 0000000..a0ae19c
Binary files /dev/null and b/.vs/iut-expo-starter/FileContentIndex/f7aea257-a7b4-4f1d-91e2-7e59888cb833.vsidx differ
diff --git a/App.tsx b/App.tsx
index 67999db..f3019b5 100644
--- a/App.tsx
+++ b/App.tsx
@@ -5,27 +5,27 @@ import { SafeAreaView, StyleSheet, Text, View } from 'react-native';
import { NavigationContainer } from '@react-navigation/native';
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
+import Learn from './pages/Learn';
import List from './pages/List';
-import Learn from './pages/Learn';
import Playground from './pages/Playground';
import Header from './components/Header';
export default function App() {
- const Tab = createBottomTabNavigator();
+ const Tab = createBottomTabNavigator();
return (
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
);
}
diff --git a/package-lock.json b/package-lock.json
index b46c928..27e8cc6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
"version": "1.0.0",
"dependencies": {
"@react-navigation/bottom-tabs": "^6.5.4",
+ "@react-navigation/native": "^6.1.3",
"expo": "~47.0.12",
"expo-status-bar": "~1.4.2",
"react": "18.1.0",
@@ -4531,7 +4532,6 @@
"version": "6.4.6",
"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.6.tgz",
"integrity": "sha512-6zaAgUT5k4vhJlddUk2l52RZyMkMelHdrRv1cL57ALi2RZzERdgmbiMKhJerxFLn9S8E3PUe8vwxHzjHOZKG4w==",
- "peer": true,
"dependencies": {
"@react-navigation/routers": "^6.1.6",
"escape-string-regexp": "^4.0.0",
@@ -4548,7 +4548,6 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
- "peer": true,
"engines": {
"node": ">=10"
},
@@ -4559,8 +4558,7 @@
"node_modules/@react-navigation/core/node_modules/react-is": {
"version": "16.13.1",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
- "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
- "peer": true
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
},
"node_modules/@react-navigation/elements": {
"version": "1.3.14",
@@ -4577,7 +4575,6 @@
"version": "6.1.3",
"resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.3.tgz",
"integrity": "sha512-DB5FyG6aqGfcjjVozljF5NEkjWaSymIbQHfWwsjL0YrvC1gfc7E53QXDOjxZ/wfbCo8qZs8RIC/LAgclP2YK/w==",
- "peer": true,
"dependencies": {
"@react-navigation/core": "^6.4.6",
"escape-string-regexp": "^4.0.0",
@@ -4593,7 +4590,6 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
- "peer": true,
"engines": {
"node": ">=10"
},
@@ -4605,7 +4601,6 @@
"version": "6.1.6",
"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.6.tgz",
"integrity": "sha512-Z5DeCW3pUvMafbU9Cjy1qJYC2Bvl8iy3+PfsB0DsAwQ6zZ3WAXW5FTMX4Gb9H+Jg6qHWGbMFFwlYpS3UJ3tlVQ==",
- "peer": true,
"dependencies": {
"nanoid": "^3.1.23"
}
@@ -6879,8 +6874,7 @@
"node_modules/fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
- "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
- "peer": true
+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
},
"node_modules/fast-glob": {
"version": "3.2.12",
@@ -6965,7 +6959,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
"integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
- "peer": true,
"engines": {
"node": ">=0.10.0"
}
@@ -9474,7 +9467,6 @@
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
- "peer": true,
"bin": {
"nanoid": "bin/nanoid.cjs"
},
@@ -10334,7 +10326,6 @@
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz",
"integrity": "sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==",
- "peer": true,
"dependencies": {
"decode-uri-component": "^0.2.2",
"filter-obj": "^1.1.0",
@@ -11447,7 +11438,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
"integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",
- "peer": true,
"engines": {
"node": ">=6"
}
@@ -11611,7 +11601,6 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==",
- "peer": true,
"engines": {
"node": ">=4"
}
@@ -12367,8 +12356,7 @@
"node_modules/use-latest-callback": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.1.5.tgz",
- "integrity": "sha512-HtHatS2U4/h32NlkhupDsPlrbiD27gSH5swBdtXbCAlc6pfOFzaj0FehW/FO12rx8j2Vy4/lJScCiJyM01E+bQ==",
- "peer": true
+ "integrity": "sha512-HtHatS2U4/h32NlkhupDsPlrbiD27gSH5swBdtXbCAlc6pfOFzaj0FehW/FO12rx8j2Vy4/lJScCiJyM01E+bQ=="
},
"node_modules/use-sync-external-store": {
"version": "1.2.0",
@@ -16030,7 +16018,6 @@
"version": "6.4.6",
"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.6.tgz",
"integrity": "sha512-6zaAgUT5k4vhJlddUk2l52RZyMkMelHdrRv1cL57ALi2RZzERdgmbiMKhJerxFLn9S8E3PUe8vwxHzjHOZKG4w==",
- "peer": true,
"requires": {
"@react-navigation/routers": "^6.1.6",
"escape-string-regexp": "^4.0.0",
@@ -16043,14 +16030,12 @@
"escape-string-regexp": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
- "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
- "peer": true
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
},
"react-is": {
"version": "16.13.1",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
- "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
- "peer": true
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
}
}
},
@@ -16064,7 +16049,6 @@
"version": "6.1.3",
"resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.3.tgz",
"integrity": "sha512-DB5FyG6aqGfcjjVozljF5NEkjWaSymIbQHfWwsjL0YrvC1gfc7E53QXDOjxZ/wfbCo8qZs8RIC/LAgclP2YK/w==",
- "peer": true,
"requires": {
"@react-navigation/core": "^6.4.6",
"escape-string-regexp": "^4.0.0",
@@ -16075,8 +16059,7 @@
"escape-string-regexp": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
- "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
- "peer": true
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
}
}
},
@@ -16084,7 +16067,6 @@
"version": "6.1.6",
"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.6.tgz",
"integrity": "sha512-Z5DeCW3pUvMafbU9Cjy1qJYC2Bvl8iy3+PfsB0DsAwQ6zZ3WAXW5FTMX4Gb9H+Jg6qHWGbMFFwlYpS3UJ3tlVQ==",
- "peer": true,
"requires": {
"nanoid": "^3.1.23"
}
@@ -17859,8 +17841,7 @@
"fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
- "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
- "peer": true
+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
},
"fast-glob": {
"version": "3.2.12",
@@ -17938,8 +17919,7 @@
"filter-obj": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
- "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
- "peer": true
+ "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ=="
},
"finalhandler": {
"version": "1.1.2",
@@ -19881,8 +19861,7 @@
"nanoid": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
- "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
- "peer": true
+ "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
},
"nanomatch": {
"version": "1.2.13",
@@ -20507,7 +20486,6 @@
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz",
"integrity": "sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==",
- "peer": true,
"requires": {
"decode-uri-component": "^0.2.2",
"filter-obj": "^1.1.0",
@@ -21382,8 +21360,7 @@
"split-on-first": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
- "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",
- "peer": true
+ "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="
},
"split-string": {
"version": "3.1.0",
@@ -21509,8 +21486,7 @@
"strict-uri-encode": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
- "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==",
- "peer": true
+ "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ=="
},
"string_decoder": {
"version": "1.1.1",
@@ -22058,8 +22034,7 @@
"use-latest-callback": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.1.5.tgz",
- "integrity": "sha512-HtHatS2U4/h32NlkhupDsPlrbiD27gSH5swBdtXbCAlc6pfOFzaj0FehW/FO12rx8j2Vy4/lJScCiJyM01E+bQ==",
- "peer": true
+ "integrity": "sha512-HtHatS2U4/h32NlkhupDsPlrbiD27gSH5swBdtXbCAlc6pfOFzaj0FehW/FO12rx8j2Vy4/lJScCiJyM01E+bQ=="
},
"use-sync-external-store": {
"version": "1.2.0",
diff --git a/package.json b/package.json
index 1644288..7b6d3e2 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
},
"dependencies": {
"@react-navigation/bottom-tabs": "^6.5.4",
+ "@react-navigation/native": "^6.1.3",
"expo": "~47.0.12",
"expo-status-bar": "~1.4.2",
"react": "18.1.0",
diff --git a/pages/Learn.tsx b/pages/Learn.tsx
index b1845c1..e80be56 100644
--- a/pages/Learn.tsx
+++ b/pages/Learn.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
import { Text, View, StyleSheet } from 'react-native';
import KanjiCard from '../components/KanjiCard';
@@ -7,7 +7,7 @@ const Learn = () => {
return (
- Play !
+
);
};
diff --git a/pages/List.tsx b/pages/List.tsx
index db3a230..4e08980 100644
--- a/pages/List.tsx
+++ b/pages/List.tsx
@@ -3,7 +3,7 @@ import { Text, View, StyleSheet } from 'react-native';
import KanjiCard from '../components/KanjiCard';
-const Header = () => {
+const List = () => {
return (
@@ -20,4 +20,4 @@ const headerStyle = StyleSheet.create({
}
})
-export default Header;
\ No newline at end of file
+export default List;
\ No newline at end of file
diff --git a/pages/Playground.tsx b/pages/Playground.tsx
index 102d5a8..1b69831 100644
--- a/pages/Playground.tsx
+++ b/pages/Playground.tsx
@@ -7,7 +7,7 @@ const Playground = () => {
return (
-
+ Play !
);
};
diff --git a/yarn.lock b/yarn.lock
index 35cb628..a747c4a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1747,7 +1747,7 @@
"resolved" "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.14.tgz"
"version" "1.3.14"
-"@react-navigation/native@^6.0.0":
+"@react-navigation/native@^6.0.0", "@react-navigation/native@^6.1.3":
"integrity" "sha512-DB5FyG6aqGfcjjVozljF5NEkjWaSymIbQHfWwsjL0YrvC1gfc7E53QXDOjxZ/wfbCo8qZs8RIC/LAgclP2YK/w=="
"resolved" "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.3.tgz"
"version" "6.1.3"