From 50a5f087b64dbbe6be436720d71592fd33e37309 Mon Sep 17 00:00:00 2001
From: Arnaud Vergnet <vergnet@etud.insa-toulouse.fr>
Date: Tue, 28 Apr 2020 10:57:36 +0200
Subject: [PATCH] Fixed banner content offset

---
 src/screens/Planex/PlanexScreen.js       | 17 +++++++++-----
 src/screens/Proxiwash/ProxiwashScreen.js | 28 ++++++++++++++----------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/screens/Planex/PlanexScreen.js b/src/screens/Planex/PlanexScreen.js
index d7e157c..4b54b98 100644
--- a/src/screens/Planex/PlanexScreen.js
+++ b/src/screens/Planex/PlanexScreen.js
@@ -302,10 +302,18 @@ class PlanexScreen extends React.Component<Props, State> {
             <View
                 style={{flex: 1}}
             >
+                {/*Allow to draw webview bellow banner*/}
+                <View style={{
+                    position: 'absolute',
+                    height: '100%',
+                    width: '100%',
+                }}>
+                    {this.props.theme.dark // Force component theme update
+                        ? this.getWebView()
+                        : <View style={{height: '100%'}}>{this.getWebView()}</View>}
+                </View>
                 <Banner
-                    style={{
-                        marginTop: this.state.bannerVisible ? containerPaddingTop : 0,
-                    }}
+                    style={{marginTop: containerPaddingTop,}}
                     visible={this.state.bannerVisible}
                     actions={[
                         {
@@ -330,9 +338,6 @@ class PlanexScreen extends React.Component<Props, State> {
                     onDismiss={this.hideDialog}
                     title={this.state.dialogTitle}
                     message={this.state.dialogMessage}/>
-                {this.props.theme.dark // Force component theme update
-                    ? this.getWebView()
-                    : <View style={{height: '100%'}}>{this.getWebView()}</View>}
                 <AnimatedBottomBar
                     {...this.props}
                     ref={this.barRef}
diff --git a/src/screens/Proxiwash/ProxiwashScreen.js b/src/screens/Proxiwash/ProxiwashScreen.js
index 4a7f5ba..80ad84c 100644
--- a/src/screens/Proxiwash/ProxiwashScreen.js
+++ b/src/screens/Proxiwash/ProxiwashScreen.js
@@ -424,10 +424,23 @@ class ProxiwashScreen extends React.Component<Props, State> {
             <View
                 style={{flex: 1}}
             >
+                <View style={{
+                    position: "absolute",
+                    width: "100%",
+                    height: "100%",
+                }}>
+                    <WebSectionList
+                        createDataset={this.createDataset}
+                        navigation={nav}
+                        fetchUrl={DATA_URL}
+                        renderItem={this.getRenderItem}
+                        renderSectionHeader={this.getRenderSectionHeader}
+                        autoRefreshTime={REFRESH_TIME}
+                        refreshOnFocus={true}
+                        updateData={this.state.machinesWatched.length}/>
+                </View>
                 <Banner
-                    style={{
-                        marginTop: this.state.bannerVisible ? containerPaddingTop : 0,
-                    }}
+                    style={{marginTop: containerPaddingTop,}}
                     visible={this.state.bannerVisible}
                     actions={[
                         {
@@ -445,15 +458,6 @@ class ProxiwashScreen extends React.Component<Props, State> {
                 <CustomModal onRef={this.onModalRef}>
                     {this.state.modalCurrentDisplayItem}
                 </CustomModal>
-                <WebSectionList
-                    createDataset={this.createDataset}
-                    navigation={nav}
-                    fetchUrl={DATA_URL}
-                    renderItem={this.getRenderItem}
-                    renderSectionHeader={this.getRenderSectionHeader}
-                    autoRefreshTime={REFRESH_TIME}
-                    refreshOnFocus={true}
-                    updateData={this.state.machinesWatched.length}/>
             </View>
         );
     }