SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix account screen scrollable options (#6622)

Browse Source
This commit is contained in:
Elias Nahum
2022-09-07 08:48:38 -03:00
committed by GitHub
parent 1597f86aa3
commit 72d12ae1ac
2 changed files with 30 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/screens/home/account/account.tsx
View File

@@ -110,7 +110,6 @@ const AccountScreen = ({currentUser, enableCustomUserStatuses, customStatusExpir
style={[styles.flexRow, animated]}
>
<ScrollView
contentContainerStyle={styles.flex}
alwaysBounceVertical={false}
style={tabletSidebarStyle}
>

71
app/screens/home/account/components/options/index.tsx
View File

@@ -2,10 +2,8 @@
// See LICENSE.txt for license information.
import React from 'react';
import {useWindowDimensions, View} from 'react-native';
import {Shadow} from 'react-native-neomorph-shadows';
import {View} from 'react-native';
import {View as ViewConstants} from '@constants';
import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
import CustomStatus from './custom_status';
@@ -28,10 +26,14 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
return {
container: {
backgroundColor: theme.centerChannelBg,
flex: 1,
height: '100%',
borderTopRightRadius: 12,
borderTopLeftRadius: 12,
paddingTop: 12,
shadowColor: 'rgba(0, 0, 0, 0.12)',
shadowOffset: {width: 0, height: -2},
shadowOpacity: 1,
shadowRadius: 6,
},
divider: {
backgroundColor: changeOpacity(theme.centerChannelColor, 0.2),
@@ -48,46 +50,33 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
const AccountOptions = ({user, enableCustomUserStatuses, isCustomStatusExpirySupported, isTablet, theme}: AccountScreenProps) => {
const styles = getStyleSheet(theme);
const dimensions = useWindowDimensions();
const width = dimensions.width - (isTablet ? ViewConstants.TABLET_SIDEBAR_WIDTH : 0);
return (
<Shadow
style={{
height: dimensions.height,
width,
shadowColor: 'rgba(61, 60, 64, 0.08)',
shadowOffset: {width: 0, height: -2},
shadowOpacity: 1,
shadowRadius: 6,
}}
>
<View style={styles.container}>
<View style={styles.group}>
<UserPresence
currentUser={user}
/>
{enableCustomUserStatuses &&
<CustomStatus
isCustomStatusExpirySupported={isCustomStatusExpirySupported}
isTablet={isTablet}
currentUser={user}
/>}
</View>
<View style={styles.divider}/>
<View style={styles.group}>
<YourProfile
isTablet={isTablet}
theme={theme}
/>
<Settings/>
</View>
<View style={styles.divider}/>
<View style={styles.group}>
<Logout/>
</View>
<View style={styles.container}>
<View style={styles.group}>
<UserPresence
currentUser={user}
/>
{enableCustomUserStatuses &&
<CustomStatus
isCustomStatusExpirySupported={isCustomStatusExpirySupported}
isTablet={isTablet}
currentUser={user}
/>}
</View>
</Shadow>
<View style={styles.divider}/>
<View style={styles.group}>
<YourProfile
isTablet={isTablet}
theme={theme}
/>
<Settings/>
</View>
<View style={styles.divider}/>
<View style={styles.group}>
<Logout/>
</View>
</View>
);
};