Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvement: shareable SimpleWebView #604

Merged
merged 4 commits into from
Apr 12, 2019
Merged

Improvement: shareable SimpleWebView #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1ee3ce
make shareable simple web view
estebanmino Apr 11, 2019
0a62440
test
estebanmino Apr 11, 2019
125aae1
check for navigation
estebanmino Apr 11, 2019
29134cb
update ios
estebanmino Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions app/components/UI/Navbar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { Text, Platform, TouchableOpacity, View, StyleSheet, Image, Keyboard } f
import { fontStyles, colors } from '../../../styles/common';
import IonicIcon from 'react-native-vector-icons/Ionicons';
import AntIcon from 'react-native-vector-icons/AntDesign';
import EvilIcons from 'react-native-vector-icons/EvilIcons';
import MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons';
import URL from 'url-parse';
import { strings } from '../../../../locales/i18n';
import AppConstants from '../../../core/AppConstants';
Expand All @@ -33,6 +35,12 @@ const styles = StyleSheet.create({
backIcon: {
color: colors.primary
},
backIconIOS: {
marginHorizontal: 5
},
shareIconIOS: {
marginHorizontal: -5
},
backButton: {
paddingLeft: Platform.OS === 'android' ? 22 : 18,
paddingRight: Platform.OS === 'android' ? 22 : 18,
Expand Down Expand Up @@ -375,6 +383,9 @@ export function getNetworkNavbarOptions(title, translate, navigation) {
*/
export function getWebviewNavbar(navigation) {
const title = navigation.getParam('title', '');
const share = navigation.getParam('dispatch', () => {
'';
});
return {
title,
headerTitleStyle: {
Expand All @@ -389,16 +400,22 @@ export function getWebviewNavbar(navigation) {
<IonicIcon name={'md-arrow-back'} size={24} style={styles.backIcon} />
</TouchableOpacity>
) : (
<View />
// eslint-disable-next-line react/jsx-no-bind
<TouchableOpacity onPress={() => navigation.pop()} style={styles.backButton}>
<IonicIcon name="ios-close" size={38} style={[styles.backIcon, styles.backIconIOS]} />
</TouchableOpacity>
),
headerRight:
Platform.OS === 'ios' ? (
Platform.OS === 'android' ? (
// eslint-disable-next-line react/jsx-no-bind
<TouchableOpacity onPress={() => navigation.pop()} style={styles.backButton}>
<IonicIcon name="ios-close" size={38} style={styles.closeIcon} />
<TouchableOpacity onPress={() => share()} style={styles.backButton}>
<MaterialCommunityIcon name="share-variant" size={24} style={styles.backIcon} />
</TouchableOpacity>
) : (
<View />
// eslint-disable-next-line react/jsx-no-bind
<TouchableOpacity onPress={() => share()} style={styles.backButton}>
<EvilIcons name="share-apple" size={32} style={[styles.backIcon, styles.shareIconIOS]} />
</TouchableOpacity>
)
};
}
17 changes: 17 additions & 0 deletions app/components/Views/SimpleWebview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Web3Webview from 'react-native-web3-webview';
import { getWebviewNavbar } from '../../UI/Navbar';
import Share from 'react-native-share'; // eslint-disable-line import/default
import Logger from '../../../util/Logger';

export default class SimpleWebview extends Component {
static navigationOptions = ({ navigation }) => getWebviewNavbar(navigation);
Expand All @@ -13,6 +15,21 @@ export default class SimpleWebview extends Component {
navigation: PropTypes.object
};

componentDidMount = () => {
const { navigation } = this.props;
navigation && navigation.setParams({ dispatch: this.share });
};

share = () => {
const { navigation } = this.props;
const uri = navigation && navigation.getParam('url', 'about:blank');
Share.open({
url: uri
}).catch(err => {
Logger.log('Error while trying to share simple web view', err);
});
};

render() {
const uri = this.props.navigation.getParam('url', 'about:blank');
return <Web3Webview source={{ uri }} />;
Expand Down
9 changes: 8 additions & 1 deletion app/components/Views/SimpleWebview/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@ import SimpleWebview from './';
describe('SimpleWebview', () => {
it('should render correctly', () => {
const wrapper = shallow(
<SimpleWebview navigation={{ getParam: () => ({ url: 'https://etherscan.io', title: 'etherscan' }) }} />
<SimpleWebview
navigation={{
getParam: () => ({ url: 'https://etherscan.io', title: 'etherscan' }),
setParams: () => {
'';
}
}}
/>
);
expect(wrapper).toMatchSnapshot();
});
Expand Down