LBRYCommunity/lbry-fdroid
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #164 from lbryio/navigation-tweaks

Browse source 
set the unique navigation keys for the file pages to the URIs.
This commit is contained in:
Akinwale Ariwodola 2018-06-06 09:29:24 +01:00 committed by GitHub
commit 51d86148e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/component/AppNavigator.js
View file

@ -193,7 +193,7 @@ class AppWithNavigationState extends React.Component {
if (evt.url) {
const navigateAction = NavigationActions.navigate({
routeName: 'File',
key: 'filePage',
key: evt.url,
params: { uri: evt.url }
});
dispatch(navigateAction);

2
app/src/component/fileItem/view.js
View file

@ -61,7 +61,7 @@ class FileItem extends React.PureComponent {
if (NativeModules.Mixpanel) {
NativeModules.Mixpanel.track('Discover Tap', { Uri: uri });
}
navigation.navigate({ routeName: 'File', key: 'filePage', params: { uri } });
navigation.navigate({ routeName: 'File', key: uri, params: { uri } });
}
}>
<FileItemMedia title={title} thumbnail={thumbnail} blurRadius={obscureNsfw ? 15 : 0} resizeMode="cover" />

2
app/src/component/transactionList/internal/transaction-list-item.js
View file

@ -25,7 +25,7 @@ class TransactionListItem extends React.PureComponent {
style={transactionListStyle.link}
onPress={() => navigation && navigation.navigate({
routeName: 'File',
key: 'filePage',
key: evt.Url,
params: { uri: buildURI({ claimName: name, claimId }) }})
}
text={name} />

10
app/src/component/uriBar/view.js
View file

@ -1,6 +1,6 @@
// @flow
import React from 'react';
import { SEARCH_TYPES, isNameValid, normalizeURI } from 'lbry-redux';
import { SEARCH_TYPES, isNameValid, isURIValid, normalizeURI } from 'lbry-redux';
import { FlatList, Keyboard, TextInput, View } from 'react-native';
import UriBarItem from './internal/uri-bar-item';
import uriBarStyle from '../../styles/uriBar';
@ -52,7 +52,8 @@ class UriBar extends React.PureComponent {
if (SEARCH_TYPES.SEARCH === type) {
navigation.navigate({ routeName: 'Search', key: 'searchPage', params: { searchQuery: value }});
} else {
navigation.navigate({ routeName: 'File', key: 'filePage', params: { uri: normalizeURI(value) }});
const uri = normalizeURI(value);
navigation.navigate({ routeName: 'File', key: uri, params: { uri }});
}
}
@ -104,8 +105,9 @@ class UriBar extends React.PureComponent {
onSubmitEditing={() => {
if (this.state.inputText) {
let inputText = this.state.inputText;
if (isNameValid(inputText)) {
navigation.navigate({ routeName: 'File', key: 'filePage', params: { uri: normalizeURI(inputText) }});
if (isNameValid(inputText) || isURIValid(inputText)) {
const uri = normalizeURI(inputText);
navigation.navigate({ routeName: 'File', key: uri, params: { uri }});
} else {
// Open the search page with the query populated
navigation.navigate({ routeName: 'Search', key: 'searchPage', params: { searchQuery: inputText }});

2
app/src/page/splash/view.js
View file

@ -54,7 +54,7 @@ class SplashScreen extends React.PureComponent {
navigation.dispatch(resetAction);
if (this.state.launchUrl) {
navigation.navigate({ routeName: 'File', key: 'filePage', params: { uri: this.state.launchUrl } });
navigation.navigate({ routeName: 'File', key: this.state.launchUrl, params: { uri: this.state.launchUrl } });
}
});
return;