Merge branch 'dev'

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",

components/WebViewScreen.js

@@ -198,6 +198,13 @@ export default class WebViewScreen extends React.Component<Props, State> {
                             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()}
                     </Tabs>}

screens/AvailableRoomScreen.js

@@ -35,7 +35,14 @@ export default class AvailableRoomScreen extends React.Component<Props> {
 
         this.customBibInjectedJS =
             '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() {

screens/PlanexScreen.js

@@ -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 += \'<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="rotateToPortrait">' + i18n.t("planexScreen.rotateToPortrait") + '</p>\');';
+            '$(".fc-toolbar .fc-center").append(\'<p id="rotateToPortrait">' + i18n.t("planexScreen.rotateToPortrait") + '</p>\');true;';
         if (ThemeManager.getNightMode())
             this.customInjectedJS += 'document.querySelector(\'head\').innerHTML += \'<link rel="stylesheet" href="' + CUSTOM_CSS_NIGHTMODE + '" type="text/css"/>\';';
     }

screens/SelfMenuScreen.js

@@ -156,7 +156,7 @@ export default class SelfMenuScreen extends FetchedDataSectionList {
                                 <Text style={{
                                     marginTop: 5,
                                     marginBottom: 5
-                                }}>{object.name.toLowerCase()}</Text>
+                                }}>{this.formatName(object.name)}</Text>
                                 : <View/>}
                         </View>)}
                 </CardItem>
@@ -164,5 +164,9 @@ export default class SelfMenuScreen extends FetchedDataSectionList {
         );
     }
 
+    formatName(name: String) {
+        return name.charAt(0) + name.substr(1).toLowerCase();
+    }
+
 }