Skip to content

Commit

Permalink
fix(rn): use navigate instead of push to prevent double tap
Browse files Browse the repository at this point in the history 
Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
  • Loading branch information
@90dy
90dy committed Jan 7, 2019
1 parent 0e2b698 commit 6cc6e3b
Show file tree
Hide file tree
Showing 15 changed files with 43 additions and 41 deletions.
2 changes: 1 addition & 1 deletion client/react-native/common/components/Library/ContactList.js
View file
Expand Up @@ -36,7 +36,7 @@ export default class ContactList extends PureComponent {
id={data.item.id}
title={data.item.overrideDisplayName || data.item.displayName}
subtitle={subtitle}
onPress={() => navigation.push(action, { id: data.item.id })}
onPress={() => navigation.navigate(action, { id: data.item.id })}
separators={data.separators}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion client/react-native/common/components/Screens/Chats/Detail.js
View file
Expand Up @@ -277,7 +277,7 @@ export default class Detail extends PureComponent {
title={utils.getTitle(navigation.getParam('conversation'))}
rightBtnIcon='settings'
onPressRightBtn={() =>
navigation.push('chats/settings', {
navigation.navigate('chats/settings', {
conversation: navigation.getParam('conversation'),
})
}
Expand Down
6 changes: 4 additions & 2 deletions client/react-native/common/components/Screens/Chats/List.js
View file
Expand Up @@ -23,7 +23,9 @@ const ItemBase = fragments.Conversation(({ data, navigation, t }) => {
return (
<Flex.Cols
align='center'
onPress={() => navigation.push('chats/detail', { conversation: data })}
onPress={() =>
navigation.navigate('chats/detail', { conversation: data })
}
style={[{ height: 72 }, padding, borderBottom]}
>
<Flex.Rows size={1} align='center'>
Expand Down Expand Up @@ -58,7 +60,7 @@ export default class ListScreen extends PureComponent {
searchBar
searchHandler={navigation.getParam('searchHandler')} // Placeholder
onPressRightBtn={() =>
navigation.push('chats/add', {
navigation.navigate('chats/add', {
goBack: () => {
navigation.goBack(null)
const retry = navigation.getParam('retry')
Expand Down
4 changes: 2 additions & 2 deletions client/react-native/common/components/Screens/Chats/Settings/List.js
View file
Expand Up @@ -126,7 +126,7 @@ class List extends PureComponent {
icon='bell'
title={t('chats.notifications')}
onPress={() =>
navigation.push('chats/settings/notifications')
navigation.navigate('chats/settings/notifications')
}
/>
<Menu.Item
Expand All @@ -153,7 +153,7 @@ class List extends PureComponent {
title={t('chats.add-members')}
color={colors.blue}
onPress={() =>
this.props.navigation.push('chats/add', {
this.props.navigation.navigate('chats/add', {
onSubmit: this.addMembers,
})
}
Expand Down
4 changes: 2 additions & 2 deletions client/react-native/common/components/Screens/Contacts/Detail/Detail.js
View file
Expand Up @@ -14,7 +14,7 @@ class Detail extends PureComponent {
title={I18n.t('contacts.details')}
rightBtnIcon={'edit-2'}
onPressRightBtn={() =>
navigation.push('detail/edit', {
navigation.navigate('detail/edit', {
contact: navigation.getParam('contact'),
})
}
Expand Down Expand Up @@ -106,7 +106,7 @@ class Detail extends PureComponent {
icon='eye'
title={t('contacts.view-pub-key')}
onPress={() =>
navigation.push('modal/contacts/card', {
navigation.navigate('modal/contacts/card', {
data: {
...contact,
id: extractPublicKeyFromId(contact.id),
Expand Down
2 changes: 1 addition & 1 deletion client/react-native/common/components/Screens/Contacts/List/index.js
View file
Expand Up @@ -60,7 +60,7 @@ export default class ContactList extends PureComponent {
title={I18n.t('contacts.title')}
titleIcon='feather-users'
rightBtnIcon='user-plus'
onPressRightBtn={() => navigation.push('contacts/add')}
onPressRightBtn={() => navigation.navigate('contacts/add')}
/>
),
tabBarVisible: true,
Expand Down
4 changes: 2 additions & 2 deletions client/react-native/common/components/Screens/Settings/About/List.js
View file
Expand Up @@ -40,14 +40,14 @@ class List extends PureComponent {
<Menu.Item
icon='check-circle'
title={t('settings.changelog')}
onPress={() => navigation.push('about/changelog')}
onPress={() => navigation.navigate('about/changelog')}
/>
</Menu.Section>
<Menu.Section>
<Menu.Item
icon='info'
title={t('settings.learn-more')}
onPress={() => navigation.push('about/more')}
onPress={() => navigation.navigate('about/more')}
/>
</Menu.Section>
</Menu>
Expand Down
4 changes: 2 additions & 2 deletions client/react-native/common/components/Screens/Settings/Devtools/EventList.js
View file
Expand Up @@ -20,7 +20,7 @@ import Button from '../../../Library/Button'
const Item = fragments.Event(({ data, navigation }) => (
<TouchableOpacity
onPress={() => {
navigation.push('devtools/eventdetails', { details: data })
navigation.navigate('devtools/eventdetails', { details: data })
}}
style={[
{
Expand Down Expand Up @@ -136,7 +136,7 @@ export default class EventList extends PureComponent {
middle
large
onPress={() =>
navigation.push('modal/devtools/event/list/filters', {
navigation.navigate('modal/devtools/event/list/filters', {
defaultData: navigation.getParam('filters'),
onSave: filters => navigation.setParams({ filters }),
})
Expand Down
14 changes: 7 additions & 7 deletions client/react-native/common/components/Screens/Settings/Devtools/List.js
View file
Expand Up @@ -218,7 +218,7 @@ export default class List extends PureComponent {
<Menu.Item
icon='info'
title='Device infos'
onPress={() => navigation.push('devtools/deviceinfos')}
onPress={() => navigation.navigate('devtools/deviceinfos')}
/>
</Menu.Section>
<Menu.Section>
Expand All @@ -239,7 +239,7 @@ export default class List extends PureComponent {
<Menu.Item
icon='globe'
title='Language'
onPress={() => navigation.push('devtools/language')}
onPress={() => navigation.navigate('devtools/language')}
/>
<Menu.Item
icon='refresh-ccw'
Expand Down Expand Up @@ -269,7 +269,7 @@ export default class List extends PureComponent {
<Menu.Item
icon='list'
title='List events'
onPress={() => navigation.push('devtools/eventlist')}
onPress={() => navigation.navigate('devtools/eventlist')}
/>
</Menu.Section>
<Menu.Section>
Expand Down Expand Up @@ -297,7 +297,7 @@ export default class List extends PureComponent {
<Menu.Item
icon='file-text'
title='Console logs'
onPress={() => navigation.push('devtools/logs')}
onPress={() => navigation.navigate('devtools/logs')}
/>
)}
{Platform.OS === 'android' && (
Expand All @@ -311,17 +311,17 @@ export default class List extends PureComponent {
<Menu.Item
icon='database'
title='Database'
onPress={() => navigation.push('devtools/database')}
onPress={() => navigation.navigate('devtools/database')}
/>
<Menu.Item
icon='activity'
title='Network'
onPress={() => navigation.push('devtools/network')}
onPress={() => navigation.navigate('devtools/network')}
/>
<Menu.Item
icon='check-circle'
title='Integration tests'
onPress={() => navigation.push('devtools/tests')}
onPress={() => navigation.navigate('devtools/tests')}
/>
</Menu.Section>
</Menu>
Expand Down
2 changes: 1 addition & 1 deletion client/react-native/common/components/Screens/Settings/Devtools/Logs.js
View file
Expand Up @@ -349,7 +349,7 @@ class LogStream extends PureComponent {
onPressRightBtn={() => {
if (!antispamModalOpen) {
antispamModalOpen = true
navigation.push('devtools/logs/filter', {
navigation.navigate('devtools/logs/filter', {
updateConfig: navigation.state.params.updateConfig,
currentConfig: navigation.state.params.currentConfig,
})
Expand Down
4 changes: 2 additions & 2 deletions client/react-native/common/components/Screens/Settings/Devtools/Network/Network.js
View file
Expand Up @@ -22,7 +22,7 @@ export default class Network extends PureComponent {
icon='list'
title='List peers'
onPress={() => {
navigation.push('network/peers')
navigation.navigate('network/peers')
}}
/>
</Menu.Section>
Expand All @@ -32,7 +32,7 @@ export default class Network extends PureComponent {
icon='sliders'
title='Network configuration'
onPress={() => {
navigation.push('network/config')
navigation.navigate('network/config')
}}
/>
</Menu.Section>
Expand Down
2 changes: 1 addition & 1 deletion client/react-native/common/components/Screens/Settings/Devtools/Tests.js
View file
Expand Up @@ -90,7 +90,7 @@ export default class Tests extends PureComponent {
const obs = new Observable()

try {
this.props.navigation.push('devtools/testresult', {
this.props.navigation.navigate('devtools/testresult', {
result: promise,
title: title,
resultObserver: obs,
Expand Down
4 changes: 2 additions & 2 deletions client/react-native/common/components/Screens/Settings/Help/List.js
View file
Expand Up @@ -24,14 +24,14 @@ class List extends PureComponent {
<Menu.Item
icon='book-open'
title={t('settings.faq')}
onPress={() => navigation.push('help/faq')}
onPress={() => navigation.navigate('help/faq')}
/>
</Menu.Section>
<Menu.Section>
<Menu.Item
icon='message-circle'
title={t('settings.contact-us')}
onPress={() => navigation.push('help/contact')}
onPress={() => navigation.navigate('help/contact')}
/>
</Menu.Section>
</Menu>
Expand Down
8 changes: 4 additions & 4 deletions client/react-native/common/components/Screens/Settings/Legal/List.js
View file
Expand Up @@ -24,24 +24,24 @@ class List extends PureComponent {
<Menu.Item
icon='book-open'
title={t('settings.privacy-policy')}
onPress={() => navigation.push('legal/privacy')}
onPress={() => navigation.navigate('legal/privacy')}
/>
<Menu.Item
icon='book-open'
title={t('settings.terms-of-service')}
onPress={() => navigation.push('legal/terms')}
onPress={() => navigation.navigate('legal/terms')}
/>
</Menu.Section>
<Menu.Section>
<Menu.Item
icon='layers'
title={t('settings.app-credits')}
onPress={() => navigation.push('legal/credits')}
onPress={() => navigation.navigate('legal/credits')}
/>
<Menu.Item
icon='layers'
title={t('settings.software-license')}
onPress={() => navigation.push('legal/license')}
onPress={() => navigation.navigate('legal/license')}
/>
</Menu.Section>
</Menu>
Expand Down
22 changes: 11 additions & 11 deletions client/react-native/common/components/Screens/Settings/List.js
View file
Expand Up @@ -31,14 +31,14 @@ class List extends PureComponent {
<Menu.Item
icon='user'
title={t('settings.my-account')}
onPress={() => navigation.push('settings/my-account', {})
onPress={() => navigation.navigate('settings/my-account', {})
}
/>
<Menu.Item
icon='share'
title={t('settings.my-account-share')}
onPress={() =>
navigation.push('modal/contacts/card', {
navigation.navigate('modal/contacts/card', {
data: {
...data,
id: extractPublicKeyFromId(id),
Expand All @@ -58,55 +58,55 @@ class List extends PureComponent {
<Menu.Item
icon='arrow-up-circle'
title={t('settings.updates-check')}
onPress={() => navigation.push('settings/update')}
onPress={() => navigation.navigate('settings/update')}
/>
</Menu.Section>
<Menu.Section>
<Menu.Item
icon='terminal'
title={t('settings.dev-tools')}
onPress={() => navigation.push('settings/devtools')}
onPress={() => navigation.navigate('settings/devtools')}
/>
</Menu.Section>
<Menu.Section>
<Menu.Item
icon='lock'
title={t('settings.security-privacy')}
onPress={() => navigation.push('settings/security-and-privacy')}
onPress={() => navigation.navigate('settings/security-and-privacy')}
/>
<Menu.Item
icon='send'
title={t('settings.messages')}
onPress={() => navigation.push('settings/messages-settings')}
onPress={() => navigation.navigate('settings/messages-settings')}
/>
<Menu.Item
icon='bell'
title={t('settings.notifications')}
onPress={() => navigation.push('settings/notifications')}
onPress={() => navigation.navigate('settings/notifications')}
/>
</Menu.Section>
<Menu.Section>
<Menu.Item
icon='info'
title={t('settings.about')}
onPress={() => navigation.push('settings/about')}
onPress={() => navigation.navigate('settings/about')}
/>
<Menu.Item
icon='activity'
title={t('settings.news')}
onPress={() => navigation.push('settings/news')}
onPress={() => navigation.navigate('settings/news')}
/>
</Menu.Section>
<Menu.Section>
<Menu.Item
icon='life-buoy'
title={t('settings.help')}
onPress={() => navigation.push('settings/help')}
onPress={() => navigation.navigate('settings/help')}
/>
<Menu.Item
icon='layers'
title={t('settings.legal')}
onPress={() => navigation.push('settings/legal')}
onPress={() => navigation.navigate('settings/legal')}
/>
</Menu.Section>
</Menu>
Expand Down

0 comments on commit 6cc6e3b

Please sign in to comment.