From 7d5ae7320f6677def1828699e576f1f8c53323d0 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 14 Aug 2023 23:23:19 +0000 Subject: [PATCH] fix: moved to other slider library as the old has rendered a bigger thumb on ios then on android --- package-lock.json | 10 ++++++ package.json | 1 + src/Components/ColorPicker/index.js | 1 - src/Components/Slider/index.js | 32 +++++++++++++++++-- .../Device/modals/EditActions/Lights/index.js | 2 +- .../Device/modals/EditActions/Motor/index.js | 2 +- 6 files changed, 42 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 572c0ef..68884ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "app", "version": "1.0.0", "dependencies": { + "@miblanchard/react-native-slider": "^2.3.1", "@react-native-async-storage/async-storage": "1.17.11", "@react-native-community/slider": "^4.4.2", "@react-navigation/drawer": "^6.6.3", @@ -3558,6 +3559,15 @@ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, + "node_modules/@miblanchard/react-native-slider": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@miblanchard/react-native-slider/-/react-native-slider-2.3.1.tgz", + "integrity": "sha512-J/hZDBWmXq8fJeOnTVHqIUVDHshqMSpJVxJ4WqwuCBKl5Rke9OBYXIdkSlgi75OgtScAr8FKK5KNkDKHUf6JIg==", + "peerDependencies": { + "react": ">=16.8", + "react-native": ">=0.59" + } + }, "node_modules/@nicolo-ribaudo/semver-v6": { "version": "6.3.3", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz", diff --git a/package.json b/package.json index be9b885..b8c2923 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "web": "expo start --web" }, "dependencies": { + "@miblanchard/react-native-slider": "^2.3.1", "@react-native-async-storage/async-storage": "1.17.11", "@react-native-community/slider": "^4.4.2", "@react-navigation/drawer": "^6.6.3", diff --git a/src/Components/ColorPicker/index.js b/src/Components/ColorPicker/index.js index e895ab1..3afc4c6 100644 --- a/src/Components/ColorPicker/index.js +++ b/src/Components/ColorPicker/index.js @@ -416,7 +416,6 @@ export function MyColorSwatch({ size, backgroundColor, style }) { height: size, borderRadius: 16, }, - AppStyles.Shadow, style, ]} /> diff --git a/src/Components/Slider/index.js b/src/Components/Slider/index.js index 2064e44..ed4e23b 100644 --- a/src/Components/Slider/index.js +++ b/src/Components/Slider/index.js @@ -1,6 +1,8 @@ -import Slider from "@react-native-community/slider"; +//import Slider from "@react-native-community/slider"; import { useContext } from "react"; import { AppContext } from "../../utils"; +import { Slider } from "@miblanchard/react-native-slider"; +import { View } from "react-native"; export default function MySlider({ style, @@ -8,12 +10,11 @@ export default function MySlider({ onValueChange, minimumValue, maximumValue, - inverted, onSlidingComplete, }) { const appContext = useContext(AppContext); - return ( + /*return ( + ); */ + + return ( + + + ); } diff --git a/src/Screens/Device/modals/EditActions/Lights/index.js b/src/Screens/Device/modals/EditActions/Lights/index.js index 946645f..ada6a71 100644 --- a/src/Screens/Device/modals/EditActions/Lights/index.js +++ b/src/Screens/Device/modals/EditActions/Lights/index.js @@ -131,7 +131,7 @@ export default function LightsEditActionModalContent({ navigation, route }) { - + - +