mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-23 15:20:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

REF: ScanQRCode moved to its own stack nav

Browse source
This commit is contained in:
marcosrdz 2020-05-24 21:04:04 -04:00
parent f7af083254
commit fd3d54d044
2 changed files with 57 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
MainBottomTabs.js
View file

@ -58,6 +58,12 @@ const ReorderWalletsStackNavigator = createStackNavigator({
},
});
const ScanQRCodeStackNavigator = createStackNavigator({
ScanQRCode: {
screen: ScanQRCode,
},
});
const WalletsStackNavigator = createStackNavigator(
{
Wallets: {
@ -283,7 +289,10 @@ const HandleOffchainAndOnChainStackNavigator = createStackNavigator(
},
},
ScanQRCode: {
screen: ScanQRCode,
screen: ScanQRCodeStackNavigator,
navigationOptions: {
header: null,
},
},
SendDetails: {
screen: CreateTransactionStackNavigator,
@ -352,7 +361,10 @@ const MainBottomTabs = createStackNavigator(
},
},
ScanQRCode: {
screen: ScanQRCode,
screen: ScanQRCodeStackNavigator,
navigationOptions: {
header: null,
},
},
LappBrowser: {
screen: LappBrowser,

87
screen/send/ScanQRCode.js
View file

@ -11,7 +11,6 @@ const LocalQRCode = require('@remobile/react-native-qrcode-local-image');
const createHash = require('create-hash');
const ScanQRCode = () => {
const showCloseButton = useNavigationParam('showCloseButton') || true;
const showFileImportButton = useNavigationParam('showFileImportButton') || false;
const [isLoading, setIsLoading] = useState(false);
const { navigate } = useNavigation();
@ -38,7 +37,7 @@ const ScanQRCode = () => {
if (!isLoading) {
setIsLoading(true);
try {
if (showCloseButton && launchedBy) {
if (launchedBy) {
navigate(launchedBy);
}
if (ret.additionalProperties) {
@ -77,6 +76,32 @@ const ScanQRCode = () => {
setIsLoading(false);
};
const showImagePicker = () => {
if (!isLoading) {
setIsLoading(true);
ImagePicker.launchImageLibrary(
{
title: null,
mediaType: 'photo',
takePhotoButtonTitle: null,
},
response => {
if (response.uri) {
const uri = Platform.OS === 'ios' ? response.uri.toString().replace('file://', '') : response.path.toString();
LocalQRCode.decode(uri, (error, result) => {
if (!error) {
onBarCodeRead({ data: result });
} else {
alert('The selected image does not contain a QR Code.');
}
});
}
setIsLoading(false);
},
);
}
};
const dismiss = () => {
navigate(launchedBy);
};
@ -97,23 +122,21 @@ const ScanQRCode = () => {
barCodeTypes={[RNCamera.Constants.BarCodeType.qr]}
/>
)}
{showCloseButton && (
<TouchableOpacity
style={{
width: 40,
height: 40,
backgroundColor: 'rgba(0,0,0,0.4)',
justifyContent: 'center',
borderRadius: 20,
position: 'absolute',
right: 16,
top: 44,
}}
onPress={dismiss}
>
<Image style={{ alignSelf: 'center' }} source={require('../../img/close-white.png')} />
</TouchableOpacity>
)}
<TouchableOpacity
style={{
width: 40,
height: 40,
backgroundColor: 'rgba(0,0,0,0.4)',
justifyContent: 'center',
borderRadius: 20,
position: 'absolute',
right: 16,
top: 44,
}}
onPress={dismiss}
>
<Image style={{ alignSelf: 'center' }} source={require('../../img/close-white.png')} />
</TouchableOpacity>
<TouchableOpacity
style={{
width: 40,
@ -125,31 +148,7 @@ const ScanQRCode = () => {
left: 24,
bottom: 48,
}}
onPress={() => {
if (!isLoading) {
setIsLoading(true);
ImagePicker.launchImageLibrary(
{
title: null,
mediaType: 'photo',
takePhotoButtonTitle: null,
},
response => {
if (response.uri) {
const uri = Platform.OS === 'ios' ? response.uri.toString().replace('file://', '') : response.path.toString();
LocalQRCode.decode(uri, (error, result) => {
if (!error) {
onBarCodeRead({ data: result });
} else {
alert('The selected image does not contain a QR Code.');
}
});
}
setIsLoading(false);
},
);
}
}}
onPress={showImagePicker}
>
<Icon name="image" type="font-awesome" color="#ffffff" />
</TouchableOpacity>