diff options
author | Paul Frazee <pfrazee@gmail.com> | 2023-12-14 10:31:49 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-14 10:31:49 -0800 |
commit | 075ffdf583c5393b896d22dd179d03208311ef4a (patch) | |
tree | ad86e90d2e2f0dd5a9e2f9f72292e5dcec6a59a0 /src/view/shell/bottom-bar | |
parent | 7fd79702371e3d7829be2188c2212c090bf76670 (diff) | |
download | voidsky-075ffdf583c5393b896d22dd179d03208311ef4a.tar.zst |
PWI behavior updates (#2207)
* Enable PWI * Disable access to feeds on PWI * Remove feeds nav item from drawer when signed out * Replace discover feed on home with a CTA * Wire up the sign in and create account buttons to go straight to their respective screens * Give a custom ScreenHider interface for no-pwi * Add side borders on desktop to the screen hider * Filter accounts in the autocomplete according to mod settings * Trim replies in the post thread that are pwi opt-out * Show 'learn more' on the content hider when no-override is enabled * Apply the moderation filter on profile cards * Disable post search on logged-out view * Update locale files * Bump api pkg * Ensure feeds with no posts don't show as NSFPublic * Fix types --------- Co-authored-by: Eric Bailey <git@esb.lol>
Diffstat (limited to 'src/view/shell/bottom-bar')
-rw-r--r-- | src/view/shell/bottom-bar/BottomBar.tsx | 44 | ||||
-rw-r--r-- | src/view/shell/bottom-bar/BottomBarWeb.tsx | 22 |
2 files changed, 33 insertions, 33 deletions
diff --git a/src/view/shell/bottom-bar/BottomBar.tsx b/src/view/shell/bottom-bar/BottomBar.tsx index 7f1ba8a5f..ef147f27e 100644 --- a/src/view/shell/bottom-bar/BottomBar.tsx +++ b/src/view/shell/bottom-bar/BottomBar.tsx @@ -138,32 +138,32 @@ export function BottomBar({navigation}: BottomTabBarProps) { accessibilityLabel={_(msg`Search`)} accessibilityHint="" /> - <Btn - testID="bottomBarFeedsBtn" - icon={ - isAtFeeds ? ( - <HashtagIcon - size={24} - style={[styles.ctrlIcon, pal.text, styles.feedsIcon]} - strokeWidth={4} - /> - ) : ( - <HashtagIcon - size={24} - style={[styles.ctrlIcon, pal.text, styles.feedsIcon]} - strokeWidth={2.25} - /> - ) - } - onPress={onPressFeeds} - accessibilityRole="tab" - accessibilityLabel={_(msg`Feeds`)} - accessibilityHint="" - /> {hasSession && ( <> <Btn + testID="bottomBarFeedsBtn" + icon={ + isAtFeeds ? ( + <HashtagIcon + size={24} + style={[styles.ctrlIcon, pal.text, styles.feedsIcon]} + strokeWidth={4} + /> + ) : ( + <HashtagIcon + size={24} + style={[styles.ctrlIcon, pal.text, styles.feedsIcon]} + strokeWidth={2.25} + /> + ) + } + onPress={onPressFeeds} + accessibilityRole="tab" + accessibilityLabel={_(msg`Feeds`)} + accessibilityHint="" + /> + <Btn testID="bottomBarNotificationsBtn" icon={ isAtNotifications ? ( diff --git a/src/view/shell/bottom-bar/BottomBarWeb.tsx b/src/view/shell/bottom-bar/BottomBarWeb.tsx index 3a60bd3b1..6ed0a99f5 100644 --- a/src/view/shell/bottom-bar/BottomBarWeb.tsx +++ b/src/view/shell/bottom-bar/BottomBarWeb.tsx @@ -64,20 +64,20 @@ export function BottomBarWeb() { ) }} </NavItem> - <NavItem routeName="Feeds" href="/feeds"> - {({isActive}) => { - return ( - <HashtagIcon - size={22} - style={[styles.ctrlIcon, pal.text, styles.feedsIcon]} - strokeWidth={isActive ? 4 : 2.5} - /> - ) - }} - </NavItem> {hasSession && ( <> + <NavItem routeName="Feeds" href="/feeds"> + {({isActive}) => { + return ( + <HashtagIcon + size={22} + style={[styles.ctrlIcon, pal.text, styles.feedsIcon]} + strokeWidth={isActive ? 4 : 2.5} + /> + ) + }} + </NavItem> <NavItem routeName="Notifications" href="/notifications"> {({isActive}) => { const Icon = isActive ? BellIconSolid : BellIcon |