improve drawer reflow for large text (#1464)

zio/stable
Eric Bailey 2023-09-15 17:18:09 -05:00 committed by GitHub
parent 754663e5c3
commit 3118e3e933
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 37 deletions

View File

@ -145,7 +145,8 @@ export const DrawerContent = observer(function DrawerContentImpl() {
theme.colorScheme === 'light' ? pal.view : styles.viewDarkMode, theme.colorScheme === 'light' ? pal.view : styles.viewDarkMode,
]}> ]}>
<SafeAreaView style={s.flex1}> <SafeAreaView style={s.flex1}>
<View style={styles.main}> <ScrollView style={styles.main}>
<View style={{}}>
<TouchableOpacity <TouchableOpacity
testID="profileCardButton" testID="profileCardButton"
accessibilityLabel="Profile" accessibilityLabel="Profile"
@ -178,8 +179,11 @@ export const DrawerContent = observer(function DrawerContentImpl() {
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<InviteCodes />
<ScrollView style={styles.main}> <InviteCodes style={{paddingLeft: 0}} />
<View style={{height: 10}} />
<MenuItem <MenuItem
icon={ icon={
isAtSearch ? ( isAtSearch ? (
@ -313,6 +317,8 @@ export const DrawerContent = observer(function DrawerContentImpl() {
accessibilityHint="" accessibilityHint=""
onPress={onPressSettings} onPress={onPressSettings}
/> />
<View style={styles.smallSpacer} />
<View style={styles.smallSpacer} /> <View style={styles.smallSpacer} />
</ScrollView> </ScrollView>
<View style={styles.footer}> <View style={styles.footer}>
@ -405,7 +411,11 @@ function MenuItem({
) )
} }
const InviteCodes = observer(function InviteCodesImpl() { const InviteCodes = observer(function InviteCodesImpl({
style,
}: {
style?: StyleProp<ViewStyle>
}) {
const {track} = useAnalytics() const {track} = useAnalytics()
const store = useStores() const store = useStores()
const pal = usePalette('default') const pal = usePalette('default')
@ -418,7 +428,7 @@ const InviteCodes = observer(function InviteCodesImpl() {
return ( return (
<TouchableOpacity <TouchableOpacity
testID="menuItemInviteCodes" testID="menuItemInviteCodes"
style={[styles.inviteCodes]} style={[styles.inviteCodes, style]}
onPress={onPress} onPress={onPress}
accessibilityRole="button" accessibilityRole="button"
accessibilityLabel={ accessibilityLabel={
@ -448,7 +458,6 @@ const InviteCodes = observer(function InviteCodesImpl() {
const styles = StyleSheet.create({ const styles = StyleSheet.create({
view: { view: {
flex: 1, flex: 1,
paddingTop: 20,
paddingBottom: 50, paddingBottom: 50,
maxWidth: 300, maxWidth: 300,
}, },
@ -524,6 +533,7 @@ const styles = StyleSheet.create({
}, },
footer: { footer: {
flexWrap: 'wrap',
flexDirection: 'row', flexDirection: 'row',
gap: 8, gap: 8,
paddingRight: 20, paddingRight: 20,