diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index de64c1d..8f3031a 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -1,11 +1,9 @@ { "ExpandedNodes": [ "", - "\\assets", "\\components", - "\\data", "\\pages" ], - "SelectedNode": "\\components\\KanjiCard.tsx", + "SelectedNode": "\\pages\\Playground.tsx", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/iut-expo-starter/FileContentIndex/26bb8f95-1889-4e51-8030-dd44af0da4f7.vsidx b/.vs/iut-expo-starter/FileContentIndex/0c39b26e-7504-4519-80ab-85d57005ca60.vsidx similarity index 54% rename from .vs/iut-expo-starter/FileContentIndex/26bb8f95-1889-4e51-8030-dd44af0da4f7.vsidx rename to .vs/iut-expo-starter/FileContentIndex/0c39b26e-7504-4519-80ab-85d57005ca60.vsidx index 100031d..46fcd2e 100644 Binary files a/.vs/iut-expo-starter/FileContentIndex/26bb8f95-1889-4e51-8030-dd44af0da4f7.vsidx and b/.vs/iut-expo-starter/FileContentIndex/0c39b26e-7504-4519-80ab-85d57005ca60.vsidx differ diff --git a/.vs/iut-expo-starter/FileContentIndex/191a09ed-8197-4b82-8c17-172be12a37b5.vsidx b/.vs/iut-expo-starter/FileContentIndex/191a09ed-8197-4b82-8c17-172be12a37b5.vsidx new file mode 100644 index 0000000..9267cf8 Binary files /dev/null and b/.vs/iut-expo-starter/FileContentIndex/191a09ed-8197-4b82-8c17-172be12a37b5.vsidx differ diff --git a/.vs/iut-expo-starter/FileContentIndex/5cdbe43f-5b13-4cf7-b1e5-aeb3a934826b.vsidx b/.vs/iut-expo-starter/FileContentIndex/5cdbe43f-5b13-4cf7-b1e5-aeb3a934826b.vsidx deleted file mode 100644 index da8add1..0000000 Binary files a/.vs/iut-expo-starter/FileContentIndex/5cdbe43f-5b13-4cf7-b1e5-aeb3a934826b.vsidx and /dev/null differ diff --git a/.vs/iut-expo-starter/FileContentIndex/c1e56655-c906-4d50-85cf-87c5dac77327.vsidx b/.vs/iut-expo-starter/FileContentIndex/c1e56655-c906-4d50-85cf-87c5dac77327.vsidx deleted file mode 100644 index 2323cfe..0000000 Binary files a/.vs/iut-expo-starter/FileContentIndex/c1e56655-c906-4d50-85cf-87c5dac77327.vsidx and /dev/null differ diff --git a/.vs/iut-expo-starter/FileContentIndex/d5c824f1-44a0-4ba7-bfc4-7875314daeff.vsidx b/.vs/iut-expo-starter/FileContentIndex/d5c824f1-44a0-4ba7-bfc4-7875314daeff.vsidx new file mode 100644 index 0000000..10a48ca Binary files /dev/null and b/.vs/iut-expo-starter/FileContentIndex/d5c824f1-44a0-4ba7-bfc4-7875314daeff.vsidx differ diff --git a/.vs/iut-expo-starter/v17/.wsuo b/.vs/iut-expo-starter/v17/.wsuo index e357c6d..00b6de0 100644 Binary files a/.vs/iut-expo-starter/v17/.wsuo and b/.vs/iut-expo-starter/v17/.wsuo differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index c2f0fa3..f5eeb34 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/App.tsx b/App.tsx index 4a1af86..42de500 100644 --- a/App.tsx +++ b/App.tsx @@ -1,19 +1,22 @@ import React from 'react'; import { StatusBar } from 'expo-status-bar'; -import { SafeAreaView, StyleSheet } from 'react-native'; +import { Keyboard, SafeAreaView, StyleSheet, TouchableWithoutFeedback } from 'react-native'; import Header from './components/Header'; import TabBar from './components/TabBar'; export default function App() { - return ( - -
- - - + return ( + { Keyboard.dismiss(); }}> + +
+ + + + + ); } @@ -29,7 +32,6 @@ const tabOptions = { const styles = StyleSheet.create({ container: { flex: 1, - backgroundColor: 'white', - + backgroundColor: '#FF5C5C', }, }); diff --git a/components/DrawingCanva.tsx b/components/DrawingCanva.tsx index 055f1c8..572d4bc 100644 --- a/components/DrawingCanva.tsx +++ b/components/DrawingCanva.tsx @@ -1,8 +1,8 @@ -import React, { useRef } from 'react'; +import React, {useRef, useState } from 'react'; import { SketchCanvas, SketchCanvasRef } from 'rn-perfect-sketch-canvas'; import { StyleSheet, Button, View } from 'react-native'; import { SvgUri } from 'react-native-svg'; - +import Slider from '@react-native-community/slider' type DrawingCanvaProps = { backgroundImage: string; @@ -11,23 +11,30 @@ type DrawingCanvaProps = { const DrawingCanva = (props: DrawingCanvaProps) => { const canvasRef = useRef(null); - - + const [strokeWidth, setStroke] = useState(5); return ( - - - + setStroke(val)} + minimumValue={5} + maximumValue={10} + minimumTrackTintColor={"#FF5C5C"} + />