From b830b8ec93029b01b05ad11295c7ce65598dee4b Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Tue, 24 Mar 2020 17:43:12 +0100
Subject: [PATCH] Automated cherry pick of #4067 (#4071)

* Add backgroundColor

* Revert backgroundColor and set elevation instead

Co-authored-by: Miguel Alatzar <this.migbot@gmail.com>
Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
---
 app/components/network_indicator/network_indicator.js  | 9 ++++++++-
 app/screens/channel/channel.android.js                 | 2 +-
 app/screens/channel/channel_nav_bar/channel_nav_bar.js | 9 ++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/components/network_indicator/network_indicator.js b/app/components/network_indicator/network_indicator.js
index 93bcbf785..9baa68c0a 100644
--- a/app/components/network_indicator/network_indicator.js
+++ b/app/components/network_indicator/network_indicator.js
@@ -412,8 +412,15 @@ const styles = StyleSheet.create({
     container: {
         height: HEIGHT,
         width: '100%',
-        zIndex: 9,
         position: 'absolute',
+        ...Platform.select({
+            android: {
+                elevation: 9,
+            },
+            ios: {
+                zIndex: 9,
+            },
+        }),
     },
     wrapper: {
         alignItems: 'center',
diff --git a/app/screens/channel/channel.android.js b/app/screens/channel/channel.android.js
index 4e2ac6307..761c990a6 100644
--- a/app/screens/channel/channel.android.js
+++ b/app/screens/channel/channel.android.js
@@ -40,7 +40,6 @@ export default class ChannelAndroid extends ChannelBase {
 
         const drawerContent = (
             <>
-                <NetworkIndicator/>
                 <ChannelNavBar
                     openMainSidebar={this.openMainSidebar}
                     openSettingsSidebar={this.openSettingsSidebar}
@@ -55,6 +54,7 @@ export default class ChannelAndroid extends ChannelBase {
                         screenId={this.props.componentId}
                     />
                 </KeyboardLayout>
+                <NetworkIndicator/>
                 {LocalConfig.EnableMobileClientUpgrade && <ClientUpgradeListener/>}
             </>
         );
diff --git a/app/screens/channel/channel_nav_bar/channel_nav_bar.js b/app/screens/channel/channel_nav_bar/channel_nav_bar.js
index a47d11728..532c68b68 100644
--- a/app/screens/channel/channel_nav_bar/channel_nav_bar.js
+++ b/app/screens/channel/channel_nav_bar/channel_nav_bar.js
@@ -130,7 +130,14 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme) => {
             flexDirection: 'row',
             justifyContent: 'flex-start',
             width: '100%',
-            zIndex: 10,
+            ...Platform.select({
+                android: {
+                    elevation: 10,
+                },
+                ios: {
+                    zIndex: 10,
+                },
+            }),
         },
     };
 });