diff --git a/app.json b/app.json index be40e10..c7402a8 100644 --- a/app.json +++ b/app.json @@ -10,7 +10,7 @@ "android", "web" ], - "version": "1.3.0", + "version": "1.3.1", "orientation": "portrait", "primaryColor": "#be1522", "icon": "./assets/android.icon.png", @@ -36,7 +36,7 @@ }, "android": { "package": "fr.amicaleinsat.application", - "versionCode": 10, + "versionCode": 11, "icon": "./assets/android.icon.png", "adaptiveIcon": { "foregroundImage": "./assets/android.adaptive-icon.png", diff --git a/components/WebViewScreen.js b/components/WebViewScreen.js index 39503ab..ef53fe5 100644 --- a/components/WebViewScreen.js +++ b/components/WebViewScreen.js @@ -198,6 +198,13 @@ export default class WebViewScreen extends React.Component { elevation: 0, // Fix for android shadow }} locked={true} + style = {{ + paddingTop: this.state.isLandscape ? 20 : 0, + backgroundColor: Platform.OS === 'ios' ? + ThemeManager.getCurrentThemeVariables().tabDefaultBg : + ThemeManager.getCurrentThemeVariables().brandPrimary + }} + > {this.getTabbedWebview()} } diff --git a/screens/AvailableRoomScreen.js b/screens/AvailableRoomScreen.js index 8bdc0e4..a3448e1 100644 --- a/screens/AvailableRoomScreen.js +++ b/screens/AvailableRoomScreen.js @@ -35,7 +35,14 @@ export default class AvailableRoomScreen extends React.Component { this.customBibInjectedJS = 'document.querySelector(\'head\').innerHTML += \'\';' + - 'document.querySelector(\'head\').innerHTML += \'\';'; + 'document.querySelector(\'head\').innerHTML += \'\';' + + 'if ($(".hero-unit-form").length > 0 && $("#customBackButton").length === 0)' + + '$(".hero-unit-form").append("' + + '
' + + '' + + '' + + '' + + '
");true;'; } render() { diff --git a/screens/PlanexScreen.js b/screens/PlanexScreen.js index 277912d..5131b7c 100644 --- a/screens/PlanexScreen.js +++ b/screens/PlanexScreen.js @@ -29,7 +29,7 @@ export default class PlanexScreen extends React.Component { 'document.querySelector(\'head\').innerHTML += \'\';' + 'document.querySelector(\'head\').innerHTML += \'\';' + '$(".fc-toolbar .fc-center").append(\'

' + i18n.t("planexScreen.rotateToLandscape") + '

\');' + - '$(".fc-toolbar .fc-center").append(\'

' + i18n.t("planexScreen.rotateToPortrait") + '

\');'; + '$(".fc-toolbar .fc-center").append(\'

' + i18n.t("planexScreen.rotateToPortrait") + '

\');true;'; if (ThemeManager.getNightMode()) this.customInjectedJS += 'document.querySelector(\'head\').innerHTML += \'\';'; } diff --git a/screens/SelfMenuScreen.js b/screens/SelfMenuScreen.js index 3e9257c..76bb27b 100644 --- a/screens/SelfMenuScreen.js +++ b/screens/SelfMenuScreen.js @@ -156,7 +156,7 @@ export default class SelfMenuScreen extends FetchedDataSectionList { {object.name.toLowerCase()} + }}>{this.formatName(object.name)} : } )} @@ -164,5 +164,9 @@ export default class SelfMenuScreen extends FetchedDataSectionList { ); } + formatName(name: String) { + return name.charAt(0) + name.substr(1).toLowerCase(); + } + }