fix scroll
This commit is contained in:
@@ -2,6 +2,7 @@ import React from 'react';
|
|||||||
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
|
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
|
||||||
import { Ionicons } from '@expo/vector-icons';
|
import { Ionicons } from '@expo/vector-icons';
|
||||||
import { COLORS } from '../constants/colors';
|
import { COLORS } from '../constants/colors';
|
||||||
|
import { View, ActivityIndicator, Platform } from 'react-native';
|
||||||
|
|
||||||
import HomeScreen from '../screens/Main/HomeScreen';
|
import HomeScreen from '../screens/Main/HomeScreen';
|
||||||
import MenuNavigator from './MenuNavigator';
|
import MenuNavigator from './MenuNavigator';
|
||||||
@@ -33,9 +34,9 @@ const MainNavigator = () => {
|
|||||||
backgroundColor: COLORS.white,
|
backgroundColor: COLORS.white,
|
||||||
borderTopWidth: 1,
|
borderTopWidth: 1,
|
||||||
borderTopColor: COLORS.gray[200],
|
borderTopColor: COLORS.gray[200],
|
||||||
paddingBottom: 8,
|
paddingBottom: Platform.OS === 'android' ? 16 : 8,
|
||||||
paddingTop: 8,
|
paddingTop: 8,
|
||||||
height: 88,
|
height: Platform.OS === 'android' ? 96 : 88,
|
||||||
},
|
},
|
||||||
tabBarLabelStyle: {
|
tabBarLabelStyle: {
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { createStackNavigator } from '@react-navigation/stack';
|
import { createStackNavigator } from '@react-navigation/stack';
|
||||||
|
import { SafeAreaView } from 'react-native-safe-area-context';
|
||||||
import MenuScreen from '../screens/Main/MenuScreen';
|
import MenuScreen from '../screens/Main/MenuScreen';
|
||||||
import LoanRemainingOrdersScreen from '../screens/Loan/LoanRemainingOrdersScreen';
|
import LoanRemainingOrdersScreen from '../screens/Loan/LoanRemainingOrdersScreen';
|
||||||
import CreateLoanRemainingOrderScreen from '../screens/Loan/CreateLoanRemainingOrderScreen';
|
import CreateLoanRemainingOrderScreen from '../screens/Loan/CreateLoanRemainingOrderScreen';
|
||||||
@@ -28,6 +29,7 @@ import CardOrderDetailsScreen from '../screens/Card/CardOrderDetailsScreen';
|
|||||||
const Stack = createStackNavigator();
|
const Stack = createStackNavigator();
|
||||||
|
|
||||||
const MenuNavigator = () => (
|
const MenuNavigator = () => (
|
||||||
|
<SafeAreaView style={{ flex: 1 }}>
|
||||||
<Stack.Navigator screenOptions={{ headerShown: false }}>
|
<Stack.Navigator screenOptions={{ headerShown: false }}>
|
||||||
<Stack.Screen name="MenuHome" component={MenuScreen} />
|
<Stack.Screen name="MenuHome" component={MenuScreen} />
|
||||||
<Stack.Screen name="LoanRemainingOrders" component={LoanRemainingOrdersScreen} />
|
<Stack.Screen name="LoanRemainingOrders" component={LoanRemainingOrdersScreen} />
|
||||||
@@ -54,6 +56,7 @@ const MenuNavigator = () => (
|
|||||||
<Stack.Screen name="CreateCardOrder" component={CreateCardOrderScreen} />
|
<Stack.Screen name="CreateCardOrder" component={CreateCardOrderScreen} />
|
||||||
<Stack.Screen name="CardOrderDetails" component={CardOrderDetailsScreen} />
|
<Stack.Screen name="CardOrderDetails" component={CardOrderDetailsScreen} />
|
||||||
</Stack.Navigator>
|
</Stack.Navigator>
|
||||||
|
</SafeAreaView>
|
||||||
);
|
);
|
||||||
|
|
||||||
export default MenuNavigator;
|
export default MenuNavigator;
|
||||||
Reference in New Issue
Block a user