ajout des modification de la position
This commit is contained in:
novic-djef
parent
bf6079b5e1
commit
250d25fc39
|
|
@ -230,7 +230,7 @@ dependencies {
|
|||
// Run this once to be able to run the application with BUCK
|
||||
// puts all compile dependencies into folder libs for BUCK to use
|
||||
task copyDownloadableDepsToLibs(type: Copy) {
|
||||
from configurations.compile
|
||||
//from configurations.compile
|
||||
into 'libs'
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@
|
|||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:launchMode="singleTask"
|
||||
android:exported="false"
|
||||
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
|
||||
android:label="@string/app_name"
|
||||
android:windowSoftInputMode="adjustResize">
|
||||
|
|
|
|||
|
|
@ -1,24 +1,23 @@
|
|||
buildscript {
|
||||
ext {
|
||||
androidXCore = "1.4.0"
|
||||
// androidXCore = "1.4.0"
|
||||
buildToolsVersion = "30.0.2"
|
||||
minSdkVersion = 21
|
||||
compileSdkVersion = 30
|
||||
targetSdkVersion = 30
|
||||
kotlinVersion = "1.5.31"
|
||||
compileSdkVersion = 34
|
||||
targetSdkVersion = 34
|
||||
// kotlinVersion = "1.5.31"
|
||||
ndkVersion = "20.1.5948944"
|
||||
supportLibVersion = "28"
|
||||
// supportLibVersion = "28"
|
||||
// kotlin_version = '1.6.10'
|
||||
}
|
||||
repositories {
|
||||
google()
|
||||
//jcenter()
|
||||
mavenCentral()
|
||||
maven { url 'https://www.jitpack.io' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath('com.android.tools.build:gradle:4.2.1')
|
||||
classpath('com.android.tools.build:gradle:7.4.2')
|
||||
//classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
|
|
@ -55,7 +54,7 @@ allprojects {
|
|||
}
|
||||
}
|
||||
google()
|
||||
// jcenter()
|
||||
//mavenCentral()
|
||||
maven { url 'https://www.jitpack.io' }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,6 +1,5 @@
|
|||
#Wed Oct 14 15:00:41 WAT 2020
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
#!/usr/bin/env sh
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright 2015 the original author or authors.
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
|
|
@ -17,78 +17,113 @@
|
|||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
APP_BASE_NAME=${0##*/}
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=true
|
||||
;;
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
|
@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
|
|||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
|
|
@ -105,85 +140,95 @@ location of your Java installation."
|
|||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=`expr $i + 1`
|
||||
done
|
||||
case $i in
|
||||
0) set -- ;;
|
||||
1) set -- "$args0" ;;
|
||||
2) set -- "$args0" "$args1" ;;
|
||||
3) set -- "$args0" "$args1" "$args2" ;;
|
||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=`save "$@"`
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
||||
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
||||
cd "$(dirname "$0")"
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import {
|
|||
import {responsiveHeight, responsiveWidth} from "react-native-responsive-dimensions"
|
||||
import BaseScreen from "../BaseScreen";
|
||||
import Icon from "react-native-vector-icons/MaterialIcons";
|
||||
import BlurOverlay, {openOverlay, closeOverlay} from 'react-native-blur-overlay'
|
||||
//import BlurOverlay, {openOverlay, closeOverlay} from 'react-native-blur-overlay'
|
||||
import I18n from 'react-native-i18n';
|
||||
import {WebView} from 'react-native-webview';
|
||||
|
||||
|
|
@ -49,50 +49,50 @@ export default class InterticielAds
|
|||
};
|
||||
|
||||
|
||||
render() {
|
||||
return (<BlurOverlay radius={14}
|
||||
downsampling={2}
|
||||
onPress={() => {
|
||||
this.setState({isPubShow: false})
|
||||
}}
|
||||
brightness={-200}
|
||||
// render() {
|
||||
// return (<BlurOverlay radius={14}
|
||||
// downsampling={2}
|
||||
// onPress={() => {
|
||||
// this.setState({isPubShow: false})
|
||||
// }}
|
||||
// brightness={-200}
|
||||
|
||||
>
|
||||
{this.renderChild()}
|
||||
</BlurOverlay>)
|
||||
}
|
||||
// >
|
||||
// {this.renderChild()}
|
||||
// </BlurOverlay>)
|
||||
// }
|
||||
|
||||
renderChild() {
|
||||
return (<View style={styles.container}>
|
||||
// renderChild() {
|
||||
// return (<View style={styles.container}>
|
||||
|
||||
<WebView
|
||||
source={{uri: 'https://ilink-app.com/ads.html'}}
|
||||
style={{
|
||||
width: responsiveWidth(100),
|
||||
marginTop: 37 + responsiveHeight(4),
|
||||
backgroundColor: 'white'
|
||||
}}
|
||||
/>
|
||||
<View>
|
||||
<Button
|
||||
title={I18n.t('QUIT_')}
|
||||
color={theme.reddeconnect}
|
||||
style={{position: 'absolute', zIndex: 10000}}
|
||||
onPress={() => {
|
||||
this.popOverLay()
|
||||
}}
|
||||
>{I18n.t('QUIT_')}</Button>
|
||||
// <WebView
|
||||
// source={{uri: 'https://ilink-app.com/ads.html'}}
|
||||
// style={{
|
||||
// width: responsiveWidth(100),
|
||||
// marginTop: 37 + responsiveHeight(4),
|
||||
// backgroundColor: 'white'
|
||||
// }}
|
||||
// />
|
||||
// <View>
|
||||
// <Button
|
||||
// title={I18n.t('QUIT_')}
|
||||
// color={theme.reddeconnect}
|
||||
// style={{position: 'absolute', zIndex: 10000}}
|
||||
// onPress={() => {
|
||||
// this.popOverLay()
|
||||
// }}
|
||||
// >{I18n.t('QUIT_')}</Button>
|
||||
|
||||
</View>
|
||||
// </View>
|
||||
|
||||
</View>)
|
||||
// </View>)
|
||||
|
||||
}
|
||||
// }
|
||||
|
||||
componentDidMount() {
|
||||
openOverlay()
|
||||
// componentDidMount() {
|
||||
// openOverlay()
|
||||
|
||||
}
|
||||
// }
|
||||
|
||||
async tryGetHtml() {
|
||||
response = await fetch('https://ad-server.ilink-app.com/ad_display/zone1/zone4.html')
|
||||
|
|
@ -101,7 +101,7 @@ export default class InterticielAds
|
|||
popOverLay() {
|
||||
if (this.props.closeIntersticiel)
|
||||
this.props.closeIntersticiel()
|
||||
closeOverlay()
|
||||
//closeOverlay()
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,8 +128,9 @@ export default class CreateUserStep2 extends Component {
|
|||
select_network: I18n.t("SELECT_NETWORK"),
|
||||
user: this.user,
|
||||
provider_class: null,
|
||||
provider_classes: []
|
||||
|
||||
provider_classes: [],
|
||||
latitude: "",
|
||||
longitude: "",
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -146,6 +147,8 @@ export default class CreateUserStep2 extends Component {
|
|||
try {
|
||||
result = await this.retreiveCodeInformation()
|
||||
const {category} = result
|
||||
console.log("RESULTAT ", result);
|
||||
this.setState({result});
|
||||
} catch (e) {
|
||||
result = false
|
||||
}
|
||||
|
|
@ -157,7 +160,10 @@ export default class CreateUserStep2 extends Component {
|
|||
this.setState({
|
||||
modalVisible: false, networks: [result.network],
|
||||
network: result.network, select_network: I18n.t("YOUR_NETWORK")
|
||||
})
|
||||
});
|
||||
if (result.child === "geolocated" || result.child === "super") {
|
||||
this.setState({network: result.network, select_network: I18n.t("YOUR_NETWORK_SELECTED")});
|
||||
}
|
||||
|
||||
else {
|
||||
Alert.alert(I18n.t('TITLE_PROBLE_COME'), "Impossible de recuperer les informations du code parrain", [{
|
||||
|
|
@ -166,8 +172,8 @@ export default class CreateUserStep2 extends Component {
|
|||
}])
|
||||
}
|
||||
|
||||
if (result.hasOwnProperty('provider_classes'))
|
||||
this.setState({provider_classes: result.provider_classes});
|
||||
// if (result.hasOwnProperty('provider_classes'))
|
||||
// this.setState({provider_classes: result.provider_classes});
|
||||
} else {
|
||||
console.log("need enable")
|
||||
getCountryNetwork(indicatif).then((result) => {
|
||||
|
|
@ -289,19 +295,146 @@ export default class CreateUserStep2 extends Component {
|
|||
}
|
||||
}
|
||||
|
||||
// async watchLocation() {
|
||||
// Geolocation.getCurrentPosition((position) => {
|
||||
// this.treatPosition(position)
|
||||
// }, (e) => {
|
||||
// this.showErrorDialog()
|
||||
// }, this.props.geolocationOptions);
|
||||
// if (!this.watchID) {
|
||||
// Geolocation.watchPosition((position) => {
|
||||
// this.treatPosition(position)
|
||||
// }, (e) => {
|
||||
// this.showErrorDialog()
|
||||
// }, this.props.geolocationOptions)
|
||||
// }
|
||||
// }
|
||||
|
||||
// treatPosition(position) {
|
||||
// const myLastPosition = this.state.myPosition;
|
||||
// const myPosition = position.coords;
|
||||
|
||||
// if (!isEqual(myPosition, myLastPosition)) {
|
||||
// getPositionInformation(myPosition).then((response) => {
|
||||
// if (response.results !== undefined) {
|
||||
// if (response.results.length > 0) {
|
||||
// let most = response.results[0]
|
||||
// let {address_components, formatted_address, place_id} = most
|
||||
// this.setState({address: address_components, textadress: formatted_address, place: place_id})
|
||||
|
||||
// let results = response.results;
|
||||
// let shortcountry;
|
||||
// let mcountry;
|
||||
// for (let i = 0; i < results[0].address_components.length; i++) {
|
||||
// for (let j = 0; j < results[0].address_components[i].types.length; j++) {
|
||||
// if (results[0].address_components[i].types[j] === "country") {
|
||||
// mcountry = results[0].address_components[i];
|
||||
// shortcountry = mcountry.short_name;
|
||||
// this.setState({shortCountry: mcountry.short_name, longCountry: mcountry.long_name})
|
||||
// } else if (results[0].address_components[i].types[j] === "locality") {
|
||||
// const name = results[0].address_components[i].short_name;
|
||||
// this.setState({townName: name});
|
||||
// getTownInformationName(name).then((result) => {
|
||||
// let town = null;
|
||||
// if (result instanceof Array) {
|
||||
// town = result[0];
|
||||
// } else
|
||||
// town = result;
|
||||
// this.setState({town: town});
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// getListCountriesActive().then((cnt) => {
|
||||
// this.setState({countries: cnt})
|
||||
// console.debug(cnt, shortcountry);
|
||||
// var found = false
|
||||
// for (let i of cnt) {
|
||||
// if (i.code_country === shortcountry) {
|
||||
// found = true
|
||||
// this.setState({indicatif: i.code_dial, country: i.name})
|
||||
// this.getNetworks(i.code_dial);
|
||||
// }
|
||||
// }
|
||||
// if (!found) {
|
||||
// Alert.alert("Impossible de recupérer vos informations", "Nous n'avons pas pu recuperer les informations de votre pays veuillez contacter les administrateurs", [{text: "OK"}]);
|
||||
|
||||
// }
|
||||
// })
|
||||
|
||||
|
||||
// }
|
||||
|
||||
// }
|
||||
// }).catch((e) => {
|
||||
// this.showErrorDialog()
|
||||
// });
|
||||
// this.setState({myPosition: myPosition});
|
||||
// if (this.mapRef !== undefined && this.mapRef !== null) {
|
||||
// this.mapRef.animateToCoordinate({
|
||||
// latitude: myPosition.latitude,
|
||||
// longitude: myPosition.longitude
|
||||
// }, 1000);
|
||||
// this.mapRef.animateToRegion({
|
||||
// latitude: myPosition.latitude,
|
||||
// longitude: myPosition.longitude,
|
||||
// latitudeDelta: 0.03,
|
||||
// longitudeDelta: 0.01,
|
||||
// }, 1000)
|
||||
// }
|
||||
// }
|
||||
|
||||
// }
|
||||
async watchLocation() {
|
||||
Geolocation.getCurrentPosition((position) => {
|
||||
this.treatPosition(position)
|
||||
}, (e) => {
|
||||
this.showErrorDialog()
|
||||
}, this.props.geolocationOptions);
|
||||
if (!this.watchID) {
|
||||
Geolocation.watchPosition((position) => {
|
||||
if (this.isOffline) {
|
||||
Geolocation.getCurrentPosition((position) => {
|
||||
this.setState({
|
||||
modalVisible: false,
|
||||
latitude: position.coords.latitude,
|
||||
longitude: position.coords.longitude
|
||||
}, () => {
|
||||
console.log("latitude", this.state.latitude);
|
||||
});
|
||||
if (this.result.child) {
|
||||
this.setState({disableNetwork: true});
|
||||
if (this.result.network) {
|
||||
this.setState({
|
||||
modalVisible: false, networks: [this.result.network],
|
||||
});
|
||||
if (this.result.child === "geolocated" || this.result.child === "super") {
|
||||
this.setState({
|
||||
network: this.result.network,
|
||||
select_network: I18n.t("YOUR_NETWORK_SELECTED")
|
||||
});
|
||||
}
|
||||
} else {
|
||||
this.showErrorDialog();
|
||||
}
|
||||
}
|
||||
|
||||
}, (e) => {
|
||||
Alert.alert(I18n.t('TITLE_PROBLE_COME'), "Impossible de recuperer les informations du code parrain", [{
|
||||
text: "Reesayer",
|
||||
onPress: () => this.watchLocation()
|
||||
}])
|
||||
console.warn("POSITION ERROR", e);
|
||||
this.setState({modalVisible: false})
|
||||
}, this.props.geolocationOptions);
|
||||
} else {
|
||||
Geolocation.getCurrentPosition((position) => {
|
||||
this.treatPosition(position)
|
||||
}, (e) => {
|
||||
this.showErrorDialog()
|
||||
}, this.props.geolocationOptions)
|
||||
this.showErrorDialog();
|
||||
}, this.props.geolocationOptions);
|
||||
/* if (!this.watchID) {
|
||||
Geolocation.watchPosition((position) => {
|
||||
this.treatPosition(position)
|
||||
}, (e) => {
|
||||
this.showErrorDialog();
|
||||
}, this.props.geolocationOptions)
|
||||
}*/
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
treatPosition(position) {
|
||||
|
|
@ -336,6 +469,17 @@ export default class CreateUserStep2 extends Component {
|
|||
town = result;
|
||||
this.setState({town: town});
|
||||
})
|
||||
} else {
|
||||
getDefaultTown().then(result => {
|
||||
getTownInformationName(result.default_locality).then((resultTowwn) => {
|
||||
let town = null;
|
||||
if (resultTowwn instanceof Array) {
|
||||
town = resultTowwn[0];
|
||||
} else
|
||||
town = resultTowwn;
|
||||
this.setState({town: town});
|
||||
});
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -346,7 +346,6 @@ DEPENDENCIES:
|
|||
- RNScreens (from `../node_modules/react-native-screens`)
|
||||
- RNSVG (from `../node_modules/react-native-svg`)
|
||||
- RNVectorIcons (from `../node_modules/react-native-vector-icons`)
|
||||
- SajjadBlurOverlay (from `../node_modules/react-native-blur-overlay/ios`)
|
||||
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
|
||||
|
||||
SPEC REPOS:
|
||||
|
|
@ -443,8 +442,6 @@ EXTERNAL SOURCES:
|
|||
:path: "../node_modules/react-native-svg"
|
||||
RNVectorIcons:
|
||||
:path: "../node_modules/react-native-vector-icons"
|
||||
SajjadBlurOverlay:
|
||||
:path: "../node_modules/react-native-blur-overlay/ios"
|
||||
Yoga:
|
||||
:path: "../node_modules/react-native/ReactCommon/yoga"
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -37,7 +37,6 @@
|
|||
"react-native-animatable": "^1.3.2",
|
||||
"react-native-best-viewpager": "^1.0.4",
|
||||
"react-native-blob-util": "^0.14.0",
|
||||
"react-native-blur-overlay": "^1.0.6",
|
||||
"react-native-calendario": "^0.2.10",
|
||||
"react-native-camera": "^3.30.0",
|
||||
"react-native-cardview": "^2.0.2",
|
||||
|
|
@ -76,7 +75,6 @@
|
|||
"react-native-progress": "^3.6.0",
|
||||
"react-native-qrcode-scanner": "^1.5.4",
|
||||
"react-native-range-datepicker": "^1.8.2",
|
||||
"react-native-reanimated": "^1.13.0",
|
||||
"react-native-responsive-dimensions": "^2.0.1",
|
||||
"react-native-root-toast": "^3.2.1",
|
||||
"react-native-safe-area-context": "0.7.3",
|
||||
|
|
@ -101,7 +99,6 @@
|
|||
"react-navigation-tabs": "^2.11.2",
|
||||
"react-navigation-transitions": "^1.0.12",
|
||||
"react-redux": "^7.2.0",
|
||||
"realm": "^10.21.1",
|
||||
"reanimated-bottom-sheet": "^1.0.0-alpha.10",
|
||||
"redux": "^4.0.5",
|
||||
"redux-persist": "^6.0.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue