Browse Source

Updated expo and other libs to newer version

keplyx 1 year ago
parent
commit
a1a0e0b7f0

+ 4
- 5
App.js View File

@@ -1,15 +1,12 @@
1 1
 // @flow
2 2
 
3 3
 import * as React from 'react';
4
-import {StatusBar, Platform } from 'react-native';
4
+import {StatusBar, Platform} from 'react-native';
5 5
 import {Root, StyleProvider} from 'native-base';
6 6
 import {createAppContainerWithInitialRoute} from './navigation/AppNavigator';
7 7
 import ThemeManager from './utils/ThemeManager';
8 8
 import LocaleManager from './utils/LocaleManager';
9 9
 import * as Font from 'expo-font';
10
-// edited native-base-shoutem-theme according to
11
-// https://github.com/GeekyAnts/theme/pull/5/files/91f67c55ca6e65fe3af779586b506950c9f331be#diff-4cfc2dd4d5dae7954012899f2268a422
12
-// to allow for dynamic theme switching
13 10
 import {clearThemeCache} from 'native-base-shoutem-theme';
14 11
 import AsyncStorageManager from "./utils/AsyncStorageManager";
15 12
 import CustomIntroSlider from "./components/CustomIntroSlider";
@@ -81,6 +78,7 @@ export default class App extends React.Component<Props, State> {
81 78
         await Font.loadAsync({
82 79
             'Roboto': require('native-base/Fonts/Roboto.ttf'),
83 80
             'Roboto_medium': require('native-base/Fonts/Roboto_medium.ttf'),
81
+            'material-community': require('native-base/Fonts/MaterialCommunityIcons.ttf'),
84 82
         });
85 83
         await AsyncStorageManager.getInstance().loadPreferences();
86 84
         ThemeManager.getInstance().setUpdateThemeCallback(() => this.updateTheme());
@@ -118,7 +116,8 @@ export default class App extends React.Component<Props, State> {
118 116
             );
119 117
         }
