diff --git a/src/view/com/posts/ComposerPrompt.tsx b/src/view/com/posts/ComposerPrompt.tsx deleted file mode 100644 index c367a17f..00000000 --- a/src/view/com/posts/ComposerPrompt.tsx +++ /dev/null @@ -1,5 +0,0 @@ -export function ComposerPrompt(_opts: { - onPressCompose: (imagesOpen?: boolean) => void -}) { - return null -} diff --git a/src/view/com/posts/ComposerPrompt.web.tsx b/src/view/com/posts/ComposerPrompt.web.tsx deleted file mode 100644 index a87653cf..00000000 --- a/src/view/com/posts/ComposerPrompt.web.tsx +++ /dev/null @@ -1,41 +0,0 @@ -import React from 'react' -import {StyleSheet, TouchableWithoutFeedback, View} from 'react-native' -import {Text} from '../util/text/Text' -import {usePalette} from 'lib/hooks/usePalette' -import {s} from 'lib/styles' - -export function ComposerPrompt({ - onPressCompose, -}: { - onPressCompose: (imagesOpen?: boolean) => void -}) { - const pal = usePalette('default') - return ( - onPressCompose(false)}> - - - What's up? - - - - Post - - - - ) -} - -const styles = StyleSheet.create({ - container: { - paddingVertical: 16, - paddingHorizontal: 18, - flexDirection: 'row', - alignItems: 'center', - borderTopWidth: 1, - }, - btn: { - paddingVertical: 6, - paddingHorizontal: 14, - borderRadius: 30, - }, -}) diff --git a/src/view/com/posts/Feed.tsx b/src/view/com/posts/Feed.tsx index 57363ca5..7e5d166d 100644 --- a/src/view/com/posts/Feed.tsx +++ b/src/view/com/posts/Feed.tsx @@ -13,12 +13,10 @@ import {EmptyState} from '../util/EmptyState' import {ErrorMessage} from '../util/error/ErrorMessage' import {FeedModel} from 'state/models/feed-view' import {FeedItem} from './FeedItem' -import {ComposerPrompt} from './ComposerPrompt' import {OnScrollCb} from 'lib/hooks/useOnMainScroll' import {s} from 'lib/styles' import {useAnalytics} from 'lib/analytics' -const COMPOSE_PROMPT_ITEM = {_reactKey: '__prompt__'} const EMPTY_FEED_ITEM = {_reactKey: '__empty__'} const ERROR_FEED_ITEM = {_reactKey: '__error__'} @@ -27,7 +25,6 @@ export const Feed = observer(function Feed({ style, scrollElRef, onPressTryAgain, - onPressCompose, onScroll, testID, headerOffset = 0, @@ -36,7 +33,6 @@ export const Feed = observer(function Feed({ style?: StyleProp scrollElRef?: MutableRefObject | null> onPressTryAgain?: () => void - onPressCompose: (imagesOpen?: boolean) => void onScroll?: OnScrollCb testID?: string headerOffset?: number @@ -47,7 +43,6 @@ export const Feed = observer(function Feed({ const data = React.useMemo(() => { let feedItems: any[] = [] if (feed.hasLoaded) { - feedItems = feedItems.concat([COMPOSE_PROMPT_ITEM]) if (feed.hasError) { feedItems = feedItems.concat([ERROR_FEED_ITEM]) } @@ -91,9 +86,7 @@ export const Feed = observer(function Feed({ // like PureComponent, shouldComponentUpdate, etc const renderItem = React.useCallback( ({item}: {item: any}) => { - if (item === COMPOSE_PROMPT_ITEM) { - return - } else if (item === EMPTY_FEED_ITEM) { + if (item === EMPTY_FEED_ITEM) { return ( }, - [feed, onPressTryAgain, onPressCompose], + [feed, onPressTryAgain], ) const FeedFooter = React.useCallback( diff --git a/src/view/screens/Home.tsx b/src/view/screens/Home.tsx index 125c5740..0e9cdd48 100644 --- a/src/view/screens/Home.tsx +++ b/src/view/screens/Home.tsx @@ -11,7 +11,7 @@ import {ScreenParams} from '../routes' import {s} from 'lib/styles' import {useOnMainScroll} from 'lib/hooks/useOnMainScroll' import {useAnalytics} from 'lib/analytics' -import {isWeb} from 'platform/detection' +import {isWeb} from '../../platform/detection' const HEADER_HEIGHT = 42 @@ -100,7 +100,6 @@ export const Home = observer(function Home({navIdx, visible}: ScreenParams) { scrollElRef={scrollElRef} style={s.h100pct} onPressTryAgain={onPressTryAgain} - onPressCompose={onPressCompose} onScroll={onMainScroll} headerOffset={HEADER_HEIGHT} /> diff --git a/src/view/shell/web/DesktopHeader.tsx b/src/view/shell/web/DesktopHeader.tsx index acef3d9b..bc72b40b 100644 --- a/src/view/shell/web/DesktopHeader.tsx +++ b/src/view/shell/web/DesktopHeader.tsx @@ -92,27 +92,27 @@ export const DesktopHeader = observer(function DesktopHeader({}: { const onPressCompose = () => store.shell.openComposer({}) return ( - + Bluesky } - iconFilled={} + icon={} + iconFilled={} /> } - iconFilled={} + icon={} + iconFilled={} /> } - iconFilled={} + icon={} + iconFilled={} /> @@ -191,6 +191,10 @@ const styles = StyleSheet.create({ backgroundColor: colors.blue3, }, navItemIconWrapper: { + alignItems: 'center', + justifyContent: 'center', + width: 28, + height: 28, marginBottom: 2, }, navItemCount: { diff --git a/src/view/shell/web/index.tsx b/src/view/shell/web/index.tsx index 5258257f..fff34b1c 100644 --- a/src/view/shell/web/index.tsx +++ b/src/view/shell/web/index.tsx @@ -131,10 +131,10 @@ const styles = StyleSheet.create({ height: '100%', }, bgLight: { - backgroundColor: colors.gray1, + backgroundColor: colors.white, }, bgDark: { - backgroundColor: colors.gray1, // TODO + backgroundColor: colors.black, // TODO }, visible: { display: 'flex',