Added Drawer navigator & version numbers.
This commit is contained in:
8
app.json
8
app.json
@@ -2,21 +2,21 @@
|
||||
"expo": {
|
||||
"name": "ImEX Mobile",
|
||||
"slug": "imexmobile",
|
||||
"version": "1.3.8",
|
||||
"version": "1.4.0",
|
||||
"extra": {
|
||||
"expover": "2"
|
||||
"expover": "1"
|
||||
},
|
||||
"orientation": "default",
|
||||
"icon": "./assets/logo192noa.png",
|
||||
"ios": {
|
||||
"supportsTablet": true,
|
||||
"bundleIdentifier": "com.imex.imexmobile",
|
||||
"buildNumber": "2",
|
||||
"buildNumber": "1",
|
||||
"googleServicesFile": "./GoogleService-Info.plist"
|
||||
},
|
||||
"android": {
|
||||
"package": "com.imex.imexmobile",
|
||||
"versionCode": 1100021,
|
||||
"versionCode": 1100022,
|
||||
"googleServicesFile": "./google-services.json"
|
||||
},
|
||||
"splash": {
|
||||
|
||||
@@ -19,9 +19,9 @@ export default function MediaCacheOverlay({
|
||||
visible={previewVisible}
|
||||
images={photos}
|
||||
imageIndex={imgIndex}
|
||||
onImageIndexChange={(...props) => {
|
||||
console.log(props);
|
||||
}}
|
||||
// onImageIndexChange={(...props) => {
|
||||
// // console.log(props);
|
||||
// }}
|
||||
/>
|
||||
</SafeAreaView>
|
||||
);
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
import { Ionicons } from "@expo/vector-icons";
|
||||
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
|
||||
import { createDrawerNavigator } from "@react-navigation/drawer";
|
||||
import { NavigationContainer } from "@react-navigation/native";
|
||||
import { createStackNavigator } from "@react-navigation/stack";
|
||||
import i18n from "i18next";
|
||||
import moment from "moment";
|
||||
import React, { useEffect } from "react";
|
||||
import { Button } from "react-native-paper";
|
||||
import { View } from "react-native";
|
||||
import { Button, Text } from "react-native-paper";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { logImEXEvent } from "../../firebase/firebase.analytics";
|
||||
@@ -26,7 +28,8 @@ import ScreenSettingsComponent from "../screen-settings/screen-settings.componen
|
||||
import ScreenSignIn from "../screen-sign-in/screen-sign-in.component";
|
||||
import ScreenSplash from "../screen-splash/screen-splash.component";
|
||||
|
||||
const JobStack = createStackNavigator();
|
||||
const JobsTab = createDrawerNavigator();
|
||||
const ActiveJobStack = createStackNavigator();
|
||||
const MoreStack = createStackNavigator();
|
||||
const BottomTabs = createBottomTabNavigator();
|
||||
const MediaBrowserStack = createStackNavigator();
|
||||
@@ -45,19 +48,33 @@ const mapDispatchToProps = (dispatch) => ({
|
||||
setCameraJob: (job) => dispatch(setCameraJob(job)),
|
||||
});
|
||||
|
||||
const JobStackNavigator = connect(
|
||||
const JobsTabNavigator = () => (
|
||||
<JobsTab.Navigator initialRouteName="Home">
|
||||
<JobsTab.Screen name="Home" component={ActiveJobStackNavigator} />
|
||||
<JobsTab.Screen
|
||||
name="Home2"
|
||||
component={() => (
|
||||
<View>
|
||||
<Text>2</Text>
|
||||
</View>
|
||||
)}
|
||||
/>
|
||||
</JobsTab.Navigator>
|
||||
);
|
||||
|
||||
const ActiveJobStackNavigator = connect(
|
||||
mapStateToProps,
|
||||
mapDispatchToProps
|
||||
)(({ setCameraJobId, setCameraJob }) => (
|
||||
<JobStack.Navigator initialRouteName="JobList">
|
||||
<JobStack.Screen
|
||||
<ActiveJobStack.Navigator initialRouteName="JobList">
|
||||
<ActiveJobStack.Screen
|
||||
name="JobList"
|
||||
options={() => ({
|
||||
title: i18n.t("joblist.labels.activejobs"),
|
||||
})}
|
||||
component={ScreenJobList}
|
||||
/>
|
||||
<JobStack.Screen
|
||||
<ActiveJobStack.Screen
|
||||
name="JobDetail"
|
||||
component={ScreenJobDetail}
|
||||
options={({ navigation, route }) => ({
|
||||
@@ -79,7 +96,7 @@ const JobStackNavigator = connect(
|
||||
),
|
||||
})}
|
||||
/>
|
||||
</JobStack.Navigator>
|
||||
</ActiveJobStack.Navigator>
|
||||
));
|
||||
|
||||
const MediaBrowserStackNavigator = () => (
|
||||
@@ -107,15 +124,6 @@ const MoreStackNavigator = () => (
|
||||
const BottomTabsNavigator = () => (
|
||||
<BottomTabs.Navigator
|
||||
screenOptions={({ route }) => ({
|
||||
// tabBarActiveTintColor: "dodgerblue",
|
||||
// tabBarInactiveTintColor: "slategrey",
|
||||
// tabBarStyle: [
|
||||
// {
|
||||
// display: "flex",
|
||||
// },
|
||||
// null,
|
||||
// ],
|
||||
|
||||
// eslint-disable-next-line react/display-name
|
||||
tabBarIcon: ({ color, size }) => {
|
||||
let iconName;
|
||||
@@ -137,10 +145,9 @@ const BottomTabsNavigator = () => (
|
||||
name="JobTab"
|
||||
options={{
|
||||
title: i18n.t("joblist.titles.jobtab"),
|
||||
|
||||
headerShown: false,
|
||||
}}
|
||||
component={JobStackNavigator}
|
||||
component={JobsTabNavigator}
|
||||
/>
|
||||
<BottomTabs.Screen
|
||||
name="MediaBrowserTab"
|
||||
|
||||
@@ -212,10 +212,7 @@ export function UploadProgress({
|
||||
filesToDelete,
|
||||
filesToDelete[0].albumId
|
||||
);
|
||||
console.log(
|
||||
"🚀 ~ file: upload-progress.component.jsx ~ line 220 ~ delres",
|
||||
delres
|
||||
);
|
||||
|
||||
// const album = await MediaLibrary.createAlbumAsync(
|
||||
// "Deleted",
|
||||
// filesToDelete.pop(),
|
||||
|
||||
@@ -112,7 +112,7 @@ export function* signInSuccessSaga({ payload }) {
|
||||
|
||||
const shop = yield client.query({ query: QUERY_BODYSHOP });
|
||||
logImEXEvent("imexmobile_sign_in_success", payload);
|
||||
console.log(shop);
|
||||
|
||||
yield put(setBodyshop(shop.data.bodyshops[0]));
|
||||
// yield put(
|
||||
// setBodyshop({
|
||||
|
||||
Reference in New Issue
Block a user