From 0a1f912ece10c28a975c91359c61bd000f9af909 Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Thu, 25 May 2023 20:27:55 -0500 Subject: Fixes & updates for mobile web --- src/view/com/pager/TabBar.tsx | 9 +++++---- src/view/shell/bottom-bar/BottomBarWeb.tsx | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/view/com/pager/TabBar.tsx b/src/view/com/pager/TabBar.tsx index 422d986a7..d7121fde9 100644 --- a/src/view/com/pager/TabBar.tsx +++ b/src/view/com/pager/TabBar.tsx @@ -10,7 +10,7 @@ import {StyleSheet, View, ScrollView} from 'react-native' import {Text} from '../util/text/Text' import {PressableWithHover} from '../util/PressableWithHover' import {usePalette} from 'lib/hooks/usePalette' -import {isDesktopWeb} from 'platform/detection' +import {isDesktopWeb, isMobileWeb} from 'platform/detection' import {DraggableScrollView} from './DraggableScrollView' export interface TabBarProps { @@ -132,14 +132,15 @@ const styles = isDesktopWeb backgroundColor: 'transparent', }, contentContainer: { - columnGap: 20, - marginLeft: 18, - paddingRight: 36, + columnGap: isMobileWeb ? 0 : 20, + marginLeft: isMobileWeb ? 0 : 18, + paddingRight: isMobileWeb ? 0 : 36, backgroundColor: 'transparent', }, item: { paddingTop: 10, paddingBottom: 10, + paddingHorizontal: isMobileWeb ? 8 : 0, borderBottomWidth: 3, borderBottomColor: 'transparent', }, diff --git a/src/view/shell/bottom-bar/BottomBarWeb.tsx b/src/view/shell/bottom-bar/BottomBarWeb.tsx index b7daac5af..cbaafd1fd 100644 --- a/src/view/shell/bottom-bar/BottomBarWeb.tsx +++ b/src/view/shell/bottom-bar/BottomBarWeb.tsx @@ -15,6 +15,8 @@ import { HomeIconSolid, MagnifyingGlassIcon2, MagnifyingGlassIcon2Solid, + SatelliteDishIcon, + SatelliteDishIconSolid, UserIcon, } from 'lib/icons' import {Link} from 'view/com/util/Link' @@ -61,6 +63,18 @@ export const BottomBarWeb = observer(() => { ) }} + + {({isActive}) => { + const Icon = isActive ? SatelliteDishIconSolid : SatelliteDishIcon + return ( + + ) + }} + {({isActive}) => { const Icon = isActive ? BellIconSolid : BellIcon -- cgit 1.4.1