diff --git a/README.md b/README.md index c165c8f..2bebea7 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,8 @@ Required: npm (node packet manager), node (recommended latest stable) 1. Clone the main-branch of this repository to your local machine. (git clone {adress}) 2. Navigate to the project directory and run `npm install` to install dependencies. -3. Start the app by executing `npm start`. If this does not work for you, you might want to consider to use `npx expo start --tunnel`. -4. Press `s` in order to switch from development mode to go. -5. Use a emulator or download the `expo go` app on your phone and scan the qr code to run the app. +3. Start the app by executing `npm start`. If this does not work for you, try using `npx expo start --tunnel`. +4. Use a emulator or download the `expo go` app on your phone and scan the qr code to run the app. (This may require an expo account.) ## Usage @@ -29,4 +28,4 @@ Required: npm (node packet manager), node (recommended latest stable) - Walcher, Raphael ## License -Finanzfuchs is released under the [MIT License](link to license). \ No newline at end of file +Finanzfuchs is released under the [MIT License]. \ No newline at end of file diff --git a/app.json b/app.json index a21474c..78d9c73 100644 --- a/app.json +++ b/app.json @@ -22,8 +22,7 @@ "adaptiveIcon": { "foregroundImage": "./assets/images/adaptive-icon.png", "backgroundColor": "#ffffff" - }, - "package": "com.thschleicher.interaktivesysteme" + } }, "web": { "bundler": "metro", @@ -35,14 +34,6 @@ ], "experiments": { "typedRoutes": true - }, - "extra": { - "router": { - "origin": false - }, - "eas": { - "projectId": "df718026-ba19-4dad-b01a-a79eb4919b9d" - } } } } diff --git a/components/common/plus/plus.tsx b/components/common/plus/plus.tsx index 27667af..863e08e 100644 --- a/components/common/plus/plus.tsx +++ b/components/common/plus/plus.tsx @@ -1,27 +1,21 @@ -import { View, Text, ViewProps, StyleSheet, TouchableOpacity } from 'react-native' import { AntDesign } from '@expo/vector-icons' import React from 'react' +import { StyleSheet, TouchableOpacity, ViewProps } from 'react-native' +import { useThemeColor } from '../../../hooks/hooks' type PlusProps = ViewProps & {onPress? : ()=> void | undefined} const Plus = (props : PlusProps) => { - return ( + const accentColor = useThemeColor("accentColor"); + const primaryText = useThemeColor("primaryText"); - - {props.children} - - - - - ) -} -const style = StyleSheet.create({ + const style = StyleSheet.create({ plus:{ position: "absolute", right: 20, bottom: 20, zIndex: 1, - backgroundColor: "orange", + backgroundColor: accentColor, padding: 20, borderRadius: 500, height: 60, @@ -30,5 +24,16 @@ const style = StyleSheet.create({ justifyContent: "center", flex:1 } -}) -export default Plus \ No newline at end of file +}); +return ( + + + {props.children} + + + + + ); +}; + +export default Plus; \ No newline at end of file diff --git a/eas.json b/eas.json deleted file mode 100644 index 5252f35..0000000 --- a/eas.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "build": { - "development": { - "developmentClient": true, - "distribution": "internal" - } - } - } - \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 7a820ed..2e67c4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,6 @@ "@expo/vector-icons": "^13.0.0", "@react-navigation/native": "^6.0.2", "expo": "~49.0.15", - "expo-dev-client": "~2.4.12", "expo-font": "~11.4.0", "expo-linking": "~5.0.2", "expo-router": "^2.0.0", @@ -8810,114 +8809,6 @@ "expo": "*" } }, - "node_modules/expo-dev-client": { - "version": "2.4.12", - "resolved": "https://registry.npmjs.org/expo-dev-client/-/expo-dev-client-2.4.12.tgz", - "integrity": "sha512-3+xg0yb/0g6+JQaWq5+xn2uHoOXP4oSX33aWkaZPSNJLoyzfRaHNDF5MLcrMBbEHCw5T5qZRU291K+uQeMMC0g==", - "dependencies": { - "expo-dev-launcher": "2.4.14", - "expo-dev-menu": "3.2.2", - "expo-dev-menu-interface": "1.3.0", - "expo-manifests": "~0.7.0", - "expo-updates-interface": "~0.10.0" - }, - "peerDependencies": { - "expo": "*" - } - }, - "node_modules/expo-dev-launcher": { - "version": "2.4.14", - "resolved": "https://registry.npmjs.org/expo-dev-launcher/-/expo-dev-launcher-2.4.14.tgz", - "integrity": "sha512-SlUf+fEX9sKzDzY1Ui8j5775eLKpO0xPVoI89G7CRsrpUv6ZRvRF836cMFesxkU5d+3bXHpKzDQiEPDSI1G/WQ==", - "dependencies": { - "expo-dev-menu": "3.2.2", - "resolve-from": "^5.0.0", - "semver": "^7.5.3" - }, - "peerDependencies": { - "expo": "*" - } - }, - "node_modules/expo-dev-launcher/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/expo-dev-launcher/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/expo-dev-launcher/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/expo-dev-menu": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/expo-dev-menu/-/expo-dev-menu-3.2.2.tgz", - "integrity": "sha512-q0IDlCGkZMsDIFV+Mgnz0Q3u/bcnrF8IFMglJ0onF09e5csLk5Ts7hKoQyervOJeThyI402r9OQsFNaru2tgtg==", - "dependencies": { - "expo-dev-menu-interface": "1.3.0", - "semver": "^7.5.3" - }, - "peerDependencies": { - "expo": "*" - } - }, - "node_modules/expo-dev-menu-interface": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/expo-dev-menu-interface/-/expo-dev-menu-interface-1.3.0.tgz", - "integrity": "sha512-WtRP7trQ2lizJJTTFXUSGGn1deIeHaYej0sUynvu/uC69VrSP4EeSnYOxbmEO29kuT/MsQBMGu0P/AkMQOqCOg==", - "peerDependencies": { - "expo": "*" - } - }, - "node_modules/expo-dev-menu/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/expo-dev-menu/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/expo-dev-menu/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, "node_modules/expo-file-system": { "version": "15.4.5", "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-15.4.5.tgz", @@ -8953,11 +8844,6 @@ "react-native": "*" } }, - "node_modules/expo-json-utils": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/expo-json-utils/-/expo-json-utils-0.7.1.tgz", - "integrity": "sha512-L0lyH8diXQtV0q5BLbFlcoxTqPF5im79xDHPhybB0j36xYdm65hjwRJ4yMrPIN5lR18hj48FUZeONiDHRyEvIg==" - }, "node_modules/expo-keep-awake": { "version": "12.3.0", "resolved": "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-12.3.0.tgz", @@ -8978,14 +8864,6 @@ "url-parse": "^1.5.9" } }, - "node_modules/expo-manifests": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/expo-manifests/-/expo-manifests-0.7.2.tgz", - "integrity": "sha512-xlhL0XI2zw3foJ0q2Ra4ieBhU0V2yz+Rv6GpVEaaIHFlIC/Dbx+mKrX5dgenZEMERr/MG7sRJaRbAVB2PaAYhA==", - "dependencies": { - "expo-json-utils": "~0.7.0" - } - }, "node_modules/expo-modules-autolinking": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.5.1.tgz", @@ -9197,14 +9075,6 @@ "expo": "*" } }, - "node_modules/expo-updates-interface": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/expo-updates-interface/-/expo-updates-interface-0.10.1.tgz", - "integrity": "sha512-I6JMR7EgjXwckrydDmrkBEX/iw750dcqpzQVsjznYWfi0HTEOxajLHB90fBFqQkUV5i5s4Fd3hYQ1Cn0oMzUbA==", - "peerDependencies": { - "expo": "*" - } - }, "node_modules/expo-web-browser": { "version": "12.3.2", "resolved": "https://registry.npmjs.org/expo-web-browser/-/expo-web-browser-12.3.2.tgz", diff --git a/package.json b/package.json index 4691426..8fff007 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,7 @@ "react-native-safe-area-context": "4.6.3", "react-native-screens": "~3.22.0", "react-native-uuid": "^2.0.1", - "react-native-web": "~0.19.6", - "expo-dev-client": "~2.4.12" + "react-native-web": "~0.19.6" }, "devDependencies": { "@babel/core": "^7.20.0",