Move all of the web left-nav shell into the header

1 files changed, 154 insertions, 12 deletions

diff --git a/src/view/shell/web/DesktopHeader.tsx b/src/view/shell/web/DesktopHeader.tsx
index 75acb8da9..acef3d9ba 100644
--- a/src/view/shell/web/DesktopHeader.tsx
+++ b/src/view/shell/web/DesktopHeader.tsx
@@ -1,12 +1,88 @@
 import React from 'react'
 import {observer} from 'mobx-react-lite'
-import {StyleSheet, TouchableOpacity, View} from 'react-native'
+import {Pressable, StyleSheet, TouchableOpacity, View} from 'react-native'
 import {Text} from 'view/com/util/text/Text'
 import {Link} from 'view/com/util/Link'
+import {UserAvatar} from 'view/com/util/UserAvatar'
 import {usePalette} from 'lib/hooks/usePalette'
+import {useColorSchemeStyle} from 'lib/hooks/useColorSchemeStyle'
 import {useStores} from 'state/index'
-import {ComposeIcon, MagnifyingGlassIcon} from 'lib/icons'
 import {colors} from 'lib/styles'
+import {
+  ComposeIcon,
+  HomeIcon,
+  HomeIconSolid,
+  BellIcon,
+  BellIconSolid,
+  MagnifyingGlassIcon,
+  CogIcon,
+} from 'lib/icons'
+
+interface NavItemProps {
+  count?: number
+  href: string
+  icon: JSX.Element
+  iconFilled: JSX.Element
+  isProfile?: boolean
+}
+export const NavItem = observer(
+  ({count, href, icon, iconFilled}: NavItemProps) => {
+    const store = useStores()
+    const hoverBg = useColorSchemeStyle(
+      styles.navItemHoverBgLight,
+      styles.navItemHoverBgDark,
+    )
+    const isCurrent = store.nav.tab.current.url === href
+    const onPress = () => store.nav.navigate(href)
+    return (
+      <Pressable
+        style={state => [
+          styles.navItem,
+          // @ts-ignore Pressable state differs for RNW -prf
+          (state.hovered || isCurrent) && hoverBg,
+        ]}
+        onPress={onPress}>
+        <View style={[styles.navItemIconWrapper]}>
+          {isCurrent ? iconFilled : icon}
+          {typeof count === 'number' && count > 0 && (
+            <Text type="button" style={styles.navItemCount}>
+              {count}
+            </Text>
+          )}
+        </View>
+      </Pressable>
+    )
+  },
+)
+
+export const ProfileItem = observer(() => {
+  const store = useStores()
+  const hoverBg = useColorSchemeStyle(
+    styles.navItemHoverBgLight,
+    styles.navItemHoverBgDark,
+  )
+  const href = `/profile/${store.me.handle}`
+  const isCurrent = store.nav.tab.current.url === href
+  const onPress = () => store.nav.navigate(href)
+  return (
+    <Pressable
+      style={state => [
+        styles.navItem,
+        // @ts-ignore Pressable state differs for RNW -prf
+        (state.hovered || isCurrent) && hoverBg,
+      ]}
+      onPress={onPress}>
+      <View style={[styles.navItemIconWrapper]}>
+        <UserAvatar
+          handle={store.me.handle}
+          displayName={store.me.displayName}
+          avatar={store.me.avatar}
+          size={28}
+        />
+      </View>
+    </Pressable>
+  )
+})
 
 export const DesktopHeader = observer(function DesktopHeader({}: {
   canGoBack?: boolean
@@ -16,11 +92,29 @@ export const DesktopHeader = observer(function DesktopHeader({}: {
   const onPressCompose = () => store.shell.openComposer({})
   return (
     <View style={[styles.header, pal.borderDark, pal.view]}>
-      <View style={styles.titleContainer} pointerEvents="none">
-        <Text type="title-2xl" style={[pal.text, styles.title]}>
-          Bluesky
-        </Text>
-      </View>
+      <Text type="title-2xl" style={[pal.text, styles.title]}>
+        Bluesky
+      </Text>
+      <View style={styles.space30} />
+      <NavItem
+        href="/"
+        icon={<HomeIcon size={28} />}
+        iconFilled={<HomeIconSolid size={28} />}
+      />
+      <View style={styles.space15} />
+      <NavItem
+        href="/search"
+        icon={<MagnifyingGlassIcon size={28} />}
+        iconFilled={<MagnifyingGlassIcon strokeWidth={3} size={28} />}
+      />
+      <View style={styles.space15} />
+      <NavItem
+        href="/notifications"
+        count={store.me.notifications.unreadCount}
+        icon={<BellIcon size={28} />}
+        iconFilled={<BellIconSolid size={28} />}
+      />
+      <View style={styles.spaceFlex} />
       <TouchableOpacity style={[styles.newPostBtn]} onPress={onPressCompose}>
         <View style={styles.newPostBtnIconWrapper}>
           <ComposeIcon
@@ -33,6 +127,7 @@ export const DesktopHeader = observer(function DesktopHeader({}: {
           New Post
         </Text>
       </TouchableOpacity>
+      <View style={styles.space20} />
       <Link href="/search" style={[pal.view, pal.borderDark, styles.search]}>
         <MagnifyingGlassIcon
           size={18}
@@ -42,6 +137,13 @@ export const DesktopHeader = observer(function DesktopHeader({}: {
           Search
         </Text>
       </Link>
+      <View style={styles.space15} />
+      <ProfileItem />
+      <NavItem
+        href="/settings"
+        icon={<CogIcon strokeWidth={2} size={28} />}
+        iconFilled={<CogIcon strokeWidth={2.5} size={28} />}
+      />
     </View>
   )
 })
@@ -50,18 +152,59 @@ const styles = StyleSheet.create({
   header: {
     flexDirection: 'row',
     alignItems: 'center',
-    paddingTop: 18,
-    paddingBottom: 18,
+    // paddingTop: 18,
+    // paddingBottom: 18,
     paddingLeft: 30,
     paddingRight: 40,
     borderBottomWidth: 1,
   },
 
-  titleContainer: {
-    marginRight: 'auto',
+  spaceFlex: {
+    flex: 1,
+  },
+  space15: {
+    width: 15,
   },
+  space20: {
+    width: 20,
+  },
+  space30: {
+    width: 30,
+  },
+
   title: {},
 
+  navItem: {
+    paddingTop: 14,
+    paddingBottom: 10,
+    paddingHorizontal: 10,
+    alignItems: 'center',
+    borderBottomWidth: 2,
+    borderBottomColor: 'transparent',
+  },
+  navItemHoverBgLight: {
+    borderBottomWidth: 2,
+    borderBottomColor: colors.blue3,
+  },
+  navItemHoverBgDark: {
+    borderBottomWidth: 2,
+    backgroundColor: colors.blue3,
+  },
+  navItemIconWrapper: {
+    marginBottom: 2,
+  },
+  navItemCount: {
+    position: 'absolute',
+    top: -5,
+    left: 15,
+    backgroundColor: colors.red3,
+    color: colors.white,
+    fontSize: 12,
+    fontWeight: 'bold',
+    paddingHorizontal: 4,
+    borderRadius: 6,
+  },
+
   search: {
     flexDirection: 'row',
     alignItems: 'center',
@@ -87,7 +230,6 @@ const styles = StyleSheet.create({
     paddingBottom: 9,
     paddingHorizontal: 18,
     backgroundColor: colors.blue3,
-    marginRight: 10,
   },
   newPostBtnIconWrapper: {
     marginRight: 8,