diff --git a/app.json b/app.json index 856c730..c1d4323 100644 --- a/app.json +++ b/app.json @@ -10,7 +10,7 @@ "android", "web" ], - "version": "0.0.10", + "version": "0.0.12", "orientation": "portrait", "primaryColor": "#be1522", "icon": "./assets/android.icon.png", diff --git a/components/Sidebar.js b/components/Sidebar.js index 0dcf390..0ff84ed 100644 --- a/components/Sidebar.js +++ b/components/Sidebar.js @@ -130,8 +130,7 @@ export default class SideBar extends React.Component { const styles = StyleSheet.create({ drawerCover: { - alignSelf: "stretch", - height: deviceHeight / 4, + height: deviceHeight / 5, width: null, position: "relative", marginBottom: 10, diff --git a/utils/LocaleManager.js b/utils/LocaleManager.js index b0bf120..5b7b28d 100644 --- a/utils/LocaleManager.js +++ b/utils/LocaleManager.js @@ -19,4 +19,8 @@ export default class LocaleManager { i18n.translations = {fr, en}; i18n.locale = Localization.locale; } + + static getCurrentLocale() { + return Localization.locale; + } } diff --git a/utils/NotificationsManager.js b/utils/NotificationsManager.js index 2cc3b3e..811d505 100644 --- a/utils/NotificationsManager.js +++ b/utils/NotificationsManager.js @@ -3,6 +3,7 @@ import * as Permissions from 'expo-permissions'; import {Notifications} from 'expo'; import AsyncStorageManager from "./AsyncStorageManager"; +import LocaleManager from "./LocaleManager"; const EXPO_TOKEN_SERVER = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/expo_notifications/save_token.php'; @@ -139,6 +140,7 @@ export default class NotificationsManager { } let data = { function: 'setup_machine_notification', + locale: LocaleManager.getCurrentLocale(), token: token, machine_id: machineID, enabled: isEnabled