Improved uploads & handling for temp jobs. IO-399 IO-398 IO-69

components/screen-main/screen-main.component.jsx

@@ -4,7 +4,6 @@ import { NavigationContainer } from "@react-navigation/native";
 import { createStackNavigator } from "@react-navigation/stack";
 import i18n from "i18next";
 import React, { useEffect } from "react";
-import { SafeAreaView } from "react-native-safe-area-context";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import {
@@ -16,23 +15,24 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import ScreenCamera from "../screen-camera/screen-camera";
+//import ScreenCamera from "../screen-camera/screen-camera";
 import ScreenJobDetail from "../screen-job-detail/screen-job-detail.component";
 import ScreenJobList from "../screen-job-list/screen-job-list.component";
-import ScreenMediaCache from "../screen-media-cache/screen-media-cache.component";
-import ScreenMessagingConversation from "../screen-messaging-conversation/screen-messaging-conversation.component";
-import ScreenMessagingList from "../screen-messaging-list/screen-messaging-list.component";
+import ScreenMediaBrowser from "../screen-media-browser/screen-media-browser.component";
+//import ScreenMediaCache from "../screen-media-cache/screen-media-cache.component";
+//import ScreenMessagingConversation from "../screen-messaging-conversation/screen-messaging-conversation.component";
+//import ScreenMessagingList from "../screen-messaging-list/screen-messaging-list.component";
 import ScreenSettingsComponent from "../screen-settings/screen-settings.component";
 import ScreenSignIn from "../screen-sign-in/screen-sign-in.component";
 import ScreenSplash from "../screen-splash/screen-splash.component";
-import ScreenMediaBrowser from "../screen-media-browser/screen-media-browser.component";
 
 const JobStack = createStackNavigator();
-const CameraStack = createStackNavigator();
-const MessagingStack = createStackNavigator();
-const MediaCacheStack = createStackNavigator();
+//const CameraStack = createStackNavigator();
+//const MessagingStack = createStackNavigator();
+//const MediaCacheStack = createStackNavigator();
 const MoreStack = createStackNavigator();
 const BottomTabs = createBottomTabNavigator();
+const MediaBrowserStack = createStackNavigator();
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -51,7 +51,7 @@ const JobStackNavigator = () => (
     <JobStack.Screen
       name="JobList"
       options={() => ({
-        title: `${i18n.t("joblist.labels.activejobs")}`,
+        title: i18n.t("joblist.labels.activejobs"),
       })}
       component={ScreenJobList}
     />
@@ -64,7 +64,7 @@ const JobStackNavigator = () => (
           i18n.t("joblist.labels.detail"),
       })}
     />
-    <JobStack.Screen
+    {/* <JobStack.Screen
       name="MediaBrowser"
       component={ScreenMediaBrowser}
       // options={({ route }) => ({
@@ -72,42 +72,53 @@ const JobStackNavigator = () => (
       //     (route.params && route.params.title) ||
       //     i18n.t("joblist.labels.detail"),
       // })}
-    />
+    /> */}
   </JobStack.Navigator>
 );
 
-const CameraStackNavigator = () => (
-  <CameraStack.Navigator initialRouteName="TabCameraScreen">
-    <CameraStack.Screen
-      name="TabCameraScreen"
-      options={{ headerShown: false }}
-      component={ScreenCamera}
+// const CameraStackNavigator = () => (
+//   <CameraStack.Navigator initialRouteName="TabCameraScreen">
+//     <CameraStack.Screen
+//       name="TabCameraScreen"
+//       options={{ headerShown: false }}
+//       component={ScreenCamera}
+//     />
+//   </CameraStack.Navigator>
+// );
+
+// const MediaCacheStackNavigator = () => (
+//   <MediaCacheStack.Navigator initialRouteName="TabMediaCache">
+//     <MediaCacheStack.Screen
+//       name="MediaCache"
+//       options={{ title: i18n.t("mediacache.titles.mediacachetab") }}
+//       component={ScreenMediaCache}
+//     />
+//   </MediaCacheStack.Navigator>
+// );
+
+const MediaBrowserStackNavigator = () => (
+  <MediaBrowserStack.Navigator initialRouteName="MediaBrowser">
+    <MediaBrowserStack.Screen
+      name="MediaBrowser"
+      options={{ title: i18n.t("mediabrowser.titles.mediabrowsertab") }}
+      component={ScreenMediaBrowser}
     />
-  </CameraStack.Navigator>
+  </MediaBrowserStack.Navigator>
 );
 
-const MediaCacheStackNavigator = () => (
-  <MediaCacheStack.Navigator initialRouteName="TabMediaCache">
-    <MediaCacheStack.Screen
-      name="MediaCache"
-      options={{ title: i18n.t("mediacache.titles.mediacachetab") }}
-      component={ScreenMediaCache}
-    />
-  </MediaCacheStack.Navigator>
-);
+// const MessagingStackNavigator = () => (
+//   <MessagingStack.Navigator>
+//     <MessagingStack.Screen
+//       name="MessagingList"
+//       component={ScreenMessagingList}
+//     />
+//     <MessagingStack.Screen
+//       name="MessagingConversation"
+//       component={ScreenMessagingConversation}
+//     />
+//   </MessagingStack.Navigator>
+// );
 
-const MessagingStackNavigator = () => (
-  <MessagingStack.Navigator>
-    <MessagingStack.Screen
-      name="MessagingList"
-      component={ScreenMessagingList}
-    />
-    <MessagingStack.Screen
-      name="MessagingConversation"
-      component={ScreenMessagingConversation}
-    />
-  </MessagingStack.Navigator>
-);
 const MoreStackNavigator = () => (
   <MoreStack.Navigator>
     <MoreStack.Screen
@@ -132,7 +143,10 @@ const BottomTabsNavigator = () => (
           iconName = "ios-chatboxes";
         } else if (route.name === "CameraTab") {
           iconName = "ios-camera";
-        } else if (route.name === "MediaCacheTab") {
+        } else if (
+          route.name === "MediaCacheTab" ||
+          route.name === "MediaBrowserTab"
+        ) {
           iconName = "ios-photos";
         } else {
           //iconName = "customerservice";
@@ -152,20 +166,24 @@ const BottomTabsNavigator = () => (
       component={JobStackNavigator}
     />
     <BottomTabs.Screen
-      name="CameraTab"
-      options={{ title: i18n.t("camera.titles.cameratab") }}
-      component={CameraStackNavigator}
+      name="MediaBrowserTab"
+      options={{ title: i18n.t("mediabrowser.titles.mediabrowsertab") }}
+      component={MediaBrowserStackNavigator}
     />
-    <BottomTabs.Screen
+    {/* <BottomTabs.Screen
       name="MediaCacheTab"
       options={{ title: i18n.t("mediacache.titles.mediacachetab") }}
       component={MediaCacheStackNavigator}
-    />
-    <BottomTabs.Screen
+    /> */}
+    {/* <BottomTabs.Screen
+      name="CameraTab"
+      options={{ title: i18n.t("camera.titles.cameratab") }}
+      component={CameraStackNavigator}
+    />   <BottomTabs.Screen
       name="MessagingTab"
       options={{ title: i18n.t("messaging.titles.messagingtab") }}
       component={MessagingStackNavigator}
-    />
+    /> */}
     <BottomTabs.Screen
       name="MoreTab"
       options={{ title: i18n.t("more.titles.moretab") }}