more design tweaks
This commit is contained in:
@@ -4,6 +4,7 @@ import {GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs'
|
|||||||
import {msg} from '@lingui/macro'
|
import {msg} from '@lingui/macro'
|
||||||
import {useLingui} from '@lingui/react'
|
import {useLingui} from '@lingui/react'
|
||||||
|
|
||||||
|
import {DISCOVER_FEED_URI} from 'lib/constants'
|
||||||
import {isWeb} from 'platform/detection'
|
import {isWeb} from 'platform/detection'
|
||||||
import {UserAvatar} from 'view/com/util/UserAvatar'
|
import {UserAvatar} from 'view/com/util/UserAvatar'
|
||||||
import {WizardAction, WizardState} from '#/screens/StarterPack/Wizard/State'
|
import {WizardAction, WizardState} from '#/screens/StarterPack/Wizard/State'
|
||||||
@@ -24,7 +25,10 @@ export function WizardFeedCard({
|
|||||||
const {_} = useLingui()
|
const {_} = useLingui()
|
||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
|
|
||||||
const includesFeed = state.feeds.some(f => f.uri === generator.uri)
|
const isDiscover = generator.uri === DISCOVER_FEED_URI
|
||||||
|
const includesFeed =
|
||||||
|
isDiscover || state.feeds.some(f => f.uri === generator.uri)
|
||||||
|
|
||||||
const onPressAddRemove = () => {
|
const onPressAddRemove = () => {
|
||||||
Keyboard.dismiss()
|
Keyboard.dismiss()
|
||||||
if (includesFeed) {
|
if (includesFeed) {
|
||||||
@@ -70,6 +74,7 @@ export function WizardFeedCard({
|
|||||||
: _(msg`Add ${generator.displayName} to starter pack`)
|
: _(msg`Add ${generator.displayName} to starter pack`)
|
||||||
}
|
}
|
||||||
value={includesFeed}
|
value={includesFeed}
|
||||||
|
disabled={isDiscover}
|
||||||
onChange={onPressAddRemove}>
|
onChange={onPressAddRemove}>
|
||||||
<Checkbox />
|
<Checkbox />
|
||||||
</Toggle.Item>
|
</Toggle.Item>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
|
|||||||
import {GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs'
|
import {GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs'
|
||||||
import debounce from 'lodash.debounce'
|
import debounce from 'lodash.debounce'
|
||||||
|
|
||||||
import {DISCOVER_FEED_URI} from 'lib/constants'
|
|
||||||
import {
|
import {
|
||||||
useGetPopularFeedsQuery,
|
useGetPopularFeedsQuery,
|
||||||
useSearchPopularFeedsMutation,
|
useSearchPopularFeedsMutation,
|
||||||
@@ -52,10 +51,6 @@ export function StepFeeds() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const filterFeeds = (feeds?: GeneratorView[]) => {
|
|
||||||
return feeds?.filter(feed => feed.uri !== DISCOVER_FEED_URI)
|
|
||||||
}
|
|
||||||
|
|
||||||
const renderItem = ({item}: ListRenderItemInfo<GeneratorView>) => {
|
const renderItem = ({item}: ListRenderItemInfo<GeneratorView>) => {
|
||||||
return <WizardFeedCard generator={item} state={state} dispatch={dispatch} />
|
return <WizardFeedCard generator={item} state={state} dispatch={dispatch} />
|
||||||
}
|
}
|
||||||
@@ -73,7 +68,7 @@ export function StepFeeds() {
|
|||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
<List
|
<List
|
||||||
data={filterFeeds(query ? searchedFeeds : popularFeeds)}
|
data={query ? searchedFeeds : popularFeeds}
|
||||||
renderItem={renderItem}
|
renderItem={renderItem}
|
||||||
keyExtractor={keyExtractor}
|
keyExtractor={keyExtractor}
|
||||||
contentContainerStyle={{paddingTop: 6}}
|
contentContainerStyle={{paddingTop: 6}}
|
||||||
|
|||||||
@@ -679,7 +679,6 @@ function Footer({
|
|||||||
variant="solid"
|
variant="solid"
|
||||||
color="primary"
|
color="primary"
|
||||||
size="small"
|
size="small"
|
||||||
style={{width: 70}}
|
|
||||||
onPress={onNext}
|
onPress={onNext}
|
||||||
disabled={!state.canNext}>
|
disabled={!state.canNext}>
|
||||||
<ButtonText>{nextBtnText}</ButtonText>
|
<ButtonText>{nextBtnText}</ButtonText>
|
||||||
|
|||||||
Reference in New Issue
Block a user