Compare commits
No commits in common. "0ab9413f6a4871936c97a918801ca633a1e3ac3c" and "0e566c44c5fdd71910f3161054f4cc6198a2f7f0" have entirely different histories.
0ab9413f6a
...
0e566c44c5
5 changed files with 5 additions and 23 deletions
4
app.json
4
app.json
|
|
@ -10,7 +10,7 @@
|
||||||
"android",
|
"android",
|
||||||
"web"
|
"web"
|
||||||
],
|
],
|
||||||
"version": "1.3.1",
|
"version": "1.3.0",
|
||||||
"orientation": "portrait",
|
"orientation": "portrait",
|
||||||
"primaryColor": "#be1522",
|
"primaryColor": "#be1522",
|
||||||
"icon": "./assets/android.icon.png",
|
"icon": "./assets/android.icon.png",
|
||||||
|
|
@ -36,7 +36,7 @@
|
||||||
},
|
},
|
||||||
"android": {
|
"android": {
|
||||||
"package": "fr.amicaleinsat.application",
|
"package": "fr.amicaleinsat.application",
|
||||||
"versionCode": 11,
|
"versionCode": 10,
|
||||||
"icon": "./assets/android.icon.png",
|
"icon": "./assets/android.icon.png",
|
||||||
"adaptiveIcon": {
|
"adaptiveIcon": {
|
||||||
"foregroundImage": "./assets/android.adaptive-icon.png",
|
"foregroundImage": "./assets/android.adaptive-icon.png",
|
||||||
|
|
|
||||||
|
|
@ -198,13 +198,6 @@ export default class WebViewScreen extends React.Component<Props, State> {
|
||||||
elevation: 0, // Fix for android shadow
|
elevation: 0, // Fix for android shadow
|
||||||
}}
|
}}
|
||||||
locked={true}
|
locked={true}
|
||||||
style = {{
|
|
||||||
paddingTop: this.state.isLandscape ? 20 : 0,
|
|
||||||
backgroundColor: Platform.OS === 'ios' ?
|
|
||||||
ThemeManager.getCurrentThemeVariables().tabDefaultBg :
|
|
||||||
ThemeManager.getCurrentThemeVariables().brandPrimary
|
|
||||||
}}
|
|
||||||
|
|
||||||
>
|
>
|
||||||
{this.getTabbedWebview()}
|
{this.getTabbedWebview()}
|
||||||
</Tabs>}
|
</Tabs>}
|
||||||
|
|
|
||||||
|
|
@ -35,14 +35,7 @@ export default class AvailableRoomScreen extends React.Component<Props> {
|
||||||
|
|
||||||
this.customBibInjectedJS =
|
this.customBibInjectedJS =
|
||||||
'document.querySelector(\'head\').innerHTML += \'<meta name="viewport" content="width=device-width, initial-scale=1.0">\';' +
|
'document.querySelector(\'head\').innerHTML += \'<meta name="viewport" content="width=device-width, initial-scale=1.0">\';' +
|
||||||
'document.querySelector(\'head\').innerHTML += \'<link rel="stylesheet" href="' + CUSTOM_CSS_Bib + '" type="text/css"/>\';' +
|
'document.querySelector(\'head\').innerHTML += \'<link rel="stylesheet" href="' + CUSTOM_CSS_Bib + '" type="text/css"/>\';';
|
||||||
'if ($(".hero-unit-form").length > 0 && $("#customBackButton").length === 0)' +
|
|
||||||
'$(".hero-unit-form").append("' +
|
|
||||||
'<div style=\'width: 100%; display: flex\'>' +
|
|
||||||
'<a style=\'margin: auto\' href=\'' + BIB_URL + '\'>' +
|
|
||||||
'<button id=\'customBackButton\' class=\'btn btn-primary\'>Retour</button>' +
|
|
||||||
'</a>' +
|
|
||||||
'</div>");true;';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ export default class PlanexScreen extends React.Component<Props> {
|
||||||
'document.querySelector(\'head\').innerHTML += \'<meta name="viewport" content="width=device-width, initial-scale=1.0">\';' +
|
'document.querySelector(\'head\').innerHTML += \'<meta name="viewport" content="width=device-width, initial-scale=1.0">\';' +
|
||||||
'document.querySelector(\'head\').innerHTML += \'<link rel="stylesheet" href="' + CUSTOM_CSS_GENERAL + '" type="text/css"/>\';' +
|
'document.querySelector(\'head\').innerHTML += \'<link rel="stylesheet" href="' + CUSTOM_CSS_GENERAL + '" type="text/css"/>\';' +
|
||||||
'$(".fc-toolbar .fc-center").append(\'<p id="rotateToLandscape">' + i18n.t("planexScreen.rotateToLandscape") + '</p>\');' +
|
'$(".fc-toolbar .fc-center").append(\'<p id="rotateToLandscape">' + i18n.t("planexScreen.rotateToLandscape") + '</p>\');' +
|
||||||
'$(".fc-toolbar .fc-center").append(\'<p id="rotateToPortrait">' + i18n.t("planexScreen.rotateToPortrait") + '</p>\');true;';
|
'$(".fc-toolbar .fc-center").append(\'<p id="rotateToPortrait">' + i18n.t("planexScreen.rotateToPortrait") + '</p>\');';
|
||||||
if (ThemeManager.getNightMode())
|
if (ThemeManager.getNightMode())
|
||||||
this.customInjectedJS += 'document.querySelector(\'head\').innerHTML += \'<link rel="stylesheet" href="' + CUSTOM_CSS_NIGHTMODE + '" type="text/css"/>\';';
|
this.customInjectedJS += 'document.querySelector(\'head\').innerHTML += \'<link rel="stylesheet" href="' + CUSTOM_CSS_NIGHTMODE + '" type="text/css"/>\';';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -156,7 +156,7 @@ export default class SelfMenuScreen extends FetchedDataSectionList {
|
||||||
<Text style={{
|
<Text style={{
|
||||||
marginTop: 5,
|
marginTop: 5,
|
||||||
marginBottom: 5
|
marginBottom: 5
|
||||||
}}>{this.formatName(object.name)}</Text>
|
}}>{object.name.toLowerCase()}</Text>
|
||||||
: <View/>}
|
: <View/>}
|
||||||
</View>)}
|
</View>)}
|
||||||
</CardItem>
|
</CardItem>
|
||||||
|
|
@ -164,9 +164,5 @@ export default class SelfMenuScreen extends FetchedDataSectionList {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
formatName(name: String) {
|
|
||||||
return name.charAt(0) + name.substr(1).toLowerCase();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue