diff options
| -rw-r--r-- | src/state/models/session.ts | 1 | ||||
| -rw-r--r-- | src/state/models/ui/shell.ts | 10 | ||||
| -rw-r--r-- | src/view/com/util/WelcomeBanner.tsx | 101 | ||||
| -rw-r--r-- | src/view/screens/Home.tsx | 2 |
4 files changed, 0 insertions, 114 deletions
diff --git a/src/state/models/session.ts b/src/state/models/session.ts index 306c265d8..efd7a5fa8 100644 --- a/src/state/models/session.ts +++ b/src/state/models/session.ts @@ -377,7 +377,6 @@ export class SessionModel { ) this.setActiveSession(agent, did) - this.rootStore.shell.setOnboarding(true) this._log('SessionModel:createAccount succeeded') } diff --git a/src/state/models/ui/shell.ts b/src/state/models/ui/shell.ts index 4e3aa5332..fec1e2899 100644 --- a/src/state/models/ui/shell.ts +++ b/src/state/models/ui/shell.ts @@ -129,7 +129,6 @@ export class ShellUiModel { activeLightbox: ProfileImageLightbox | ImagesLightbox | undefined isComposerActive = false composerOpts: ComposerOpts | undefined - isOnboarding = false constructor(public rootStore: RootStoreModel) { makeAutoObservable(this, { @@ -205,13 +204,4 @@ export class ShellUiModel { this.isComposerActive = false this.composerOpts = undefined } - - setOnboarding(v: boolean) { - this.isOnboarding = v - if (this.isOnboarding) { - this.rootStore.me.mainFeed.switchFeedType('suggested') - } else { - this.rootStore.me.mainFeed.switchFeedType('home') - } - } } diff --git a/src/view/com/util/WelcomeBanner.tsx b/src/view/com/util/WelcomeBanner.tsx deleted file mode 100644 index 428a30764..000000000 --- a/src/view/com/util/WelcomeBanner.tsx +++ /dev/null @@ -1,101 +0,0 @@ -import React from 'react' -import {StyleSheet, View} from 'react-native' -import {observer} from 'mobx-react-lite' -import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' -import {usePalette} from 'lib/hooks/usePalette' -import {Text} from './text/Text' -import {Button} from './forms/Button' -import {s} from 'lib/styles' -import {useStores} from 'state/index' -import {SUGGESTED_FOLLOWS} from 'lib/constants' -// @ts-ignore no type definition -prf -import ProgressBar from 'react-native-progress/Bar' -import {CenteredView} from './Views' - -export const WelcomeBanner = observer(() => { - const pal = usePalette('default') - const store = useStores() - const [isReady, setIsReady] = React.useState(false) - - const numFollows = Math.min( - SUGGESTED_FOLLOWS(String(store.agent.service)).length, - 5, - ) - const remaining = numFollows - store.me.follows.numFollows - - React.useEffect(() => { - if (remaining <= 0) { - // wait 500ms for the progress bar anim to finish - const ti = setTimeout(() => { - setIsReady(true) - }, 500) - return () => clearTimeout(ti) - } else { - setIsReady(false) - } - }, [remaining]) - - const onPressDone = React.useCallback(() => { - store.shell.setOnboarding(false) - }, [store]) - - return ( - <CenteredView - testID="welcomeBanner" - style={[pal.view, styles.container, pal.border]}> - <Text - type="title-lg" - style={[pal.text, s.textCenter, s.bold, s.pb5]} - lineHeight={1.1}> - Welcome to Bluesky! - </Text> - {isReady ? ( - <View style={styles.controls}> - <Button - type="primary" - style={[s.flexRow, s.alignCenter]} - onPress={onPressDone}> - <Text type="md-bold" style={s.white}> - See my feed! - </Text> - <FontAwesomeIcon icon="angle-right" size={14} style={s.white} /> - </Button> - </View> - ) : ( - <> - <Text type="lg" style={[pal.text, s.textCenter]}> - Follow at least {remaining} {remaining === 1 ? 'person' : 'people'}{' '} - to build your feed. - </Text> - <View style={[styles.controls, styles.progress]}> - <ProgressBar - progress={Math.max( - store.me.follows.numFollows / numFollows, - 0.05, - )} - /> - </View> - </> - )} - </CenteredView> - ) -}) - -const styles = StyleSheet.create({ - container: { - paddingTop: 16, - paddingBottom: 16, - paddingHorizontal: 20, - borderTopWidth: 1, - borderBottomWidth: 1, - }, - controls: { - flexDirection: 'row', - alignItems: 'center', - justifyContent: 'center', - marginTop: 10, - }, - progress: { - marginTop: 12, - }, -}) diff --git a/src/view/screens/Home.tsx b/src/view/screens/Home.tsx index f1d03233a..5250f1155 100644 --- a/src/view/screens/Home.tsx +++ b/src/view/screens/Home.tsx @@ -14,7 +14,6 @@ import {FeedModel} from 'state/models/feed-view' import {withAuthRequired} from 'view/com/auth/withAuthRequired' import {Feed} from '../com/posts/Feed' import {LoadLatestBtn} from '../com/util/LoadLatestBtn' -import {WelcomeBanner} from '../com/util/WelcomeBanner' import {TabBar} from 'view/com/util/TabBar' import {Pager, PageSelectedEvent, TabBarProps} from 'view/com/util/Pager' import {FAB} from '../com/util/FAB' @@ -202,7 +201,6 @@ const FeedPage = observer( return ( <View style={containerStyle}> - {store.shell.isOnboarding && <WelcomeBanner />} <Feed testID="homeFeed" key="default" |