Merge branch 'master' into privacywidget

This commit is contained in:
marcosrdz 2020-12-19 15:29:32 -05:00
commit 3ac191d1b5
2 changed files with 36 additions and 11 deletions

View file

@ -232,7 +232,8 @@
"about_review": "Leave us a review", "about_review": "Leave us a review",
"about_selftest": "Run self-test", "about_selftest": "Run self-test",
"about_sm_github": "GitHub", "about_sm_github": "GitHub",
"about_sm_telegram": "Telegram chat", "about_sm_discord": "Discord Server",
"about_sm_telegram": "Telegram channel",
"about_sm_twitter": "Follow us on Twitter", "about_sm_twitter": "Follow us on Twitter",
"advanced_options": "Advanced Options", "advanced_options": "Advanced Options",
"currency": "Currency", "currency": "Currency",

View file

@ -1,5 +1,5 @@
import React from 'react'; import React from 'react';
import { ScrollView, Linking, Image, View, Text, StyleSheet, useWindowDimensions } from 'react-native'; import { TouchableOpacity, ScrollView, Linking, Image, View, Text, StyleSheet, useWindowDimensions } from 'react-native';
import { useNavigation, useTheme } from '@react-navigation/native'; import { useNavigation, useTheme } from '@react-navigation/native';
import { import {
BlueTextCentered, BlueTextCentered,
@ -10,6 +10,7 @@ import {
BlueListItem, BlueListItem,
BlueNavigationStyle, BlueNavigationStyle,
} from '../../BlueComponents'; } from '../../BlueComponents';
import { Icon } from 'react-native-elements';
import { getApplicationName, getVersion, getBundleId, getBuildNumber } from 'react-native-device-info'; import { getApplicationName, getVersion, getBundleId, getBuildNumber } from 'react-native-device-info';
import Rate, { AndroidMarket } from 'react-native-rate'; import Rate, { AndroidMarket } from 'react-native-rate';
import loc from '../../loc'; import loc from '../../loc';
@ -53,6 +54,18 @@ const About = () => {
paddingTop: 0, paddingTop: 0,
borderRadius: 8, borderRadius: 8,
}, },
buttonLink :{
backgroundColor: colors.lightButton,
borderRadius: 12,
justifyContent: 'center',
padding: 8,
flexDirection: 'row',
},
textLink :{
color: colors.foregroundColor,
marginLeft: 8,
fontWeight: '600',
},
}); });
const handleOnReleaseNotesPress = () => { const handleOnReleaseNotesPress = () => {
@ -71,14 +84,16 @@ const About = () => {
Linking.openURL('https://twitter.com/bluewalletio'); Linking.openURL('https://twitter.com/bluewalletio');
}; };
const handleOnGithubPress = () => { const handleOnDiscordPress = () => {
Linking.openURL('https://github.com/BlueWallet/BlueWallet'); Linking.openURL('https://discord.gg/btWq2Aby2z');
}; };
const handleOnTelegramPress = () => { const handleOnTelegramPress = () => {
Linking.openURL('https://t.me/bluewallet'); Linking.openURL('https://t.me/bluewallethat');
};
const handleOnGithubPress = () => {
Linking.openURL('https://github.com/BlueWallet/BlueWallet');
}; };
const handleOnRatePress = () => { const handleOnRatePress = () => {
const options = { const options = {
AppleAppID: '1376878040', AppleAppID: '1376878040',
@ -126,12 +141,12 @@ const About = () => {
/> />
<BlueListItem <BlueListItem
leftIcon={{ leftIcon={{
name: 'github', name: 'discord',
type: 'font-awesome', type: 'font-awesome-5',
color: colors.foregroundColor, color: '#7289da',
}} }}
onPress={handleOnGithubPress} onPress={handleOnDiscordPress}
title={loc.settings.about_sm_github} title={loc.settings.about_sm_discord}
/> />
<BlueCard> <BlueCard>
<View style={styles.buildWith}> <View style={styles.buildWith}>
@ -143,6 +158,15 @@ const About = () => {
<BlueTextCentered>bitcoinjs-lib</BlueTextCentered> <BlueTextCentered>bitcoinjs-lib</BlueTextCentered>
<BlueTextCentered>Nodejs</BlueTextCentered> <BlueTextCentered>Nodejs</BlueTextCentered>
<BlueTextCentered>Electrum server</BlueTextCentered> <BlueTextCentered>Electrum server</BlueTextCentered>
<BlueSpacing20 />
<TouchableOpacity
onPress={handleOnGithubPress}
style={styles.buttonLink}
>
<Icon size={22} name="github" type="font-awesome-5" color={colors.foregroundColor} />
<Text style={styles.textLink}>{loc.settings.about_sm_github}</Text>
</TouchableOpacity>
</View> </View>
</BlueCard> </BlueCard>
<BlueListItem <BlueListItem