diff options
author | Paul Frazee <pfrazee@gmail.com> | 2023-03-31 13:17:26 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-31 13:17:26 -0500 |
commit | a3334a01a221877d3e06e02f960fda441f3460bd (patch) | |
tree | 64cdbb1232d1a3c00750c346b6e3ae529b51d1b0 /src/view/shell | |
parent | 19f3a2fa92a61ddb785fc4e42d73792c1d0e772c (diff) | |
download | voidsky-a3334a01a221877d3e06e02f960fda441f3460bd.tar.zst |
Lex refactor (#362)
* Remove the hackcheck for upgrades * Rename the PostEmbeds folder to match the codebase style * Updates to latest lex refactor * Update to use new bsky agent * Update to use api package's richtext library * Switch to upsertProfile * Add TextEncoder/TextDecoder polyfill * Add Intl.Segmenter polyfill * Update composer to calculate lengths by grapheme * Fix detox * Fix login in e2e * Create account e2e passing * Implement an e2e mocking framework * Don't use private methods on mobx models as mobx can't track them * Add tooling for e2e-specific builds and add e2e media-picker mock * Add some tests and fix some bugs around profile editing * Add shell tests * Add home screen tests * Add thread screen tests * Add tests for other user profile screens * Add search screen tests * Implement profile imagery change tools and tests * Update to new embed behaviors * Add post tests * Fix to profile-screen test * Fix session resumption * Update web composer to new api * 1.11.0 * Fix pagination cursor parameters * Add quote posts to notifications * Fix embed layouts * Remove youtube inline player and improve tap handling on link cards * Reset minimal shell mode on all screen loads and feed swipes (close #299) * Update podfile.lock * Improve post notfound UI (close #366) * Bump atproto packages
Diffstat (limited to 'src/view/shell')
-rw-r--r-- | src/view/shell/BottomBar.tsx | 7 | ||||
-rw-r--r-- | src/view/shell/Drawer.tsx | 2 | ||||
-rw-r--r-- | src/view/shell/index.tsx | 37 |
3 files changed, 8 insertions, 38 deletions
diff --git a/src/view/shell/BottomBar.tsx b/src/view/shell/BottomBar.tsx index bfbd7f0a2..e46eeb991 100644 --- a/src/view/shell/BottomBar.tsx +++ b/src/view/shell/BottomBar.tsx @@ -112,6 +112,7 @@ export const BottomBar = observer(({navigation}: BottomTabBarProps) => { footerMinimalShellTransform, ]}> <Btn + testID="bottomBarHomeBtn" icon={ isAtHome ? ( <HomeIconSolid @@ -130,6 +131,7 @@ export const BottomBar = observer(({navigation}: BottomTabBarProps) => { onPress={onPressHome} /> <Btn + testID="bottomBarSearchBtn" icon={ isAtSearch ? ( <MagnifyingGlassIcon2Solid @@ -148,6 +150,7 @@ export const BottomBar = observer(({navigation}: BottomTabBarProps) => { onPress={onPressSearch} /> <Btn + testID="bottomBarNotificationsBtn" icon={ isAtNotifications ? ( <BellIconSolid @@ -167,6 +170,7 @@ export const BottomBar = observer(({navigation}: BottomTabBarProps) => { notificationCount={store.me.notifications.unreadCount} /> <Btn + testID="bottomBarProfileBtn" icon={ <View style={styles.ctrlIconSizingWrapper}> <UserIcon @@ -183,11 +187,13 @@ export const BottomBar = observer(({navigation}: BottomTabBarProps) => { }) function Btn({ + testID, icon, notificationCount, onPress, onLongPress, }: { + testID?: string icon: JSX.Element notificationCount?: number onPress?: (event: GestureResponderEvent) => void @@ -195,6 +201,7 @@ function Btn({ }) { return ( <TouchableOpacity + testID={testID} style={styles.ctrl} onPress={onLongPress ? onPress : undefined} onPressIn={onLongPress ? undefined : onPress} diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx index a33cf8c4e..ccf64c0e6 100644 --- a/src/view/shell/Drawer.tsx +++ b/src/view/shell/Drawer.tsx @@ -162,7 +162,7 @@ export const DrawerContent = observer(() => { return ( <View - testID="menuView" + testID="drawer" style={[ styles.view, theme.colorScheme === 'light' ? pal.view : styles.viewDarkMode, diff --git a/src/view/shell/index.tsx b/src/view/shell/index.tsx index eec0f8ed4..84242c283 100644 --- a/src/view/shell/index.tsx +++ b/src/view/shell/index.tsx @@ -7,11 +7,9 @@ import {useNavigationState} from '@react-navigation/native' import {useStores} from 'state/index' import {ModalsContainer} from 'view/com/modals/Modal' import {Lightbox} from 'view/com/lightbox/Lightbox' -import {Text} from 'view/com/util/text/Text' import {ErrorBoundary} from 'view/com/util/ErrorBoundary' import {DrawerContent} from './Drawer' import {Composer} from './Composer' -import {s} from 'lib/styles' import {useTheme} from 'lib/ThemeContext' import {usePalette} from 'lib/hooks/usePalette' import {RoutesContainer, TabsNavigator} from '../../Navigation' @@ -72,41 +70,6 @@ const ShellInner = observer(() => { export const Shell: React.FC = observer(() => { const theme = useTheme() const pal = usePalette('default') - const store = useStores() - - if (store.hackUpgradeNeeded) { - return ( - <View style={styles.outerContainer}> - <View style={[s.flexCol, s.p20, s.h100pct]}> - <View style={s.flex1} /> - <View> - <Text type="title-2xl" style={s.pb10}> - Update required - </Text> - <Text style={[s.pb20, s.bold]}> - Please update your app to the latest version. If no update is - available yet, please check the App Store in a day or so. - </Text> - <Text type="title" style={s.pb10}> - What's happening? - </Text> - <Text style={s.pb10}> - We're in the final stages of the AT Protocol's v1 development. To - make sure everything works as well as possible, we're making final - breaking changes to the APIs. - </Text> - <Text> - If we didn't botch this process, a new version of the app should - be available now. - </Text> - </View> - <View style={s.flex1} /> - <View style={s.footerSpacer} /> - </View> - </View> - ) - } - return ( <View testID="mobileShellView" style={[styles.outerContainer, pal.view]}> <StatusBar |