Added Drawer navigator & version numbers.

This commit is contained in:
Patrick Fic
2022-09-02 10:28:43 -07:00
parent 803580e7b5
commit a5e83e4987
5 changed files with 34 additions and 30 deletions

View File

@@ -2,21 +2,21 @@
"expo": { "expo": {
"name": "ImEX Mobile", "name": "ImEX Mobile",
"slug": "imexmobile", "slug": "imexmobile",
"version": "1.3.8", "version": "1.4.0",
"extra": { "extra": {
"expover": "2" "expover": "1"
}, },
"orientation": "default", "orientation": "default",
"icon": "./assets/logo192noa.png", "icon": "./assets/logo192noa.png",
"ios": { "ios": {
"supportsTablet": true, "supportsTablet": true,
"bundleIdentifier": "com.imex.imexmobile", "bundleIdentifier": "com.imex.imexmobile",
"buildNumber": "2", "buildNumber": "1",
"googleServicesFile": "./GoogleService-Info.plist" "googleServicesFile": "./GoogleService-Info.plist"
}, },
"android": { "android": {
"package": "com.imex.imexmobile", "package": "com.imex.imexmobile",
"versionCode": 1100021, "versionCode": 1100022,
"googleServicesFile": "./google-services.json" "googleServicesFile": "./google-services.json"
}, },
"splash": { "splash": {

View File

@@ -19,9 +19,9 @@ export default function MediaCacheOverlay({
visible={previewVisible} visible={previewVisible}
images={photos} images={photos}
imageIndex={imgIndex} imageIndex={imgIndex}
onImageIndexChange={(...props) => { // onImageIndexChange={(...props) => {
console.log(props); // // console.log(props);
}} // }}
/> />
</SafeAreaView> </SafeAreaView>
); );

View File

@@ -1,11 +1,13 @@
import { Ionicons } from "@expo/vector-icons"; import { Ionicons } from "@expo/vector-icons";
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
import { createDrawerNavigator } from "@react-navigation/drawer";
import { NavigationContainer } from "@react-navigation/native"; import { NavigationContainer } from "@react-navigation/native";
import { createStackNavigator } from "@react-navigation/stack"; import { createStackNavigator } from "@react-navigation/stack";
import i18n from "i18next"; import i18n from "i18next";
import moment from "moment"; import moment from "moment";
import React, { useEffect } from "react"; 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 { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { logImEXEvent } from "../../firebase/firebase.analytics"; 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 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";
const JobStack = createStackNavigator(); const JobsTab = createDrawerNavigator();
const ActiveJobStack = createStackNavigator();
const MoreStack = createStackNavigator(); const MoreStack = createStackNavigator();
const BottomTabs = createBottomTabNavigator(); const BottomTabs = createBottomTabNavigator();
const MediaBrowserStack = createStackNavigator(); const MediaBrowserStack = createStackNavigator();
@@ -45,19 +48,33 @@ const mapDispatchToProps = (dispatch) => ({
setCameraJob: (job) => dispatch(setCameraJob(job)), 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, mapStateToProps,
mapDispatchToProps mapDispatchToProps
)(({ setCameraJobId, setCameraJob }) => ( )(({ setCameraJobId, setCameraJob }) => (
<JobStack.Navigator initialRouteName="JobList"> <ActiveJobStack.Navigator initialRouteName="JobList">
<JobStack.Screen <ActiveJobStack.Screen
name="JobList" name="JobList"
options={() => ({ options={() => ({
title: i18n.t("joblist.labels.activejobs"), title: i18n.t("joblist.labels.activejobs"),
})} })}
component={ScreenJobList} component={ScreenJobList}
/> />
<JobStack.Screen <ActiveJobStack.Screen
name="JobDetail" name="JobDetail"
component={ScreenJobDetail} component={ScreenJobDetail}
options={({ navigation, route }) => ({ options={({ navigation, route }) => ({
@@ -79,7 +96,7 @@ const JobStackNavigator = connect(
), ),
})} })}
/> />
</JobStack.Navigator> </ActiveJobStack.Navigator>
)); ));
const MediaBrowserStackNavigator = () => ( const MediaBrowserStackNavigator = () => (
@@ -107,15 +124,6 @@ const MoreStackNavigator = () => (
const BottomTabsNavigator = () => ( const BottomTabsNavigator = () => (
<BottomTabs.Navigator <BottomTabs.Navigator
screenOptions={({ route }) => ({ screenOptions={({ route }) => ({
// tabBarActiveTintColor: "dodgerblue",
// tabBarInactiveTintColor: "slategrey",
// tabBarStyle: [
// {
// display: "flex",
// },
// null,
// ],
// eslint-disable-next-line react/display-name // eslint-disable-next-line react/display-name
tabBarIcon: ({ color, size }) => { tabBarIcon: ({ color, size }) => {
let iconName; let iconName;
@@ -137,10 +145,9 @@ const BottomTabsNavigator = () => (
name="JobTab" name="JobTab"
options={{ options={{
title: i18n.t("joblist.titles.jobtab"), title: i18n.t("joblist.titles.jobtab"),
headerShown: false, headerShown: false,
}} }}
component={JobStackNavigator} component={JobsTabNavigator}
/> />
<BottomTabs.Screen <BottomTabs.Screen
name="MediaBrowserTab" name="MediaBrowserTab"

View File

@@ -212,10 +212,7 @@ export function UploadProgress({
filesToDelete, filesToDelete,
filesToDelete[0].albumId filesToDelete[0].albumId
); );
console.log(
"🚀 ~ file: upload-progress.component.jsx ~ line 220 ~ delres",
delres
);
// const album = await MediaLibrary.createAlbumAsync( // const album = await MediaLibrary.createAlbumAsync(
// "Deleted", // "Deleted",
// filesToDelete.pop(), // filesToDelete.pop(),

View File

@@ -112,7 +112,7 @@ export function* signInSuccessSaga({ payload }) {
const shop = yield client.query({ query: QUERY_BODYSHOP }); const shop = yield client.query({ query: QUERY_BODYSHOP });
logImEXEvent("imexmobile_sign_in_success", payload); logImEXEvent("imexmobile_sign_in_success", payload);
console.log(shop);
yield put(setBodyshop(shop.data.bodyshops[0])); yield put(setBodyshop(shop.data.bodyshops[0]));
// yield put( // yield put(
// setBodyshop({ // setBodyshop({