added bottom tab for time tickets
This commit is contained in:
@@ -25,12 +25,17 @@ import ScreenMediaBrowser from "../screen-media-browser/screen-media-browser.com
|
|||||||
import ScreenSettingsComponent from "../screen-settings/screen-settings.component";
|
import ScreenSettingsComponent from "../screen-settings/screen-settings.component";
|
||||||
import ScreenSignIn from "../screen-sign-in/screen-sign-in.component";
|
import ScreenSignIn from "../screen-sign-in/screen-sign-in.component";
|
||||||
import ScreenSplash from "../screen-splash/screen-splash.component";
|
import ScreenSplash from "../screen-splash/screen-splash.component";
|
||||||
|
//TODO Inprogress JF add import for screens for time ticket browser here
|
||||||
|
import TechSignIn from "../screen-tech-sign-in/screen-tech-sign-in.component";
|
||||||
|
|
||||||
const ActiveJobStack = createNativeStackNavigator();
|
const ActiveJobStack = createNativeStackNavigator();
|
||||||
const MoreStack = createNativeStackNavigator();
|
const MoreStack = createNativeStackNavigator();
|
||||||
const BottomTabs = createBottomTabNavigator();
|
const BottomTabs = createBottomTabNavigator();
|
||||||
const MediaBrowserStack = createNativeStackNavigator();
|
const MediaBrowserStack = createNativeStackNavigator();
|
||||||
|
|
||||||
|
//ADDED JF TimeTicketBrowserStack for holding screens
|
||||||
|
const TimeTicketBrowserStack = createNativeStackNavigator();
|
||||||
|
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop,
|
bodyshop: selectBodyshop,
|
||||||
currentUser: selectCurrentUser,
|
currentUser: selectCurrentUser,
|
||||||
@@ -104,6 +109,24 @@ const MoreStackNavigator = () => (
|
|||||||
</MoreStack.Navigator>
|
</MoreStack.Navigator>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
//ADDED JF TimeTicketBrowserStackNavigator for navigating the stack
|
||||||
|
const TimeTicketBrowserStackNavigator = () => (
|
||||||
|
<TimeTicketBrowserStack.Navigator initialRouteName="TimeTicketBrowser">
|
||||||
|
<TimeTicketBrowserStack.Screen
|
||||||
|
name="TechSignIn"
|
||||||
|
options={() => ({
|
||||||
|
title: i18n.t("techsignin.titles.signin"),
|
||||||
|
})}
|
||||||
|
component={TechSignIn}
|
||||||
|
/>
|
||||||
|
{/* <TimeTicketBrowserStack.Screen
|
||||||
|
name="TimeTicketBrowser"
|
||||||
|
options={{ title: i18n.t("timeticketbrowser.titles.timeticketbrowsertab") }}
|
||||||
|
component={ScreenMediaBrowser}
|
||||||
|
/> */}
|
||||||
|
</TimeTicketBrowserStack.Navigator>
|
||||||
|
);
|
||||||
|
|
||||||
const BottomTabsNavigator = () => (
|
const BottomTabsNavigator = () => (
|
||||||
<BottomTabs.Navigator
|
<BottomTabs.Navigator
|
||||||
screenOptions={({ route }) => ({
|
screenOptions={({ route }) => ({
|
||||||
@@ -116,6 +139,8 @@ const BottomTabsNavigator = () => (
|
|||||||
iconName = "ios-settings";
|
iconName = "ios-settings";
|
||||||
} else if (route.name === "MediaBrowserTab") {
|
} else if (route.name === "MediaBrowserTab") {
|
||||||
iconName = "ios-camera";
|
iconName = "ios-camera";
|
||||||
|
} else if (route.name === "TimeTicketBrowserTab") {//ADDED JF check for route.name for TimeTicketBrowserTab. Also icon ios-stopwatch-outline
|
||||||
|
iconName = "ios-stopwatch-outline";
|
||||||
} else {
|
} else {
|
||||||
//iconName = "customerservice";
|
//iconName = "customerservice";
|
||||||
}
|
}
|
||||||
@@ -145,8 +170,17 @@ const BottomTabsNavigator = () => (
|
|||||||
options={{ title: i18n.t("more.titles.moretab"), headerShown: false }}
|
options={{ title: i18n.t("more.titles.moretab"), headerShown: false }}
|
||||||
component={MoreStackNavigator}
|
component={MoreStackNavigator}
|
||||||
/>
|
/>
|
||||||
|
<BottomTabs.Screen
|
||||||
|
name="TimeTicketBrowserTab"
|
||||||
|
options={{
|
||||||
|
title: i18n.t("timeticketbrowser.titles.timeticketbrowsertab"),
|
||||||
|
headerShown: false,
|
||||||
|
}}
|
||||||
|
component={TimeTicketBrowserStackNavigator}
|
||||||
|
/>
|
||||||
</BottomTabs.Navigator>
|
</BottomTabs.Navigator>
|
||||||
);
|
);
|
||||||
|
//ADDED JF BottomTabs.Screen named TimeTicketBrowserTab
|
||||||
|
|
||||||
export function ScreenMainComponent({
|
export function ScreenMainComponent({
|
||||||
checkUserSession,
|
checkUserSession,
|
||||||
|
|||||||
Reference in New Issue
Block a user