diff --git a/ComApp/android/app/src/main/AndroidManifest.xml b/ComApp/android/app/src/main/AndroidManifest.xml index f17cc14..ddbbba0 100644 --- a/ComApp/android/app/src/main/AndroidManifest.xml +++ b/ComApp/android/app/src/main/AndroidManifest.xml @@ -1,31 +1,33 @@ - - - - - - + + + + - - - - - - - - + android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode" + android:launchMode="singleTask" + android:windowSoftInputMode="adjustResize" + android:exported="true" + android:theme="@style/Theme.App.SplashScreen" + > + + + + + + + diff --git a/ComApp/android/app/src/main/res/drawable/splashscreen.xml b/ComApp/android/app/src/main/res/drawable/splashscreen.xml new file mode 100644 index 0000000..9f19c56 --- /dev/null +++ b/ComApp/android/app/src/main/res/drawable/splashscreen.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ComApp/android/app/src/main/res/drawable/splashscreen_image.png b/ComApp/android/app/src/main/res/drawable/splashscreen_image.png new file mode 100644 index 0000000..8fec885 Binary files /dev/null and b/ComApp/android/app/src/main/res/drawable/splashscreen_image.png differ diff --git a/ComApp/android/app/src/main/res/values/colors.xml b/ComApp/android/app/src/main/res/values/colors.xml index 97d7b59..10236b7 100644 --- a/ComApp/android/app/src/main/res/values/colors.xml +++ b/ComApp/android/app/src/main/res/values/colors.xml @@ -1,5 +1,7 @@ - - - #000000 - #FFFFFF - + + + + #FFFFFF + #000000 + #FFFFFF + diff --git a/ComApp/android/app/src/main/res/values/strings.xml b/ComApp/android/app/src/main/res/values/strings.xml index 6311fd8..3a3b5f9 100644 --- a/ComApp/android/app/src/main/res/values/strings.xml +++ b/ComApp/android/app/src/main/res/values/strings.xml @@ -1,3 +1,5 @@ - ComApp + + contain + ComApp diff --git a/ComApp/android/app/src/main/res/values/styles.xml b/ComApp/android/app/src/main/res/values/styles.xml index 7ba83a2..1edda75 100644 --- a/ComApp/android/app/src/main/res/values/styles.xml +++ b/ComApp/android/app/src/main/res/values/styles.xml @@ -1,9 +1,12 @@ - - - - + + + diff --git a/ComApp/package-lock.json b/ComApp/package-lock.json index b8fa537..6614bd6 100644 --- a/ComApp/package-lock.json +++ b/ComApp/package-lock.json @@ -19,6 +19,7 @@ "expo": "^46.0.13", "expo-av": "^12.0.4", "expo-barcode-scanner": "^11.4.0", + "expo-splash-screen": "^0.16.2", "expo-video-player": "^2.2.0", "i18n-js": "^4.1.1", "install": "^0.13.0", @@ -2539,6 +2540,77 @@ "node": ">=10" } }, + "node_modules/@expo/configure-splash-screen": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.6.0.tgz", + "integrity": "sha512-4DyPoNXJqx9bN4nEwF3HQreo//ECu7gDe1Xor3dnnzFm9P/VDxAKdbEhA0n+R6fgkNfT2onVHWijqvdpTS3Xew==", + "dependencies": { + "color-string": "^1.5.3", + "commander": "^5.1.0", + "fs-extra": "^9.0.0", + "glob": "^7.1.6", + "lodash": "^4.17.15", + "pngjs": "^5.0.0", + "xcode": "^3.0.0", + "xml-js": "^1.6.11" + }, + "bin": { + "configure-splash-screen": "build/index-cli.js", + "expo-splash-screen": "build/index-cli.js" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@expo/configure-splash-screen/node_modules/commander": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", + "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/@expo/configure-splash-screen/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@expo/configure-splash-screen/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/@expo/configure-splash-screen/node_modules/pngjs": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz", + "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==", + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/@expo/configure-splash-screen/node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/@expo/dev-server": { "version": "0.1.120", "resolved": "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.120.tgz", @@ -8436,6 +8508,18 @@ "invariant": "^2.2.4" } }, + "node_modules/expo-splash-screen": { + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/expo-splash-screen/-/expo-splash-screen-0.16.2.tgz", + "integrity": "sha512-AHSRyGwu58WNt8shW5g/4cQ9e9IzUwNTC/WGWxshHCwgbWIJmHLvK3+D45MTmzGWteOoTI8oV7KSQKBNJSTiyw==", + "dependencies": { + "@expo/configure-splash-screen": "^0.6.0", + "@expo/prebuild-config": "~5.0.0" + }, + "peerDependencies": { + "expo": "*" + } + }, "node_modules/expo-video-player": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/expo-video-player/-/expo-video-player-2.2.0.tgz", @@ -20258,6 +20342,17 @@ "uuid": "dist/bin/uuid" } }, + "node_modules/xml-js": { + "version": "1.6.11", + "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz", + "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==", + "dependencies": { + "sax": "^1.2.4" + }, + "bin": { + "xml-js": "bin/cli.js" + } + }, "node_modules/xml-name-validator": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", @@ -22030,6 +22125,58 @@ "resolved": "https://registry.npmjs.org/@expo/config-types/-/config-types-46.0.2.tgz", "integrity": "sha512-PXkmOgNwRyBfgVT1HmFZhfh3Qm7WKKyV6mk3/5HJ/LzPh1t+Zs2JrWX8U2YncTLV1QzV7nV8tnkyvszzqnZEzQ==" }, + "@expo/configure-splash-screen": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.6.0.tgz", + "integrity": "sha512-4DyPoNXJqx9bN4nEwF3HQreo//ECu7gDe1Xor3dnnzFm9P/VDxAKdbEhA0n+R6fgkNfT2onVHWijqvdpTS3Xew==", + "requires": { + "color-string": "^1.5.3", + "commander": "^5.1.0", + "fs-extra": "^9.0.0", + "glob": "^7.1.6", + "lodash": "^4.17.15", + "pngjs": "^5.0.0", + "xcode": "^3.0.0", + "xml-js": "^1.6.11" + }, + "dependencies": { + "commander": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", + "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" + }, + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "pngjs": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz", + "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==" + }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" + } + } + }, "@expo/dev-server": { "version": "0.1.120", "resolved": "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.120.tgz", @@ -26442,6 +26589,15 @@ "invariant": "^2.2.4" } }, + "expo-splash-screen": { + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/expo-splash-screen/-/expo-splash-screen-0.16.2.tgz", + "integrity": "sha512-AHSRyGwu58WNt8shW5g/4cQ9e9IzUwNTC/WGWxshHCwgbWIJmHLvK3+D45MTmzGWteOoTI8oV7KSQKBNJSTiyw==", + "requires": { + "@expo/configure-splash-screen": "^0.6.0", + "@expo/prebuild-config": "~5.0.0" + } + }, "expo-video-player": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/expo-video-player/-/expo-video-player-2.2.0.tgz", @@ -34898,6 +35054,14 @@ } } }, + "xml-js": { + "version": "1.6.11", + "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz", + "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==", + "requires": { + "sax": "^1.2.4" + } + }, "xml-name-validator": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", diff --git a/ComApp/package.json b/ComApp/package.json index 0298301..604d59b 100644 --- a/ComApp/package.json +++ b/ComApp/package.json @@ -21,6 +21,7 @@ "expo": "^46.0.13", "expo-av": "^12.0.4", "expo-barcode-scanner": "^11.4.0", + "expo-splash-screen": "^0.16.2", "expo-video-player": "^2.2.0", "i18n-js": "^4.1.1", "install": "^0.13.0", diff --git a/ComApp/src/App.js b/ComApp/src/App.js index 970ca30..db35376 100644 --- a/ComApp/src/App.js +++ b/ComApp/src/App.js @@ -8,6 +8,7 @@ import { TouchableOpacity, View, Image, Text, TextInput, StyleSheet, Alert } fro import Icon from 'react-native-vector-icons/FontAwesome5'; import FlashMessage, { showMessage } from 'react-native-flash-message'; +import * as SplashScreen from 'expo-splash-screen'; import LoginScreen from './Views/Login'; import HomeScreen from './Views/Home'; @@ -32,6 +33,8 @@ import Sync from './Controllers/Sync'; import Helpers from "./Controllers/Helpers"; import i18n from "./I18n"; +SplashScreen.preventAutoHideAsync(); + const initialState = { locale: 'fr', users: {}, diff --git a/ComApp/src/Views/Home.js b/ComApp/src/Views/Home.js index d5ae241..226e649 100644 --- a/ComApp/src/Views/Home.js +++ b/ComApp/src/Views/Home.js @@ -3,7 +3,7 @@ import { View, StyleSheet, ImageBackground, TouchableOpacity, Text, Image } from import { connect } from 'react-redux'; import NetInfo from '@react-native-community/netinfo'; import Sync from '../Controllers/Sync'; -//import SplashScreen from 'react-native-splash-screen'; +import * as SplashScreen from 'expo-splash-screen'; import i18n from "../I18n"; function mapStateToProps(state) { @@ -17,9 +17,9 @@ class HomeScreen extends React.Component { state = { lastSyncCall: '2020-02-12', }; - componentDidMount(): void { + componentDidMount() { this.props.dispatch({ type: 'INIT' }); - //SplashScreen.hide(); + SplashScreen.hideAsync(); } unsubscribe() { diff --git a/ComApp/yarn.lock b/ComApp/yarn.lock index 3b091ae..a837dfa 100644 --- a/ComApp/yarn.lock +++ b/ComApp/yarn.lock @@ -1247,6 +1247,20 @@ "slugify" "^1.3.4" "sucrase" "^3.20.0" +"@expo/configure-splash-screen@^0.6.0": + "integrity" "sha512-4DyPoNXJqx9bN4nEwF3HQreo//ECu7gDe1Xor3dnnzFm9P/VDxAKdbEhA0n+R6fgkNfT2onVHWijqvdpTS3Xew==" + "resolved" "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.6.0.tgz" + "version" "0.6.0" + dependencies: + "color-string" "^1.5.3" + "commander" "^5.1.0" + "fs-extra" "^9.0.0" + "glob" "^7.1.6" + "lodash" "^4.17.15" + "pngjs" "^5.0.0" + "xcode" "^3.0.0" + "xml-js" "^1.6.11" + "@expo/dev-server@~0.1.120": "integrity" "sha512-x5/jCv0EOpz6FyehXpI5bgDQTVsGZYvgISkAw7n60RhtG+aid6N2CCR9SDMCH70XaUpFnfTW9qvderpCEj7Puw==" "resolved" "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.120.tgz" @@ -1358,7 +1372,7 @@ "base64-js" "^1.2.3" "xmlbuilder" "^14.0.0" -"@expo/prebuild-config@~5.0.3": +"@expo/prebuild-config@~5.0.0", "@expo/prebuild-config@~5.0.3": "integrity" "sha512-G4j1H3WFjRaiQ+FgFNULrnIm7RsQyjc4xp6lLTP2ydBv79wO3x8wAdeZvaZh7eOkfu9BESpQzACT1uuJTag5jg==" "resolved" "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-5.0.3.tgz" "version" "5.0.3" @@ -3583,7 +3597,7 @@ "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" "version" "1.1.3" -"color-string@^1.6.0": +"color-string@^1.5.3", "color-string@^1.6.0": "integrity" "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==" "resolved" "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz" "version" "1.9.1" @@ -3640,6 +3654,11 @@ "resolved" "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz" "version" "4.1.1" +"commander@^5.1.0": + "integrity" "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" + "resolved" "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz" + "version" "5.1.0" + "commander@^7.2.0": "integrity" "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==" "resolved" "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" @@ -4721,6 +4740,14 @@ "compare-versions" "^3.4.0" "invariant" "^2.2.4" +"expo-splash-screen@^0.16.2": + "integrity" "sha512-AHSRyGwu58WNt8shW5g/4cQ9e9IzUwNTC/WGWxshHCwgbWIJmHLvK3+D45MTmzGWteOoTI8oV7KSQKBNJSTiyw==" + "resolved" "https://registry.npmjs.org/expo-splash-screen/-/expo-splash-screen-0.16.2.tgz" + "version" "0.16.2" + dependencies: + "@expo/configure-splash-screen" "^0.6.0" + "@expo/prebuild-config" "~5.0.0" + "expo-video-player@^2.2.0": "integrity" "sha512-DDai4zmTF265EHOagnWWA22o/xwP4FI1YVUzhTibN5vB3nLqSL9ABBI+H++I9T0p7sCRgQhgoy4whaWWcN4ZfQ==" "resolved" "https://registry.npmjs.org/expo-video-player/-/expo-video-player-2.2.0.tgz" @@ -8737,6 +8764,11 @@ "resolved" "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz" "version" "3.4.0" +"pngjs@^5.0.0": + "integrity" "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==" + "resolved" "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz" + "version" "5.0.0" + "posix-character-classes@^0.1.0": "integrity" "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==" "resolved" "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz" @@ -9652,7 +9684,7 @@ "minimist" "^1.1.1" "walker" "~1.0.5" -"sax@>=0.6.0": +"sax@^1.2.4", "sax@>=0.6.0": "integrity" "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" "resolved" "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz" "version" "1.2.4" @@ -11187,7 +11219,7 @@ "resolved" "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz" "version" "7.5.9" -"xcode@^3.0.1": +"xcode@^3.0.0", "xcode@^3.0.1": "integrity" "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==" "resolved" "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz" "version" "3.0.1" @@ -11195,6 +11227,13 @@ "simple-plist" "^1.1.0" "uuid" "^7.0.3" +"xml-js@^1.6.11": + "integrity" "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==" + "resolved" "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz" + "version" "1.6.11" + dependencies: + "sax" "^1.2.4" + "xml-name-validator@^3.0.0": "integrity" "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==" "resolved" "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz"