nav [nfc]: Improve a few variable names.

Based on the rename of `getStreamColorForNarrow` (previously `getTitleBackgroundColor`) in a recent commit.
zulip · Jan 30, 2021 · f2d629d · f2d629d
1 parent aa52b1e
commit f2d629d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/src/chat/ChatScreen.js b/src/chat/ChatScreen.js
@@ -114,13 +114,13 @@ export default function ChatScreen(props: Props) {
   const sayNoMessages = haveNoMessages && !isFetching;
   const showComposeBox = canSendToNarrow(narrow) && !showMessagePlaceholders;
 
-  const titleBackgroundColor = useSelector(state => getStreamColorForNarrow(state, narrow));
+  const streamColor = useSelector(state => getStreamColorForNarrow(state, narrow));
 
   return (
     <ActionSheetProvider>
       <View style={[componentStyles.screen, { backgroundColor }]}>
         <KeyboardAvoider style={styles.flexed} behavior="padding">
-          <ZulipStatusBar backgroundColor={titleBackgroundColor} />
+          <ZulipStatusBar backgroundColor={streamColor} />
           <ChatNavBar narrow={narrow} editMessage={editMessage} />
           <OfflineNotice />
           <UnreadNotice narrow={narrow} />

diff --git a/src/nav/ChatNavBar.js b/src/nav/ChatNavBar.js
@@ -22,23 +22,21 @@ type Props = $ReadOnly<{|
 
 export default function ChatNavBar(props: Props) {
   const { narrow, editMessage } = props;
-  const backgroundColor = useSelector(state => getStreamColorForNarrow(state, narrow));
+  const streamColor = useSelector(state => getStreamColorForNarrow(state, narrow));
   const color =
-    backgroundColor === undefined ? BRAND_COLOR : foregroundColorFromBackground(backgroundColor);
+    streamColor === undefined ? BRAND_COLOR : foregroundColorFromBackground(streamColor);
   const spinnerColor =
-    backgroundColor === undefined ? 'default' : foregroundColorFromBackground(backgroundColor);
+    streamColor === undefined ? 'default' : foregroundColorFromBackground(streamColor);
 
   return (
     <SafeAreaView
       mode="padding"
       edges={['top', 'right', 'left']}
       style={{
         borderColor:
-          backgroundColor === undefined
-            ? 'hsla(0, 0%, 50%, 0.25)'
-            : Color(backgroundColor).darken(0.1),
+          streamColor === undefined ? 'hsla(0, 0%, 50%, 0.25)' : Color(streamColor).darken(0.1),
         borderBottomWidth: 1,
-        backgroundColor,
+        backgroundColor: streamColor,
       }}
     >
       <View
@@ -53,11 +51,7 @@ export default function ChatNavBar(props: Props) {
         <ExtraButton color={color} narrow={narrow} />
         <InfoButton color={color} narrow={narrow} />
       </View>
-      <LoadingBanner
-        spinnerColor={spinnerColor}
-        backgroundColor={backgroundColor}
-        textColor={color}
-      />
+      <LoadingBanner spinnerColor={spinnerColor} backgroundColor={streamColor} textColor={color} />
     </SafeAreaView>
   );
 }