diff --git a/package-lock.json b/package-lock.json index 541af72..f842ede 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5423,6 +5423,16 @@ "resolved": "https://registry.npmjs.org/@react-native-community/masked-view/-/masked-view-0.1.5.tgz", "integrity": "sha512-Lj1DzfCmW0f4HnmHtEuX8Yy2f7cnUA8r5KGGUuDDGtQt1so6QJkKeUmsnLo2zYDtsF8due6hvIL06Vdo5xxuLQ==" }, + "@react-navigation/bottom-tabs": { + "version": "5.0.0-alpha.34", + "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-5.0.0-alpha.34.tgz", + "integrity": "sha512-LlcPPQVQudQ2dI2ZqCr944X+60LFxmMWRlAxJLbdC8p3Lk0/GrLeKYbRXSHReSCrohmV1bK/DogkBiTjhTTKQg==", + "requires": { + "@react-navigation/routers": "^5.0.0-alpha.22", + "color": "^3.1.2", + "react-native-iphone-x-helper": "^1.2.1" + } + }, "@react-navigation/native": { "version": "5.0.0-alpha.27", "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-5.0.0-alpha.27.tgz", diff --git a/package.json b/package.json index 0a513a9..2f9a90b 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "dependencies": { "@expo/vector-icons": "^10.0.6", "@react-native-community/masked-view": "0.1.5", + "@react-navigation/bottom-tabs": "^5.0.0-alpha.34", "@react-navigation/native": "^5.0.0-alpha.27", "@react-navigation/stack": "^5.0.0-alpha.58", "axios": "^0.19.1", diff --git a/src/navigation/Home/index.js b/src/navigation/Home/index.js index a2a4a96..6f46628 100644 --- a/src/navigation/Home/index.js +++ b/src/navigation/Home/index.js @@ -30,7 +30,7 @@ const HomeNavigator = () => ( const HomeIcon = { tabBarIcon: ({ tintColor }) => ( - + ), }; diff --git a/src/navigation/RootNavigator.js b/src/navigation/RootNavigator.js index 872fe40..c49404d 100644 --- a/src/navigation/RootNavigator.js +++ b/src/navigation/RootNavigator.js @@ -1,32 +1,18 @@ import React from 'react'; import { NavigationNativeContainer } from '@react-navigation/native'; +import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'; import { createStackNavigator } from '@react-navigation/stack'; -import { HomeNavigator, HomeIcon } from './Home'; import { colors } from '../components/common/theme'; -const Stack = createStackNavigator(); +import { HomeNavigator, HomeIcon } from './Home'; -const RootNavigator = () => ( - - - - - -); +const Tab = createBottomTabNavigator(); +const Stack = createStackNavigator(); -/* const TabBarNavigator = createBottomTabNavigator( - { - Home: { screen: HomeNavigator }, - }, - { - initialRouteName: 'Home', - defaultNavigationOptions: () => HomeIcon, - tabBarOptions: { +const TabNavigator = () => ( + HomeIcon} + tabBarOptions={{ inactiveTintColor: colors.mediumGray, showIcon: true, showLabel: false, @@ -38,35 +24,23 @@ const RootNavigator = () => ( height: 70, backgroundColor: colors.white, }, - }, - } + }} + > + + ); -const MainNavigator = createStackNavigator( - { - Home: { screen: TabBarNavigator }, - }, - { - initialRouteName: 'Home', - headerMode: 'none', - cardStyle: { shadowColor: 'transparent' }, - } +const RootNavigator = () => ( + + + + + ); -const RootNavigator = createAppContainer( - createStackNavigator( - { - Main: { screen: MainNavigator }, - }, - { - headerMode: 'none', - cardStyle: { shadowColor: 'transparent' }, - mode: 'modal', - defaultNavigationOptions: { - gesturesEnabled: false, - }, - } - ) -); */ - export default RootNavigator;