From 819a8624c74a42d7c0111652e992bd321ea64260 Mon Sep 17 00:00:00 2001
From: keplyx <keplyx@gmail.com>
Date: Fri, 8 Nov 2019 16:47:28 +0100
Subject: [PATCH 1/5] Added back button on bib box web page

---
 screens/AvailableRoomScreen.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/screens/AvailableRoomScreen.js b/screens/AvailableRoomScreen.js
index 8bdc0e4..04d1306 100644
--- a/screens/AvailableRoomScreen.js
+++ b/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>");';
     }
 
     render() {

From 9503c781ca492ec34cbe310b7a07665785cdf3b6 Mon Sep 17 00:00:00 2001
From: Yohan Simard <yoh129.sim@gmail.com>
Date: Fri, 8 Nov 2019 17:07:45 +0100
Subject: [PATCH 2/5] Better formatting in the menu

---
 screens/SelfMenuScreen.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 {
                                 <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();
+    }
+
 }
 

From 15107a6adc83005152a3cad0bd474d6bfd8f8c09 Mon Sep 17 00:00:00 2001
From: Yohan Simard <yoh129.sim@gmail.com>
Date: Sat, 9 Nov 2019 11:54:43 +0100
Subject: [PATCH 3/5] Added top padding in the availableRooms screen in
 landscape

---
 components/WebViewScreen.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/WebViewScreen.js b/components/WebViewScreen.js
index 39503ab..820475a 100644
--- a/components/WebViewScreen.js
+++ b/components/WebViewScreen.js
@@ -198,6 +198,11 @@ 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: ThemeManager.getCurrentThemeVariables().brandPrimary
+                        }}
+
                     >
                         {this.getTabbedWebview()}
                     </Tabs>}

From fc47332d616bb8f56c8bc04abab6621a3b33dd94 Mon Sep 17 00:00:00 2001
From: keplyx <keplyx@gmail.com>
Date: Sat, 9 Nov 2019 16:50:28 +0100
Subject: [PATCH 4/5] Fixed webview error on ios

---
 components/WebViewScreen.js    | 4 +++-
 screens/AvailableRoomScreen.js | 2 +-
 screens/PlanexScreen.js        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/WebViewScreen.js b/components/WebViewScreen.js
index 820475a..ef53fe5 100644
--- a/components/WebViewScreen.js
+++ b/components/WebViewScreen.js
@@ -200,7 +200,9 @@ export default class WebViewScreen extends React.Component<Props, State> {
                         locked={true}
                         style = {{
                             paddingTop: this.state.isLandscape ? 20 : 0,
-                            backgroundColor: ThemeManager.getCurrentThemeVariables().brandPrimary
+                            backgroundColor: Platform.OS === 'ios' ?
+                                ThemeManager.getCurrentThemeVariables().tabDefaultBg :
+                                ThemeManager.getCurrentThemeVariables().brandPrimary
                         }}
 
                     >
diff --git a/screens/AvailableRoomScreen.js b/screens/AvailableRoomScreen.js
index 04d1306..a3448e1 100644
--- a/screens/AvailableRoomScreen.js
+++ b/screens/AvailableRoomScreen.js
@@ -42,7 +42,7 @@ export default class AvailableRoomScreen extends React.Component<Props> {
             '<a style=\'margin: auto\' href=\'' + BIB_URL + '\'>' +
             '<button id=\'customBackButton\' class=\'btn btn-primary\'>Retour</button>' +
             '</a>' +
-            '</div>");';
+            '</div>");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<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"/>\';';
     }

From b425555da99e2866c9275c248c4149e07708efb8 Mon Sep 17 00:00:00 2001
From: keplyx <keplyx@gmail.com>
Date: Sat, 9 Nov 2019 16:51:01 +0100
Subject: [PATCH 5/5] Increased version number

---
 app.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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