diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/view/com/auth/Onboarding.tsx | 7 | ||||
-rw-r--r-- | src/view/com/util/layouts/TitleColumnLayout.tsx | 2 | ||||
-rw-r--r-- | src/view/screens/onboarding/RecommendedFeeds.tsx | 20 | ||||
-rw-r--r-- | src/view/screens/onboarding/Welcome.tsx | 32 |
4 files changed, 1 insertions, 60 deletions
diff --git a/src/view/com/auth/Onboarding.tsx b/src/view/com/auth/Onboarding.tsx index 2f0acfc47..429fdddb3 100644 --- a/src/view/com/auth/Onboarding.tsx +++ b/src/view/com/auth/Onboarding.tsx @@ -5,19 +5,12 @@ import {ErrorBoundary} from 'view/com/util/ErrorBoundary' import {s} from 'lib/styles' import {usePalette} from 'lib/hooks/usePalette' import {useStores} from 'state/index' -import {useAnalytics} from 'lib/analytics/analytics' import {Welcome} from './onboarding/Welcome' import {RecommendedFeeds} from './onboarding/RecommendedFeeds' export const Onboarding = observer(() => { const pal = usePalette('default') const store = useStores() - const {screen} = useAnalytics() - - React.useEffect(() => { - screen('Onboarding') - store.shell.setMinimalShellMode(true) - }, [store, screen]) const next = () => store.onboarding.next() const skip = () => store.onboarding.skip() diff --git a/src/view/com/util/layouts/TitleColumnLayout.tsx b/src/view/com/util/layouts/TitleColumnLayout.tsx index 7047446e3..49ad9fcdb 100644 --- a/src/view/com/util/layouts/TitleColumnLayout.tsx +++ b/src/view/com/util/layouts/TitleColumnLayout.tsx @@ -5,7 +5,7 @@ import {useColorSchemeStyle} from 'lib/hooks/useColorSchemeStyle' interface Props { testID?: string - title: React.Component + title: JSX.Element horizontal: boolean titleStyle?: StyleProp<ViewStyle> contentStyle?: StyleProp<ViewStyle> diff --git a/src/view/screens/onboarding/RecommendedFeeds.tsx b/src/view/screens/onboarding/RecommendedFeeds.tsx deleted file mode 100644 index d27278456..000000000 --- a/src/view/screens/onboarding/RecommendedFeeds.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import React from 'react' -import {NativeStackScreenProps} from '@react-navigation/native-stack' -import {HomeTabNavigatorParams} from 'lib/routes/types' -import {useStores} from 'state/index' -import {observer} from 'mobx-react-lite' -import {RecommendedFeeds} from 'view/com/auth/onboarding/RecommendedFeeds' - -type Props = NativeStackScreenProps<HomeTabNavigatorParams, 'RecommendedFeeds'> -export const RecommendedFeedsScreen = observer(({navigation}: Props) => { - const store = useStores() - - const next = () => { - const nextScreenName = store.onboarding.next('RecommendedFeeds') - if (nextScreenName) { - navigation.navigate(nextScreenName) - } - } - - return <RecommendedFeeds next={next} /> -}) diff --git a/src/view/screens/onboarding/Welcome.tsx b/src/view/screens/onboarding/Welcome.tsx deleted file mode 100644 index ea3e5ed77..000000000 --- a/src/view/screens/onboarding/Welcome.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import React from 'react' -import {NativeStackScreenProps} from '@react-navigation/native-stack' -import {HomeTabNavigatorParams} from 'lib/routes/types' -import {useStores} from 'state/index' -import {observer} from 'mobx-react-lite' -import {Welcome} from 'view/com/auth/onboarding/Welcome' - -type Props = NativeStackScreenProps<HomeTabNavigatorParams, 'Welcome'> -export const WelcomeScreen = observer(({navigation}: Props) => { - const store = useStores() - - // make sure bottom nav is hidden - React.useEffect(() => { - if (!store.shell.minimalShellMode) { - store.shell.setMinimalShellMode(true) - } - }, [store.shell.minimalShellMode, store]) - - const next = () => { - const nextScreenName = store.onboarding.next('Welcome') - if (nextScreenName) { - navigation.navigate(nextScreenName) - } - } - - const skip = () => { - store.onboarding.skip() - navigation.navigate('Home') - } - - return <Welcome next={next} skip={skip} /> -}) |