diff --git a/app.json b/app.json index 8cf82b8..12852e3 100644 --- a/app.json +++ b/app.json @@ -1,6 +1,6 @@ { "expo": { - "name": "COFFEE", + "name": "CAMPUS - Amicale INSAT", "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.", "slug": "application-amicale", "privacy": "public", @@ -10,18 +10,18 @@ "android", "web" ], - "version": "0.0.8", + "version": "0.0.9", "orientation": "portrait", "primaryColor": "#be1522", "icon": "./assets/android.icon.png", "splash": { - "backgroundColor": "#222222", + "backgroundColor": "#be1522", "resizeMode": "contain", "image": "./assets/splash.png" }, "notification": { - "icon": "./assets/amicale-notification.png", - "color": "#e42612", + "icon": "./assets/icon-notification.png", + "color": "#be1522", "androidMode": "default" }, "updates": { @@ -31,17 +31,16 @@ "**/*" ], "ios": { - "bundleIdentifier": "amicale.insat.application", - "buildNumber": "0.0.6", + "bundleIdentifier": "fr.amicaleinsat.application", "icon": "./assets/ios.icon.png" }, "android": { - "package": "amicale.insat.application", + "package": "fr.amicaleinsat.application", "versionCode": 1, "icon": "./assets/android.icon.png", "adaptiveIcon": { "foregroundImage": "./assets/android.adaptive-icon.png", - "backgroundColor": "#ffffff" + "backgroundColor": "#be1522" }, "permissions": [ "VIBRATE" diff --git a/assets/amicale-notification.png b/assets/amicale-notification.png deleted file mode 100644 index b7a4789..0000000 Binary files a/assets/amicale-notification.png and /dev/null differ diff --git a/assets/android.adaptive-icon.png b/assets/android.adaptive-icon.png index 24d4b41..4fa2901 100644 Binary files a/assets/android.adaptive-icon.png and b/assets/android.adaptive-icon.png differ diff --git a/assets/android.icon.png b/assets/android.icon.png index 24d4b41..1a11890 100644 Binary files a/assets/android.icon.png and b/assets/android.icon.png differ diff --git a/assets/drawer-cover.png b/assets/drawer-cover.png index 14a8169..3d8e6fb 100644 Binary files a/assets/drawer-cover.png and b/assets/drawer-cover.png differ diff --git a/assets/icon-notification.png b/assets/icon-notification.png new file mode 100644 index 0000000..657e76f Binary files /dev/null and b/assets/icon-notification.png differ diff --git a/assets/icon.png b/assets/icon.png index 7546192..14422dd 100644 Binary files a/assets/icon.png and b/assets/icon.png differ diff --git a/assets/ios.icon.png b/assets/ios.icon.png index 2080cbb..f87e2b3 100644 Binary files a/assets/ios.icon.png and b/assets/ios.icon.png differ diff --git a/assets/splash.png b/assets/splash.png index 58a922e..6bad40e 100644 Binary files a/assets/splash.png and b/assets/splash.png differ diff --git a/components/CustomIntroSlider.js b/components/CustomIntroSlider.js index 7d91ed9..69eb4db 100644 --- a/components/CustomIntroSlider.js +++ b/components/CustomIntroSlider.js @@ -18,8 +18,9 @@ const styles = StyleSheet.create({ paddingBottom: 100 }, image: { - width: 200, - height: 200, + width: 300, + height: 300, + marginBottom: -50, }, text: { color: 'rgba(255, 255, 255, 0.8)', @@ -51,7 +52,7 @@ export default class CustomIntroSlider extends React.Component { key: '1', title: i18n.t('intro.slide1.title'), text: i18n.t('intro.slide1.text'), - image: require('../assets/drawer-cover.png'), + image: require('../assets/splash.png'), colors: ['#e01928', '#be1522'], }, { diff --git a/navigation/MainTabNavigator.js b/navigation/MainTabNavigator.js index ed8c965..2a5b3e1 100644 --- a/navigation/MainTabNavigator.js +++ b/navigation/MainTabNavigator.js @@ -10,7 +10,7 @@ import CustomMaterialIcon from "../components/CustomMaterialIcon"; import ThemeManager from "../utils/ThemeManager"; const TAB_ICONS = { - Home: 'coffee', + Home: 'triangle', Planning: 'calendar-range', Proxiwash: 'washing-machine', Proximo: 'shopping', diff --git a/translations/en.json b/translations/en.json index 00bea47..8b1a9f4 100644 --- a/translations/en.json +++ b/translations/en.json @@ -10,16 +10,16 @@ }, "intro": { "slide1": { - "title": "Welcome to COFFEE", + "title": "Welcome to CAMPUS", "text": "The new app to use during your coffee break to get updates on the campus life!" }, "slide2": { "title": "Stay up to date", - "text": "COFFEE will soon allow you to be aware of any event occuring on the campus, from pancake sales to Enfoiros concerts!" + "text": "CAMPUS will soon allow you to be aware of any event occuring on the campus, from pancake sales to Enfoiros concerts!" }, "slide3": { "title": "Never forget your laundry", - "text": "COFFEE will inform you on the availability of washing machines and will remind you just before yours finishes !" + "text": "CAMPUS will inform you on the availability of washing machines and will remind you just before yours finishes !" }, "slide4": { "title": "Proximo", @@ -27,7 +27,7 @@ }, "slide5": { "title": "Planex", - "text": "Lookup your timetable on COFFE" + "text": "Lookup your timetable on CAMPUS" }, "slide6": { "title": "Still in development", diff --git a/translations/fr.json b/translations/fr.json index d748995..242b268 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -10,16 +10,16 @@ }, "intro": { "slide1": { - "title": "Bienvenue sur COFFEE", + "title": "Bienvenue sur CAMPUS", "text": "La nouvelle app à consulter pendant la pause café pour être au courant de la vie du campus !" }, "slide2": { "title": "Restez informés", - "text": "COFFEE vous permettra bientôt d'être au courant de tous les événements qui ont lieu sur le campus, de la vente de crêpes jusqu'aux concerts enfoiros !" + "text": "CAMPUS vous permettra bientôt d'être au courant de tous les événements qui ont lieu sur le campus, de la vente de crêpes jusqu'aux concerts enfoiros !" }, "slide3": { "title": "N'oubliez plus votre linge !", - "text": "COFFEE vous informe de la disponibilité des machines et vous permet d'être notifiés lorsque la vôtre se termine bientôt !" + "text": "CAMPUS vous informe de la disponibilité des machines et vous permet d'être notifiés lorsque la vôtre se termine bientôt !" }, "slide4": { "title": "Proximo", @@ -27,7 +27,7 @@ }, "slide5": { "title": "Planex", - "text": "Consultez votre emploi du temps sur COFFEE" + "text": "Consultez votre emploi du temps sur CAMPUS" }, "slide6": { "title": "Toujours en développement", diff --git a/utils/NotificationsManager.js b/utils/NotificationsManager.js index b281641..cce535e 100644 --- a/utils/NotificationsManager.js +++ b/utils/NotificationsManager.js @@ -93,7 +93,7 @@ export default class NotificationsManager { */ static async initExpoToken() { let token = AsyncStorageManager.getInstance().preferences.expoToken.current; - if (AsyncStorageManager.getInstance().preferences.expoToken.current === '') { + if (token === '') { let expoToken = await Notifications.getExpoPushTokenAsync(); // Save token for instant use later on AsyncStorageManager.getInstance().savePref(AsyncStorageManager.getInstance().preferences.expoToken.key, expoToken);