Before switching to release

This commit is contained in:
Brice Zele 2021-07-07 09:35:54 +01:00
parent 1062a79778
commit ff23733606
5 changed files with 2093 additions and 256 deletions

1
App.js
View File

@ -438,6 +438,7 @@ export default class App extends React.Component {
goToScreen = (routeName, params, isReset = true) => { goToScreen = (routeName, params, isReset = true) => {
const {navigator} = this.refs; const {navigator} = this.refs;
console.log("NAVIGATOR", navigator);
if (typeof navigator !== 'undefined') { if (typeof navigator !== 'undefined') {
console.log("APP HAS LOADED", global.appHasLoaded); console.log("APP HAS LOADED", global.appHasLoaded);
if (global.appHasLoaded) { if (global.appHasLoaded) {

File diff suppressed because one or more lines are too long

View File

@ -7,7 +7,7 @@
"test": "jest", "test": "jest",
"postinstall": "node ./fix-android/android-release-fix.js", "postinstall": "node ./fix-android/android-release-fix.js",
"release-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/build/intermediates/res/merged/release/ && rm -rf ./android/app/src/main/res/drawable-* && rm -rf ./android/app/src/main/res/raw/* && cd ./android && ./gradlew assembleRelease -x bundleReleaseJsAndAssets && cd .. && adb install ./android/app/build/outputs/apk/release/app-release.apk", "release-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/build/intermediates/res/merged/release/ && rm -rf ./android/app/src/main/res/drawable-* && rm -rf ./android/app/src/main/res/raw/* && cd ./android && ./gradlew assembleRelease -x bundleReleaseJsAndAssets && cd .. && adb install ./android/app/build/outputs/apk/release/app-release.apk",
"debug-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/src/main/res/ && cd ./android && ./gradlew assembleDebug && cd .. && adb install ./android/app/build/outputs/apk/debug/app-debug.apk", "debug-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/src/main/res/ ; cd ./android ; sudo ./gradlew clean ; sudo ./gradlew assembleDebug ; cd .. && adb install ./android/app/build/outputs/apk/debug/app-debug.apk",
"start-emulator": "emulator -avd Nexus_5X_API_29 -dns-server 8.8.8.8", "start-emulator": "emulator -avd Nexus_5X_API_29 -dns-server 8.8.8.8",
"start-emulator-pixel": "emulator -avd Pixel_2_API_29 -dns-server 8.8.8.8", "start-emulator-pixel": "emulator -avd Pixel_2_API_29 -dns-server 8.8.8.8",
"run-debug": "cd android && ./gradlew clean && cd .. && react-native run-android", "run-debug": "cd android && ./gradlew clean && cd .. && react-native run-android",

View File

@ -1707,7 +1707,7 @@ class Home extends BaseScreen {
}} }}
/> />
{this.makeCardSearch()} {this.makeCardSearch()}
{this.showInterticiel()} {/*this.showInterticiel()*/}
{this.makeSlidingUp()} {this.makeSlidingUp()}
{this.makeDialogLoader()} {this.makeDialogLoader()}
{this.makeDistanceDialog()} {this.makeDistanceDialog()}

View File

@ -1,15 +1,16 @@
import React, { Component } from 'react'; import React, {Component} from 'react';
import { import {
StyleSheet, View, Text, Image, ProgressBarAndroid, StyleSheet, View, Text, Image, ProgressBarAndroid,
TouchableNativeFeedback, TouchableOpacity, TouchableNativeFeedback, TouchableOpacity,
PermissionsAndroid, NativeModules, StatusBar, Platform, Animated PermissionsAndroid, NativeModules, StatusBar, Platform, Animated
} from 'react-native'; } from 'react-native';
import { responsiveHeight, responsiveWidth, responsiveFontSize } from 'react-native-responsive-dimensions'; import {responsiveHeight, responsiveWidth, responsiveFontSize} from 'react-native-responsive-dimensions';
import I18n from 'react-native-i18n' import I18n from 'react-native-i18n'
const theme = require('./../../utils/theme.json'); const theme = require('./../../utils/theme.json');
const route = require('./../../route.json'); const route = require('./../../route.json');
import { readUser, getPasObject, getPubActiveObject } from '../../webservice/AuthApi'; import {readUser, getPasObject, getPubActiveObject} from '../../webservice/AuthApi';
import { Bubbles, DoubleBounce, Bars, Pulse } from 'react-native-loader'; import {Bubbles, DoubleBounce, Bars, Pulse} from 'react-native-loader';
import Configuration from "../../webservice/persistences/Configuration"; import Configuration from "../../webservice/persistences/Configuration";
import '../ads/InterticielAds' import '../ads/InterticielAds'
import * as Animatable from 'react-native-animatable'; import * as Animatable from 'react-native-animatable';
@ -17,6 +18,7 @@ import LottieView from 'lottie-react-native'; // if you have "esModuleInterop":
import InterticielAds from '../ads/InterticielAds'; import InterticielAds from '../ads/InterticielAds';
import Overlay from 'react-native-elements' import Overlay from 'react-native-elements'
import DeviceInfo from 'react-native-device-info'; import DeviceInfo from 'react-native-device-info';
export default class SplashScreen extends Component { export default class SplashScreen extends Component {
static navigatorStyle = { static navigatorStyle = {
drawUnderNavBar: true, drawUnderNavBar: true,
@ -25,6 +27,7 @@ export default class SplashScreen extends Component {
statusBarHidden: false, statusBarHidden: false,
statusBarTextColorScheme: 'light', statusBarTextColorScheme: 'light',
}; };
static options(passProps) { static options(passProps) {
return { return {
statusBar: { statusBar: {
@ -47,10 +50,9 @@ export default class SplashScreen extends Component {
// //
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {};
}
}; };
workUserResult(result) { workUserResult(result) {
console.log("SPLASHSCREEN PROPS", this.props); console.log("SPLASHSCREEN PROPS", this.props);
if (typeof this.props.navigation.state.params !== 'undefined') { if (typeof this.props.navigation.state.params !== 'undefined') {
@ -83,9 +85,11 @@ export default class SplashScreen extends Component {
way = "App" way = "App"
else { else {
switch (result.category) { switch (result.category) {
case 'geolocated': way = "AgentApp" case 'geolocated':
way = "AgentApp"
break; break;
case 'super': way = "adminApp" case 'super':
way = "adminApp"
break break
default: default:
way = "supAdminApp" way = "supAdminApp"
@ -93,6 +97,7 @@ export default class SplashScreen extends Component {
} }
way2 = route.login way2 = route.login
} }
console.log("SPLASHSCREEN PROPS WAY", way);
this.props.navigation.navigate(way) this.props.navigation.navigate(way)
} }
@ -117,6 +122,7 @@ export default class SplashScreen extends Component {
});*/ });*/
} }
componentDidMount() { componentDidMount() {
try { try {
this.requestCameraPermission() this.requestCameraPermission()
@ -129,6 +135,7 @@ export default class SplashScreen extends Component {
this.bounce() this.bounce()
} }
async requestCameraPermission() { async requestCameraPermission() {
try { try {
const granted = await PermissionsAndroid.request( const granted = await PermissionsAndroid.request(
@ -150,9 +157,10 @@ export default class SplashScreen extends Component {
console.log(err) console.log(err)
} }
} }
handleViewRef = ref => this.view = ref; handleViewRef = ref => this.view = ref;
bounce = () => this.view.transition({ translateX: 0 }, { translateX: 700 }, 5000); bounce = () => this.view.transition({translateX: 0}, {translateX: 700}, 5000);
render() { render() {
@ -161,11 +169,17 @@ export default class SplashScreen extends Component {
<StatusBar <StatusBar
translucent={true} translucent={true}
/> />
<Image style={styles.logo} source={require('./../../datas/img/icon3up.png')} /> <Image style={styles.logo} source={require('./../../datas/img/icon3up.png')}/>
<View style={{ flexDirection: 'row' }}> <View style={{flexDirection: 'row'}}>
<Image style={styles.logo} source={require('./../../datas/img/iconsub3.png')} /> <Image style={styles.logo} source={require('./../../datas/img/iconsub3.png')}/>
<Animatable.View <Animatable.View
style={{ width: responsiveWidth(90), height: 92, backgroundColor: theme.primary, position: 'absolute', zIndex: 100 }} style={{
width: responsiveWidth(90),
height: 92,
backgroundColor: theme.primary,
position: 'absolute',
zIndex: 100
}}
ref={this.handleViewRef}> ref={this.handleViewRef}>
</Animatable.View> </Animatable.View>