saint-lo/application-amicale
1
0
Fork 0
forked from vergnet/application-amicale
Code Issues Pull requests Releases Wiki Activity

Send locale to notification server, fixed sidebar image on long displays

Browse source
This commit is contained in:
keplyx 2019-08-22 11:41:34 +02:00
parent f228ed0cee
commit a99e8da6e4
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app.json
View file

@ -10,7 +10,7 @@
"android", "android",
"web" "web"
], ],
"version": "0.0.10", "version": "0.0.12",
"orientation": "portrait", "orientation": "portrait",
"primaryColor": "#be1522", "primaryColor": "#be1522",
"icon": "./assets/android.icon.png", "icon": "./assets/android.icon.png",

3
components/Sidebar.js
View file

@ -130,8 +130,7 @@ export default class SideBar extends React.Component<Props, State> {
const styles = StyleSheet.create({ const styles = StyleSheet.create({
drawerCover: { drawerCover: {
alignSelf: "stretch", height: deviceHeight / 5,
height: deviceHeight / 4,
width: null, width: null,
position: "relative", position: "relative",
marginBottom: 10, marginBottom: 10,

4
utils/LocaleManager.js
View file

@ -19,4 +19,8 @@ export default class LocaleManager {
i18n.translations = {fr, en}; i18n.translations = {fr, en};
i18n.locale = Localization.locale; i18n.locale = Localization.locale;
} }
static getCurrentLocale() {
return Localization.locale;
}
} }

2
utils/NotificationsManager.js
View file

@ -3,6 +3,7 @@
import * as Permissions from 'expo-permissions'; import * as Permissions from 'expo-permissions';
import {Notifications} from 'expo'; import {Notifications} from 'expo';
import AsyncStorageManager from "./AsyncStorageManager"; 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'; 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 = { let data = {
function: 'setup_machine_notification', function: 'setup_machine_notification',
locale: LocaleManager.getCurrentLocale(),
token: token, token: token,
machine_id: machineID, machine_id: machineID,
enabled: isEnabled enabled: isEnabled