diff --git a/.vs/LEARNIHON/FileContentIndex/86a5d04e-dea0-42e2-8ec2-438527b31680.vsidx b/.vs/LEARNIHON/FileContentIndex/86a5d04e-dea0-42e2-8ec2-438527b31680.vsidx new file mode 100644 index 0000000..bff553d Binary files /dev/null and b/.vs/LEARNIHON/FileContentIndex/86a5d04e-dea0-42e2-8ec2-438527b31680.vsidx differ diff --git a/.vs/LEARNIHON/FileContentIndex/aed33ea0-d65a-43ed-94ce-3fb5bf77a360.vsidx b/.vs/LEARNIHON/FileContentIndex/aed33ea0-d65a-43ed-94ce-3fb5bf77a360.vsidx deleted file mode 100644 index e12a8d8..0000000 Binary files a/.vs/LEARNIHON/FileContentIndex/aed33ea0-d65a-43ed-94ce-3fb5bf77a360.vsidx and /dev/null differ diff --git a/.vs/LEARNIHON/FileContentIndex/640efaf0-3efe-4d21-931a-62e19b7d329d.vsidx b/.vs/LEARNIHON/FileContentIndex/d19c12f8-0243-4b00-868f-72f597eb5b04.vsidx similarity index 100% rename from .vs/LEARNIHON/FileContentIndex/640efaf0-3efe-4d21-931a-62e19b7d329d.vsidx rename to .vs/LEARNIHON/FileContentIndex/d19c12f8-0243-4b00-868f-72f597eb5b04.vsidx diff --git a/.vs/LEARNIHON/v17/.wsuo b/.vs/LEARNIHON/v17/.wsuo index 7c9c8c2..c750d8c 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 28ddf47..275482b 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -11,6 +11,6 @@ "\\redux\\reducers", "\\redux\\thunks" ], - "SelectedNode": "\\components\\DrawingCanva.tsx", + "SelectedNode": "\\assets", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 784512e..22a1db1 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/.vs/tasks.vs.json b/.vs/tasks.vs.json new file mode 100644 index 0000000..3ee5ca8 --- /dev/null +++ b/.vs/tasks.vs.json @@ -0,0 +1,10 @@ +{ + "version": "0.2.1", + "tasks": [ + { + "taskLabel": "tâche-LEARNIHON", + "appliesTo": "/", + "type": "launch" + } + ] +} \ No newline at end of file diff --git a/App.tsx b/App.tsx index 709a76e..123e400 100644 --- a/App.tsx +++ b/App.tsx @@ -9,6 +9,7 @@ import { Keyboard, StyleSheet, TouchableWithoutFeedback} from 'react-native'; import { InitStack } from './navigation/Startup'; import {SafeAreaView} from 'react-native-safe-area-context'; +import { learnihonColors } from './assets/colors'; export default function App() { @@ -29,6 +30,6 @@ export default function App() { const styles = StyleSheet.create({ container: { flex: 1, - backgroundColor: '#FF5C5C', + backgroundColor: learnihonColors.main, }, }); diff --git a/assets/colors.ts b/assets/colors.ts new file mode 100644 index 0000000..b825a73 --- /dev/null +++ b/assets/colors.ts @@ -0,0 +1,11 @@ +export const learnihonColors = { + "main": "#FF5C5C", + "light": "#F5F5F5", + "light_2": "#E4E4E4", + "light_3": "#D5D5D5", + "dark": "#2B2B2B", + "dark_2": "#1C1C1C", + "dark_3": "#0D0D0D", + "wrong": "#AA3D3D", + "correct": "#3DAA3D" +} \ No newline at end of file diff --git a/components/DetailRadical.tsx b/components/DetailRadical.tsx index dd2aa3b..73de649 100644 --- a/components/DetailRadical.tsx +++ b/components/DetailRadical.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { StyleSheet, Text, useColorScheme, View } from 'react-native'; import { SvgXml } from 'react-native-svg'; -import { useDispatch, useSelector } from 'react-redux'; +import { learnihonColors } from '../assets/colors'; @@ -35,7 +35,7 @@ const detailRadicalStyle_light = StyleSheet.create({ width: 30, }, svg: { - color: "#FF5C5C" + color: learnihonColors.main }, radicalIcon: { position: "absolute" @@ -55,7 +55,7 @@ const detailRadicalStyle_dark = StyleSheet.create({ width: 30, }, svg: { - color: "#FF5C5C" + color: learnihonColors.main }, radicalIcon: { position: "absolute" diff --git a/components/DrawingCanva.tsx b/components/DrawingCanva.tsx index 039b0a2..8b404ef 100644 --- a/components/DrawingCanva.tsx +++ b/components/DrawingCanva.tsx @@ -1,14 +1,15 @@ -import React, {useEffect, useRef, useState } from 'react'; -import { SketchCanvas, SketchCanvasRef } from 'rn-perfect-sketch-canvas'; -import { StyleSheet, Button, View, Text, useColorScheme, Touchable, TouchableOpacity } from 'react-native'; +import Slider from '@react-native-community/slider'; +import React, { useEffect, useRef, useState } from 'react'; +import { Button, StyleSheet, TouchableOpacity, useColorScheme, View } from 'react-native'; import { SvgXml } from 'react-native-svg'; -import Slider from '@react-native-community/slider' +import { SketchCanvas, SketchCanvasRef } from 'rn-perfect-sketch-canvas'; import { useSelector } from 'react-redux'; import { Kanji } from '../model/kanji'; import { KanjiMapper } from '../model/kanjiMapper'; import { Eye, EyeOff } from "react-native-feather"; +import { learnihonColors } from '../assets/colors'; type DrawingCanvaProps = { backgroundImage: string; @@ -74,14 +75,14 @@ const DrawingCanva = (props: DrawingCanvaProps) => { onValueChange={(val) => setStroke(val)} minimumValue={5} maximumValue={15} - minimumTrackTintColor={"#FF5C5C"} + minimumTrackTintColor={learnihonColors.main} /> {isCanvasReady && ( -