robinwobin.dev / witchsky.app
forked from jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Make right nav scrollable on short screens (#2186)

authored by

Eric Bailey and committed by
GitHub 2f8e7b26 e7141a77

+63 -60
+63 -60
src/view/shell/desktop/RightNav.tsx
··· 15 15 import {Plural, Trans, msg, plural} from '@lingui/macro' 16 16 import {useSession} from '#/state/session' 17 17 import {useInviteCodesQuery} from '#/state/queries/invites' 18 + import {ScrollView} from '#/view/com/util/Views' 18 19 19 20 export function DesktopRightNav() { 20 21 const pal = usePalette('default') ··· 29 30 30 31 return ( 31 32 <View style={[styles.rightNav, pal.view]}> 32 - <DesktopSearch /> 33 + <ScrollView contentContainerStyle={{borderWidth: 0}}> 34 + <View style={{paddingVertical: 20}}> 35 + <DesktopSearch /> 33 36 34 - {hasSession && ( 35 - <View style={{paddingTop: 18, marginBottom: 18}}> 36 - <DesktopFeeds /> 37 - </View> 38 - )} 37 + {hasSession && ( 38 + <View style={{paddingTop: 18, marginBottom: 18}}> 39 + <DesktopFeeds /> 40 + </View> 41 + )} 39 42 40 - <View 41 - style={[ 42 - styles.message, 43 - { 44 - paddingTop: hasSession ? 0 : 18, 45 - }, 46 - ]}> 47 - {isSandbox ? ( 48 - <View style={[palError.view, styles.messageLine, s.p10]}> 49 - <Text type="md" style={[palError.text, s.bold]}> 50 - SANDBOX. Posts and accounts are not permanent. 51 - </Text> 52 - </View> 53 - ) : undefined} 54 - <View style={[s.flexRow]}> 55 - {hasSession && ( 56 - <> 43 + <View 44 + style={[ 45 + styles.message, 46 + { 47 + paddingTop: hasSession ? 0 : 18, 48 + }, 49 + ]}> 50 + {isSandbox ? ( 51 + <View style={[palError.view, styles.messageLine, s.p10]}> 52 + <Text type="md" style={[palError.text, s.bold]}> 53 + SANDBOX. Posts and accounts are not permanent. 54 + </Text> 55 + </View> 56 + ) : undefined} 57 + <View style={[s.flexRow]}> 58 + {hasSession && ( 59 + <> 60 + <TextLink 61 + type="md" 62 + style={pal.link} 63 + href={FEEDBACK_FORM_URL({ 64 + email: currentAccount?.email, 65 + handle: currentAccount?.handle, 66 + })} 67 + text={_(msg`Feedback`)} 68 + /> 69 + <Text type="md" style={pal.textLight}> 70 + &nbsp;&middot;&nbsp; 71 + </Text> 72 + </> 73 + )} 74 + <TextLink 75 + type="md" 76 + style={pal.link} 77 + href="https://blueskyweb.xyz/support/privacy-policy" 78 + text={_(msg`Privacy`)} 79 + /> 80 + <Text type="md" style={pal.textLight}> 81 + &nbsp;&middot;&nbsp; 82 + </Text> 57 83 <TextLink 58 84 type="md" 59 85 style={pal.link} 60 - href={FEEDBACK_FORM_URL({ 61 - email: currentAccount?.email, 62 - handle: currentAccount?.handle, 63 - })} 64 - text={_(msg`Feedback`)} 86 + href="https://blueskyweb.xyz/support/tos" 87 + text={_(msg`Terms`)} 65 88 /> 66 89 <Text type="md" style={pal.textLight}> 67 90 &nbsp;&middot;&nbsp; 68 91 </Text> 69 - </> 70 - )} 71 - <TextLink 72 - type="md" 73 - style={pal.link} 74 - href="https://blueskyweb.xyz/support/privacy-policy" 75 - text={_(msg`Privacy`)} 76 - /> 77 - <Text type="md" style={pal.textLight}> 78 - &nbsp;&middot;&nbsp; 79 - </Text> 80 - <TextLink 81 - type="md" 82 - style={pal.link} 83 - href="https://blueskyweb.xyz/support/tos" 84 - text={_(msg`Terms`)} 85 - /> 86 - <Text type="md" style={pal.textLight}> 87 - &nbsp;&middot;&nbsp; 88 - </Text> 89 - <TextLink 90 - type="md" 91 - style={pal.link} 92 - href={HELP_DESK_URL} 93 - text={_(msg`Help`)} 94 - /> 92 + <TextLink 93 + type="md" 94 + style={pal.link} 95 + href={HELP_DESK_URL} 96 + text={_(msg`Help`)} 97 + /> 98 + </View> 99 + </View> 100 + 101 + {hasSession && <InviteCodes />} 95 102 </View> 96 - </View> 97 - 98 - {hasSession && <InviteCodes />} 103 + </ScrollView> 99 104 </View> 100 105 ) 101 106 } ··· 168 173 const styles = StyleSheet.create({ 169 174 rightNav: { 170 175 position: 'absolute', 171 - top: 20, 172 176 // @ts-ignore web only 173 177 left: 'calc(50vw + 320px)', 174 178 width: 304, 175 - // @ts-ignore web only 176 - maxHeight: '90vh', 179 + height: '100%', 177 180 }, 178 181 179 182 message: {