From b0804b9159f269fc3b0ccb4198455cbddd96cba1 Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Wed, 4 Aug 2021 10:15:23 -0700 Subject: Swap buttons, Add styles --- src/components/camera/FlashButton.tsx | 78 +++++++++++++++++++++++------------ src/components/camera/styles.tsx | 16 ++++--- 2 files changed, 62 insertions(+), 32 deletions(-) diff --git a/src/components/camera/FlashButton.tsx b/src/components/camera/FlashButton.tsx index 06a4e44e..f7791d5b 100644 --- a/src/components/camera/FlashButton.tsx +++ b/src/components/camera/FlashButton.tsx @@ -1,8 +1,10 @@ -import React, {Dispatch, SetStateAction} from 'react'; -import {Text, TouchableOpacity} from 'react-native'; +import {BlurView} from '@react-native-community/blur'; +import React, {Dispatch, SetStateAction, useMemo} from 'react'; +import {Text, TouchableOpacity, View} from 'react-native'; import {FlashMode} from 'react-native-camera'; -import FlashOffIcon from '../../assets/icons/camera/flash-off.svg'; -import FlashOnIcon from '../../assets/icons/camera/flash-on.svg'; +import {normalize} from 'react-native-elements'; +import FlashOnIcon from '../../assets/icons/camera/flash-off.svg'; +import FlashOffIcon from '../../assets/icons/camera/flash-on.svg'; import {styles} from './styles'; interface FlashButtonProps { @@ -16,27 +18,51 @@ interface FlashButtonProps { export const FlashButton: React.FC = ({ flashMode, setFlashMode, -}) => ( - setFlashMode(flashMode === 'on' ? 'off' : 'on')} - style={styles.flashButtonContainer}> - {flashMode === 'on' ? ( - - ) : ( - - )} - Flash - -); +}) => { + return useMemo( + () => ( + <> + + setFlashMode(flashMode === 'on' ? 'off' : 'on')} + style={[styles.flashButtonContainerBackground]}> + + {flashMode === 'off' ? ( + + ) : ( + + )} + Flash + + + + ), + [flashMode], + ); +}; export default FlashButton; diff --git a/src/components/camera/styles.tsx b/src/components/camera/styles.tsx index 33b47cc4..beae7082 100644 --- a/src/components/camera/styles.tsx +++ b/src/components/camera/styles.tsx @@ -18,9 +18,16 @@ export const styles = StyleSheet.create({ zIndex: 999, }, flashButtonContainer: { + zIndex: 3, + height: 86, + width: 49, + flexDirection: 'column', + justifyContent: 'center', + alignItems: 'center', + borderRadius: 30, + }, + flashButtonContainerBackground: { position: 'absolute', - backgroundColor: '#808080', - opacity: 0.25, zIndex: 1, top: normalize(50), right: 0, @@ -30,7 +37,7 @@ export const styles = StyleSheet.create({ flexDirection: 'column', justifyContent: 'center', alignItems: 'center', - borderRadius: 30, + borderRadius: 50, }, galleryIcon: { borderWidth: 2, @@ -47,7 +54,4 @@ export const styles = StyleSheet.create({ height: 40, backgroundColor: 'grey', }, - flashIcon: { - zIndex: 2, - }, }); -- cgit v1.2.3-70-g09d2