diff --git a/ComApp/android/app/src/main/ic_launcher-playstore.png b/ComApp/android/app/src/main/ic_launcher-playstore.png index 9937cab..4e57a10 100644 Binary files a/ComApp/android/app/src/main/ic_launcher-playstore.png and b/ComApp/android/app/src/main/ic_launcher-playstore.png differ diff --git a/ComApp/android/app/src/main/res/drawable/launch_screen.png b/ComApp/android/app/src/main/res/drawable/launch_screen.png deleted file mode 100644 index 9449be2..0000000 Binary files a/ComApp/android/app/src/main/res/drawable/launch_screen.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/drawable/splashscreen_image.png b/ComApp/android/app/src/main/res/drawable/splashscreen_image.png index c6fb561..eccf00c 100644 Binary files a/ComApp/android/app/src/main/res/drawable/splashscreen_image.png and b/ComApp/android/app/src/main/res/drawable/splashscreen_image.png differ diff --git a/ComApp/android/app/src/main/res/layout/launch_screen.xml b/ComApp/android/app/src/main/res/layout/launch_screen.xml deleted file mode 100644 index 323780c..0000000 --- a/ComApp/android/app/src/main/res/layout/launch_screen.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - diff --git a/ComApp/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/ComApp/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 036d09b..0000000 --- a/ComApp/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ComApp/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/ComApp/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09b..0000000 --- a/ComApp/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..5d7480a Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 5fab4fe..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..91ade79 Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..918ac8f Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 40265af..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..9b96a2b Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..722d47b Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index 0919a4a..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..f9b858e Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..319ea2b Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index bbd6492..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..f1127a5 Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..3d28f62 Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index b4ba36d..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..2117232 Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/ComApp/android/build.gradle b/ComApp/android/build.gradle index bb4dd1b..1f3151e 100644 --- a/ComApp/android/build.gradle +++ b/ComApp/android/build.gradle @@ -60,7 +60,6 @@ project.rootProject.allprojects { resolutionStrategy { force "com.facebook.react:react-native:0.70.+" force "com.facebook.react:hermes-engine:0.70.+" - //force 'androidx.work:work-runtime:2.6.0' } } } \ No newline at end of file diff --git a/ComApp/src/App.js b/ComApp/src/App.js index 8bc36ac..4d15fab 100644 --- a/ComApp/src/App.js +++ b/ComApp/src/App.js @@ -1,4 +1,3 @@ -// V2 import React from 'react'; // Redux import { Provider } from 'react-redux'; @@ -32,16 +31,14 @@ import SearchScreen from "./App/Views/SearchScreen"; import MySpaceScreen from './App/Views/MySpaceScreen'; // Style import styles from './Resources/Styles/NavigationStyle'; -// END V2 -// V2 -//SplashScreen.preventAutoHideAsync(); //Keep + +SplashScreen.preventAutoHideAsync(); //Keep store.dispatch({ type: 'INIT' }); store.dispatch({ type: 'INIT_LOCALE' }); store.dispatch({ type: 'INIT_USERS' }); const Stack = createNativeStackNavigator(); -// END V2 class App extends React.Component { state = { @@ -280,6 +277,7 @@ class App extends React.Component { } LogoTitle(navigation, title, wantBtn = true) { + console.log(this.state.isSetup) return ( { @@ -295,7 +293,7 @@ class App extends React.Component { ) : ( )} diff --git a/ComApp/src/App/Store/Reducers/AppReducer.js b/ComApp/src/App/Store/Reducers/AppReducer.js index 8b0ebed..c3110b8 100644 --- a/ComApp/src/App/Store/Reducers/AppReducer.js +++ b/ComApp/src/App/Store/Reducers/AppReducer.js @@ -12,7 +12,7 @@ const initialState = { currentOpenedDoc: {}, ShowIsActive: 0, HomeBtns: {}, - mainColor: '#ea4f52' + mainColor: '#D4021D' }; const reducer = (state = initialState, action) => { diff --git a/ComApp/src/App/Views/HomeScreen.js b/ComApp/src/App/Views/HomeScreen.js index 8c6d878..35c3979 100644 --- a/ComApp/src/App/Views/HomeScreen.js +++ b/ComApp/src/App/Views/HomeScreen.js @@ -7,6 +7,8 @@ import { connect } from 'react-redux'; import { initDocuments } from '../Store/Actions/documents'; import { initContact } from '../Store/Actions/contacts'; import { initDirectories } from '../Store/Actions/directories'; +// SplashScreen +import * as SplashScreen from 'expo-splash-screen'; // Style import styles from '../../Resources/Styles/HomeStyle'; // Translations @@ -50,6 +52,8 @@ class HomeScreen extends React.Component { this.props.initBtns(); this.props.initContact(this.props.currentUser); this.props.initDirectories(this.props.locale.value, this.props.currentUser); + + SplashScreen.hideAsync(); } unsubscribe() { diff --git a/ComApp/src/App/Views/InstallScreen.js b/ComApp/src/App/Views/InstallScreen.js index 5872834..3373e89 100644 --- a/ComApp/src/App/Views/InstallScreen.js +++ b/ComApp/src/App/Views/InstallScreen.js @@ -2,6 +2,8 @@ import React from 'react'; import { ImageBackground, View, Image, Text, TextInput, Button, Alert } from 'react-native'; // Redux import { connect } from 'react-redux'; +// SplashScreen +import * as SplashScreen from 'expo-splash-screen'; // Helpers import Helpers from '../Lib/Helpers'; // Lodash @@ -29,6 +31,7 @@ function mapStateToProps(state) { const mapDispatchToProps = dispatch => { return { setIsSetup: () => dispatch({ type: 'SET_ISSETUP' }), + init: () => dispatch({ type: 'INIT' }) }; }; class InstallScreen extends React.Component { @@ -38,6 +41,10 @@ class InstallScreen extends React.Component { url: "https://dev-app.rhd-ldc.fr", } + componentDidMount() { + SplashScreen.hideAsync(); + } + render() { return ( @@ -154,6 +161,7 @@ class InstallScreen extends React.Component { resUsers.forEach(user => { User.add(user); }); + this.props.init(); this.props.setIsSetup(); this.props.navigation.navigate('LoginScreen'); } diff --git a/ComApp/src/App/Views/LoginScreen.js b/ComApp/src/App/Views/LoginScreen.js index eabfcb0..ea0b33e 100644 --- a/ComApp/src/App/Views/LoginScreen.js +++ b/ComApp/src/App/Views/LoginScreen.js @@ -2,6 +2,8 @@ import React from 'react'; import { View, ImageBackground, TextInput, Button, Image, Alert } from 'react-native'; // Redux import { connect } from 'react-redux'; +// SplashScreen +import * as SplashScreen from 'expo-splash-screen'; // Common Styles import commonStyles from '../../Resources/CommonStyles'; // Style @@ -41,6 +43,7 @@ class LoginScreen extends React.Component { if (SyncController.isLogged()) { this.props.setCurrentUser(false); } + SplashScreen.hideAsync(); } render() { diff --git a/ComApp/src/Resources/assets/img/background_ldc.png b/ComApp/src/Resources/assets/img/background_ldc.png index f32bb09..916a957 100644 Binary files a/ComApp/src/Resources/assets/img/background_ldc.png and b/ComApp/src/Resources/assets/img/background_ldc.png differ diff --git a/ComApp/src/Resources/assets/img/logo-square-ldc.png b/ComApp/src/Resources/assets/img/logo-square-ldc.png index 58c494b..d8d270b 100644 Binary files a/ComApp/src/Resources/assets/img/logo-square-ldc.png and b/ComApp/src/Resources/assets/img/logo-square-ldc.png differ diff --git a/ComApp/src/Resources/assets/img/logo.png b/ComApp/src/Resources/assets/img/logo.png new file mode 100644 index 0000000..c5f44e3 Binary files /dev/null and b/ComApp/src/Resources/assets/img/logo.png differ diff --git a/ComApp/src/Resources/assets/img/splashscreen.png b/ComApp/src/Resources/assets/img/splashscreen.png new file mode 100644 index 0000000..eccf00c Binary files /dev/null and b/ComApp/src/Resources/assets/img/splashscreen.png differ