about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul Frazee <pfrazee@gmail.com>2023-05-25 20:44:37 -0500
committerPaul Frazee <pfrazee@gmail.com>2023-05-25 20:44:37 -0500
commit68332bc8772462e9adf1f7640890d3ee850f2e04 (patch)
treeb2bcc06bbf81da45bc58db6f83d8cc37c306521c
parent27ff9ce43b13b2bb612f27a202a6a153480c16c0 (diff)
downloadvoidsky-68332bc8772462e9adf1f7640890d3ee850f2e04.tar.zst
UI tune ups
-rw-r--r--src/view/com/pager/FeedsTabBarMobile.tsx10
-rw-r--r--src/view/com/posts/MultiFeed.tsx21
2 files changed, 12 insertions, 19 deletions
diff --git a/src/view/com/pager/FeedsTabBarMobile.tsx b/src/view/com/pager/FeedsTabBarMobile.tsx
index 0d71b2b98..9c7138815 100644
--- a/src/view/com/pager/FeedsTabBarMobile.tsx
+++ b/src/view/com/pager/FeedsTabBarMobile.tsx
@@ -6,6 +6,7 @@ import {RenderTabBarFnProps} from 'view/com/pager/Pager'
 import {useStores} from 'state/index'
 import {usePalette} from 'lib/hooks/usePalette'
 import {useAnimatedValue} from 'lib/hooks/useAnimatedValue'
+import {useColorSchemeStyle} from 'lib/hooks/useColorSchemeStyle'
 import {Link} from '../util/Link'
 import {Text} from '../util/text/Text'
 import {CogIcon} from 'lib/icons'
@@ -32,6 +33,8 @@ export const FeedsTabBar = observer(
       transform: [{translateY: Animated.multiply(interp, -100)}],
     }
 
+    const brandBlue = useColorSchemeStyle(s.brandBlue, s.blue3)
+
     const onPressAvi = React.useCallback(() => {
       store.shell.openDrawer()
     }, [store])
@@ -59,9 +62,7 @@ export const FeedsTabBar = observer(
               />
             </TouchableOpacity>
           </View>
-          <Text type="title-lg" style={[s.brandBlue, s.bold]}>
-            Bluesky
-          </Text>
+          <Text style={[brandBlue, s.bold, styles.title]}>Bluesky</Text>
           <View style={[pal.view]}>
             <Link
               href="/settings/saved-feeds"
@@ -104,4 +105,7 @@ const styles = StyleSheet.create({
     paddingBottom: 2,
     width: '100%',
   },
+  title: {
+    fontSize: 21,
+  },
 })
diff --git a/src/view/com/posts/MultiFeed.tsx b/src/view/com/posts/MultiFeed.tsx
index 75c57c446..db353909c 100644
--- a/src/view/com/posts/MultiFeed.tsx
+++ b/src/view/com/posts/MultiFeed.tsx
@@ -49,7 +49,6 @@ export const MultiFeed = observer(function Feed({
   extraData?: any
 }) {
   const pal = usePalette('default')
-  const palInverted = usePalette('inverted')
   const theme = useTheme()
   const {track} = useAnalytics()
   const [isRefreshing, setIsRefreshing] = React.useState(false)
@@ -130,15 +129,9 @@ export const MultiFeed = observer(function Feed({
         )
       } else if (item.type === 'footer') {
         return (
-          <Link
-            style={[styles.footerLink, palInverted.view]}
-            href="/search/feeds">
-            <FontAwesomeIcon
-              icon="search"
-              size={18}
-              color={palInverted.colors.text}
-            />
-            <Text type="lg-medium" style={palInverted.text}>
+          <Link style={[styles.footerLink, pal.viewLight]} href="/search/feeds">
+            <FontAwesomeIcon icon="search" size={18} color={pal.colors.text} />
+            <Text type="xl-medium" style={pal.text}>
               Discover new feeds
             </Text>
           </Link>
@@ -146,7 +139,7 @@ export const MultiFeed = observer(function Feed({
       }
       return null
     },
-    [showPostFollowBtn, pal, palInverted],
+    [showPostFollowBtn, pal],
   )
 
   const FeedFooter = React.useCallback(
@@ -181,11 +174,7 @@ export const MultiFeed = observer(function Feed({
             />
           }
           contentContainerStyle={s.contentContainer}
-          style={[
-            {paddingTop: headerOffset},
-            isDesktopWeb ? pal.view : pal.viewLight,
-            styles.container,
-          ]}
+          style={[{paddingTop: headerOffset}, pal.view, styles.container]}
           onScroll={onScroll}
           scrollEventThrottle={scrollEventThrottle}
           indicatorStyle={theme.colorScheme === 'dark' ? 'white' : 'black'}