From 6ade586b3f4dfaaffe69cd501cacd1bd2e7b5d85 Mon Sep 17 00:00:00 2001 From: Leslie Ngo Date: Wed, 2 Nov 2022 17:03:56 -0700 Subject: [PATCH 1/2] homescreen_icon [nfc]: Swap TopTabButton with TopTabButtonGeneral to prepare the component for icon swapping. --- src/main/HomeScreen.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/HomeScreen.js b/src/main/HomeScreen.js index 04fa68ed96f..cc8e595adb5 100644 --- a/src/main/HomeScreen.js +++ b/src/main/HomeScreen.js @@ -18,6 +18,7 @@ import LoadingBanner from '../common/LoadingBanner'; import ServerCompatBanner from '../common/ServerCompatBanner'; import ServerPushSetupBanner from '../common/ServerPushSetupBanner'; import { OfflineNoticePlaceholder } from '../boot/OfflineNoticeProvider'; +import { Icon } from '../common/Icons'; const styles = createStyleSheet({ wrapper: { @@ -43,12 +44,13 @@ export default function HomeScreen(props: Props): Node { - { dispatch(doNarrow(HOME_NARROW)); }} - /> + > + + { From eaf8e098dd88900622f64d2bc9fac2251de6f001 Mon Sep 17 00:00:00 2001 From: Leslie Ngo Date: Wed, 2 Nov 2022 17:09:02 -0700 Subject: [PATCH 2/2] homescreen_icon: Swap icon 'globe' with 'list' for web UI parity. Web Zulip's all-messages icon is an inverted list icon, so we're swapping mobile's all-messages icon to match. Fixes: #5303 --- src/common/Icons.js | 1 + src/main/HomeScreen.js | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/common/Icons.js b/src/common/Icons.js index 051066e966a..49f9d0ce7e8 100644 --- a/src/common/Icons.js +++ b/src/common/Icons.js @@ -108,3 +108,4 @@ export const IconGroup: SpecificIconType = makeIcon(FontAwesome, 'group'); export const IconPlus: SpecificIconType = makeIcon(Feather, 'plus'); // eslint-disable-next-line react/function-component-definition export const IconWebPublic: SpecificIconType = props => ; +export const IconAllMessages: SpecificIconType = makeIcon(Feather, 'align-left'); diff --git a/src/main/HomeScreen.js b/src/main/HomeScreen.js index cc8e595adb5..657ecf8d3bb 100644 --- a/src/main/HomeScreen.js +++ b/src/main/HomeScreen.js @@ -18,7 +18,7 @@ import LoadingBanner from '../common/LoadingBanner'; import ServerCompatBanner from '../common/ServerCompatBanner'; import ServerPushSetupBanner from '../common/ServerPushSetupBanner'; import { OfflineNoticePlaceholder } from '../boot/OfflineNoticeProvider'; -import { Icon } from '../common/Icons'; +import { IconAllMessages } from '../common/Icons'; const styles = createStyleSheet({ wrapper: { @@ -49,7 +49,11 @@ export default function HomeScreen(props: Props): Node { dispatch(doNarrow(HOME_NARROW)); }} > - +