120 118
         if (this.state.showIntro || this.state.showUpdate) {
121
-            return <CustomIntroSlider onDone={() => this.onIntroDone()} isUpdate={this.state.showUpdate && !this.state.showIntro}/>;
119
+            return <CustomIntroSlider onDone={() => this.onIntroDone()}
120
+                                      isUpdate={this.state.showUpdate && !this.state.showIntro}/>;
122 121
         } else {
123 122
             const AppNavigator = createAppContainerWithInitialRoute(AsyncStorageManager.getInstance().preferences.defaultStartScreen.current);
124 123
             return (

+ 1
- 1
app.json View File

@@ -4,7 +4,7 @@
4 4
     "description": "Application mobile compatible Android et iOS pour l'Amicale INSA Toulouse. Grâce à cette application, vous avez facilement accès aux news du campus, aux emplois du temps, à l'état de la laverie, et bien d'autres services ! Ceci est une version Beta, Toutes les fonctionnalités ne sont pas encore implémentées, et il est possible de rencontrer quelques bugs.",
5 5
     "slug": "application-amicale",
6 6
     "privacy": "public",
7
-    "sdkVersion": "33.0.0",
7
+    "sdkVersion": "36.0.0",
8 8
     "platforms": [
9 9
       "ios",
10 10
       "android",

+ 1
- 0
clear-node-cache.sh View File

@@ -0,0 +1 @@
1
+rm -rf node_modules/ && rm -f package-lock.json && rm -f yarn.lock && npm cache verify && npm install && expo r -c

+ 7
- 5
navigation/MainTabNavigator.js View File

@@ -26,18 +26,20 @@ function createMaterialBottomTabNavigatorWithInitialRoute(initialRoute: string)
26 26
         Proximo: {screen: ProximoMainScreen,},
27 27
         Planex: {
28 28
             screen: PlanexScreen,
29
-            navigationOptions: ({ navigation }) => {
29
+            navigationOptions: ({navigation}) => {
30 30
                 const showTabBar = navigation.state && navigation.state.params ? navigation.state.params.showTabBar : true;
31 31
                 return {
32 32
                     tabBarVisible: showTabBar,
33 33
                 };
34
-            },},
34
+            },
35
+        },
35 36
     }, {
36 37
         defaultNavigationOptions: ({navigation}) => ({
37
-            tabBarIcon: ({focused, horizontal, tintColor}) => {
38
+            tabBarIcon: ({focused, tintColor}) => {
38 39
                 let icon = TAB_ICONS[navigation.state.routeName];
39
-
40
-                return <CustomMaterialIcon icon={icon} color={tintColor}/>;
40
+                // tintColor is ignoring activeColor et inactiveColor for some reason
41
+                let color = focused ? "#f0edf6" : "#4e1108";
42
+                return <CustomMaterialIcon icon={icon} color={color}/>;
41 43
             },
42 44
             tabBarVisible: true,
43 45
         }),

+ 18
- 16
package.json View File

@@ -8,38 +8,40 @@
8 8
     "eject": "expo eject"
9 9
   },
10 10
   "dependencies": {
11
-    "@expo/vector-icons": "^10.0.2",
11
+    "@expo/vector-icons": "^10.0.0",
12 12
     "@react-native-community/status-bar": "^1.0.3",
13 13
     "@shoutem/theme": "^0.11.3",
14
-    "expo": "^33.0.7",
15
-    "expo-font": "^5.0.1",
16
-    "expo-linear-gradient": "^5.0.1",
17
-    "expo-localization": "^5.0.1",
18
-    "expo-permissions": "^5.0.1",
14
+    "expo": "^36.0.0",
15
+    "expo-font": "~8.0.0",
16
+    "expo-linear-gradient": "~8.0.0",
17
+    "expo-localization": "~8.0.0",
18
+    "expo-permissions": "~8.0.0",
19 19
     "i18n-js": "^3.3.0",
20 20
     "native-base": "^2.12.1",
21
-    "native-base-shoutem-theme": "^0.2.3",
22
-    "react": "^16.8.6",
23
-    "react-dom": "^16.8.6",
24
-    "react-native": "^0.59.9",
21
+    "native-base-shoutem-theme": "^0.3.1",
22
+    "react": "16.9.0",
23
+    "react-dom": "16.9.0",
24
+    "react-native": "https://github.com/expo/react-native/archive/sdk-36.0.1.tar.gz",
25 25
     "react-native-app-intro-slider": "^3.0.0",
26 26
     "react-native-autolink": "^1.8.1",
27 27
     "react-native-calendars": "^1.212.0",
28
+    "react-native-gesture-handler": "~1.5.0",
29
+    "react-native-material-menu": "^0.6.7",
28 30
     "react-native-modal": "^11.3.1",
29
-    "react-native-modalize": "^1.2.1",
31
+    "react-native-modalize": "^1.3.6",
30 32
     "react-native-paper": "^2.16.0",
31 33
     "react-native-platform-touchable": "^1.1.1",
34
+    "react-native-reanimated": "~1.4.0",
32 35
     "react-native-render-html": "^4.1.2",
33 36
     "react-native-side-menu": "^1.1.3",
34 37
     "react-native-status-bar-height": "^2.3.1",
35
-    "react-native-webview": "^5.8.1",
36
-    "react-navigation": "^3.11.0",
37
-    "react-navigation-material-bottom-tabs": "^1.0.0",
38
+    "react-native-webview": "7.4.3",
39
+    "react-navigation": "^3.13.0",
40
+    "react-navigation-material-bottom-tabs": "^1.1.1",
38 41
     "react-navigation-transitions": "^1.0.12"
39 42
   },
40 43
   "devDependencies": {
41
-    "babel-preset-expo": "^5.1.1",
42
-    "react-native-material-menu": "^0.6.3"
44
+    "babel-preset-expo": "^8.0.0"
43 45
   },
44 46
   "private": true
45 47
 }

+ 1
- 1
screens/About/AboutScreen.js View File

@@ -9,7 +9,7 @@ import appJson from '../../app';
9 9
 import packageJson from '../../package';
10 10
 import CustomMaterialIcon from "../../components/CustomMaterialIcon";
11 11
 import AsyncStorageManager from "../../utils/AsyncStorageManager";
12
-import Modalize from "react-native-modalize";
12
+import {Modalize} from "react-native-modalize";
13 13
 import ThemeManager from "../../utils/ThemeManager";
14 14
 
15 15
 const links = {

+ 1
- 1
screens/DebugScreen.js View File

@@ -28,7 +28,7 @@ import Touchable from "react-native-platform-touchable";
28 28
 import {Alert, View, Clipboard, Image} from "react-native";
29 29
 import AsyncStorageManager from "../utils/AsyncStorageManager";
30 30
 import NotificationsManager from "../utils/NotificationsManager";
31
-import Modalize from "react-native-modalize";
31
+import {Modalize} from "react-native-modalize";
32 32
 
33 33
 type Props = {
34 34
     navigation: Object,

+ 1
- 1
screens/PlanningScreen.js View File

@@ -11,7 +11,7 @@ import BaseContainer from "../components/BaseContainer";
11 11
 import {Agenda, LocaleConfig} from 'react-native-calendars';
12 12
 import HTML from 'react-native-render-html';
13 13
 import Touchable from 'react-native-platform-touchable';
14
-import Modalize from 'react-native-modalize';
14
+import {Modalize} from 'react-native-modalize';
15 15
 import WebDataManager from "../utils/WebDataManager";
16 16
 import CustomMaterialIcon from "../components/CustomMaterialIcon";
17 17
 

+ 1
- 1
screens/Proximo/ProximoListScreen.js View File

@@ -9,7 +9,7 @@ import Menu, {MenuItem} from 'react-native-material-menu';
9 9
 import i18n from "i18n-js";
10 10
 import CustomMaterialIcon from "../../components/CustomMaterialIcon";
11 11
 import ThemeManager from "../../utils/ThemeManager";
12
-import Modalize from 'react-native-modalize';
12
+import {Modalize} from 'react-native-modalize';
13 13
 
14 14
 const sortMode = {
15 15
     price: "0",

Loading…
Cancel
Save