diff --git a/App.js b/App.js index c247795..c46ae1d 100644 --- a/App.js +++ b/App.js @@ -17,6 +17,7 @@ import ConnectionManager from "./src/managers/ConnectionManager"; import URLHandler from "./src/utils/URLHandler"; import {setSafeBounceHeight} from "react-navigation-collapsible"; import {enableScreens} from 'react-native-screens'; +import SplashScreen from 'react-native-splash-screen' // Native optimizations https://reactnavigation.org/docs/react-native-screens enableScreens(true); @@ -175,6 +176,7 @@ export default class App extends React.Component { showUpdate: this.storageManager.preferences.updateNumber.current !== Update.number.toString(), showAprilFools: AprilFoolsManager.getInstance().isAprilFoolsEnabled() && this.storageManager.preferences.showAprilFoolsStart.current === '1', }); + SplashScreen.hide(); } /** diff --git a/android/app/src/main/java/fr/amicaleinsat/application/MainActivity.java b/android/app/src/main/java/fr/amicaleinsat/application/MainActivity.java index df6893f..59aaa6f 100644 --- a/android/app/src/main/java/fr/amicaleinsat/application/MainActivity.java +++ b/android/app/src/main/java/fr/amicaleinsat/application/MainActivity.java @@ -1,5 +1,6 @@ package fr.amicaleinsat.application; +import android.os.Bundle; import com.facebook.react.ReactActivity; import com.facebook.react.ReactActivityDelegate; import com.facebook.react.ReactRootView; @@ -7,6 +8,8 @@ import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView; import android.content.Intent; import android.content.res.Configuration; +import org.devio.rn.splashscreen.SplashScreen; + public class MainActivity extends ReactActivity { // Added automatically by Expo Config @@ -18,6 +21,11 @@ public class MainActivity extends ReactActivity { sendBroadcast(intent); } + @Override + protected void onCreate(Bundle savedInstanceState) { + SplashScreen.show(this); + super.onCreate(savedInstanceState); + } /** * Returns the name of the main component registered from JavaScript. diff --git a/android/app/src/main/java/fr/amicaleinsat/application/generated/BasePackageList.java b/android/app/src/main/java/fr/amicaleinsat/application/generated/BasePackageList.java index 23e3aef..0b8a095 100644 --- a/android/app/src/main/java/fr/amicaleinsat/application/generated/BasePackageList.java +++ b/android/app/src/main/java/fr/amicaleinsat/application/generated/BasePackageList.java @@ -21,7 +21,6 @@ public class BasePackageList { new expo.modules.permissions.PermissionsPackage(), new expo.modules.securestore.SecureStorePackage(), new expo.modules.sqlite.SQLitePackage(), - new expo.modules.updates.UpdatesPackage(), new expo.modules.webbrowser.WebBrowserPackage() ); } diff --git a/android/app/src/main/res/drawable-xxhdpi/launch_screen.png b/android/app/src/main/res/drawable-xxhdpi/launch_screen.png new file mode 100644 index 0000000..7629d1a Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/launch_screen.png differ diff --git a/android/app/src/main/res/layout/launch_screen.xml b/android/app/src/main/res/layout/launch_screen.xml new file mode 100644 index 0000000..cf02f24 --- /dev/null +++ b/android/app/src/main/res/layout/launch_screen.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index ae05383..df66843 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -4,4 +4,5 @@ #121212 #be1522 #be1522 + #be1522 \ No newline at end of file diff --git a/ios/Podfile b/ios/Podfile index 71d2d82..2600a9c 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -43,4 +43,5 @@ target 'Campus' do # react-native-cli autolinking use_native_modules! + end diff --git a/package.json b/package.json index 1f57527..03dbad8 100644 --- a/package.json +++ b/package.json @@ -18,21 +18,13 @@ ] }, "dependencies": { - "expo": "^37.0.0", - "react": "~16.9.0", - "react-dom": "16.9.0", - "react-native": "~0.61.5", - "react-native-gesture-handler": "~1.6.0", - "react-native-reanimated": "~1.7.0", - "react-native-screens": "~2.2.0", - "react-native-unimodules": "~0.9.0", - "react-native-web": "~0.11.7", "@expo/vector-icons": "^10.0.0", "@react-native-community/masked-view": "0.1.6", "@react-navigation/bottom-tabs": "^5.1.1", "@react-navigation/drawer": "^5.1.1", "@react-navigation/native": "^5.0.9", "@react-navigation/stack": "^5.1.1", + "expo": "^37.0.0", "expo-barcode-scanner": "~8.1.0", "expo-camera": "latest", "expo-linear-gradient": "~8.1.0", @@ -40,17 +32,26 @@ "expo-permissions": "~8.1.0", "expo-secure-store": "~8.1.0", "i18n-js": "^3.3.0", + "react": "~16.9.0", + "react-dom": "16.9.0", + "react-native": "~0.61.5", "react-native-animatable": "^1.3.3", "react-native-app-intro-slider": "^4.0.0", "react-native-appearance": "~0.3.3", "react-native-autolink": "^3.0.0", "react-native-calendars": "^1.260.0", "react-native-collapsible": "^1.5.2", + "react-native-gesture-handler": "~1.6.0", "react-native-image-modal": "^1.0.6", "react-native-modalize": "^1.3.6", "react-native-paper": "^3.8.0", + "react-native-reanimated": "~1.7.0", "react-native-render-html": "^4.1.2", "react-native-safe-area-context": "0.7.3", + "react-native-screens": "~2.2.0", + "react-native-splash-screen": "^3.2.0", + "react-native-unimodules": "~0.9.0", + "react-native-web": "~0.11.7", "react-native-webview": "8.1.1", "react-navigation-collapsible": "^5.5.0", "react-navigation-header-buttons": "^3.0.5"