Skip to content

Remove direct react-navigation-tabs dependency. #4114

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

Closed
wants to merge 2 commits into from
Closed

Remove direct react-navigation-tabs dependency. #4114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b86d2bf
MainTabs [nfc]: Prepare for and explain some FlowFixMes.
chrisbobbe May 15, 2020
31b59f0
deps: Remove `react-navigation-tabs`.
chrisbobbe May 15, 2020
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
178 changes: 0 additions & 178 deletions flow-typed/npm/react-navigation-tabs_vx.x.x.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
"react-native-webview": "~10.0.0",
"react-navigation": "^2.18.3",
"react-navigation-redux-helpers": "^2.0.9",
"react-navigation-tabs": "0.8.4",
"react-redux": "^5.0.7",
"redux": "^4.0.0",
"redux-action-buffer": "^1.2.0",
Expand Down
8 changes: 7 additions & 1 deletion src/main/MainTabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* @flow strict-local */
import React from 'react';
import { Platform } from 'react-native';
import { createBottomTabNavigator } from 'react-navigation-tabs';
import { createBottomTabNavigator } from 'react-navigation';

import type { TabNavigationOptionsPropsType } from '../types';
import tabsOptions from '../styles/tabs';
Expand All @@ -17,6 +17,7 @@ import ProfileCard from '../account-info/ProfileCard';
export default createBottomTabNavigator(
{
home: {
// $FlowFixMe `navigationOptions` property on component type
screen: HomeTab,
navigationOptions: {
tabBarLabel: 'Home',
Expand All @@ -26,6 +27,8 @@ export default createBottomTabNavigator(
},
},
streams: {
// No fixme needed; StreamTabs is a navigator from
// `createMaterialTopTabNavigator`.
screen: StreamTabs,
navigationOptions: {
tabBarLabel: 'Streams',
Expand All @@ -35,6 +38,7 @@ export default createBottomTabNavigator(
},
},
conversations: {
// $FlowFixMe `navigationOptions` property on component type
screen: PmConversationsCard,
navigationOptions: {
tabBarLabel: 'Conversations',
Expand All @@ -44,6 +48,7 @@ export default createBottomTabNavigator(
},
},
settings: {
// $FlowFixMe `navigationOptions` property on component type
screen: SettingsCard,
navigationOptions: {
tabBarLabel: 'Settings',
Expand All @@ -53,6 +58,7 @@ export default createBottomTabNavigator(
},
},
profile: {
// $FlowFixMe `navigationOptions` property on component type
screen: ProfileCard,
navigationOptions: {
tabBarLabel: 'Profile',
Expand Down
4 changes: 3 additions & 1 deletion src/main/StreamTabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import React from 'react';
import { Text } from 'react-native';
import { FormattedMessage } from 'react-intl';
import { createMaterialTopTabNavigator } from 'react-navigation-tabs';
import { createMaterialTopTabNavigator } from 'react-navigation';

import type { TabNavigationOptionsPropsType } from '../types';
import { createStyleSheet } from '../styles';
Expand All @@ -20,6 +20,7 @@ const styles = createStyleSheet({
export default createMaterialTopTabNavigator(
{
subscribed: {
// $FlowFixMe `navigationOptions` property on component type
screen: SubscriptionsCard,
navigationOptions: {
tabBarLabel: (props: TabNavigationOptionsPropsType) => (
Expand All @@ -30,6 +31,7 @@ export default createMaterialTopTabNavigator(
},
},
allStreams: {
// $FlowFixMe `navigationOptions` property on component type
screen: StreamListCard,
navigationOptions: {
tabBarLabel: (props: TabNavigationOptionsPropsType) => (
Expand Down