diff options
Diffstat (limited to 'src/view/com/util')
-rw-r--r-- | src/view/com/util/ViewHeader.tsx | 26 | ||||
-rw-r--r-- | src/view/com/util/ViewSelector.tsx | 3 |
2 files changed, 14 insertions, 15 deletions
diff --git a/src/view/com/util/ViewHeader.tsx b/src/view/com/util/ViewHeader.tsx index 12aa86a4f..2f0e50431 100644 --- a/src/view/com/util/ViewHeader.tsx +++ b/src/view/com/util/ViewHeader.tsx @@ -28,6 +28,9 @@ export const ViewHeader = observer(function ViewHeader({ const onPressBack = () => { store.nav.tab.goBack() } + const onPressMenu = () => { + store.shell.setMainMenuOpen(true) + } const onPressCompose = () => { store.shell.openComposer({onPost}) } @@ -40,21 +43,20 @@ export const ViewHeader = observer(function ViewHeader({ console.log(e) }) } + const canGoBack = store.nav.tab.canGoBack return ( <> <View style={styles.header}> - {store.nav.tab.canGoBack ? ( - <TouchableOpacity - onPress={onPressBack} - hitSlop={BACK_HITSLOP} - style={styles.backIcon}> - <FontAwesomeIcon - size={18} - icon="angle-left" - style={{marginTop: 6}} - /> - </TouchableOpacity> - ) : undefined} + <TouchableOpacity + onPress={canGoBack ? onPressBack : onPressMenu} + hitSlop={BACK_HITSLOP} + style={styles.backIcon}> + <FontAwesomeIcon + size={18} + icon={canGoBack ? 'angle-left' : 'bars'} + style={{marginTop: 6}} + /> + </TouchableOpacity> <View style={styles.titleContainer} pointerEvents="none"> <Text style={styles.title}>{title}</Text> {subtitle ? ( diff --git a/src/view/com/util/ViewSelector.tsx b/src/view/com/util/ViewSelector.tsx index f39254977..b2d69571f 100644 --- a/src/view/com/util/ViewSelector.tsx +++ b/src/view/com/util/ViewSelector.tsx @@ -44,9 +44,6 @@ export function ViewSelector({ } const onPressSelection = (index: number) => setSelectedIndex(index) useEffect(() => { - store.shell.setViewControllingSwipes( - Boolean(swipeEnabled) && selectedIndex > 0, - ) onSelectView?.(selectedIndex) }, [selectedIndex]) |