Show setting header in web

zio/stable
Rahul Yadav 2023-12-30 14:46:27 +05:30 committed by GitHub
parent 1f037a0b43
commit d9e68d1604
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 5 deletions

View File

@ -147,7 +147,7 @@ export function SettingsScreen({}: Props) {
const setRequireAltTextEnabled = useSetRequireAltTextEnabled() const setRequireAltTextEnabled = useSetRequireAltTextEnabled()
const onboardingDispatch = useOnboardingDispatch() const onboardingDispatch = useOnboardingDispatch()
const navigation = useNavigation<NavigationProp>() const navigation = useNavigation<NavigationProp>()
const {isMobile} = useWebMediaQueries() const {isMobile, isTabletOrDesktop} = useWebMediaQueries()
const {screen, track} = useAnalytics() const {screen, track} = useAnalytics()
const {openModal} = useModalControls() const {openModal} = useModalControls()
const {isSwitchingAccounts, accounts, currentAccount} = useSession() const {isSwitchingAccounts, accounts, currentAccount} = useSession()
@ -273,11 +273,17 @@ export function SettingsScreen({}: Props) {
}, []) }, [])
return ( return (
<View style={[s.hContentRegion]} testID="settingsScreen"> <CenteredView
<ViewHeader title={_(msg`Settings`)} /> style={[
s.hContentRegion,
pal.border,
isTabletOrDesktop ? styles.desktopContainer : pal.viewLight,
]}
testID="settingsScreen">
<ViewHeader title={_(msg`Settings`)} showOnDesktop />
<ScrollView <ScrollView
style={[s.hContentRegion]} style={[s.hContentRegion]}
contentContainerStyle={isMobile && pal.viewLight} contentContainerStyle={[isMobile && pal.viewLight, styles.noBorder]}
scrollIndicatorInsets={{right: 1}}> scrollIndicatorInsets={{right: 1}}>
<View style={styles.spacer20} /> <View style={styles.spacer20} />
{currentAccount ? ( {currentAccount ? (
@ -752,7 +758,7 @@ export function SettingsScreen({}: Props) {
</View> </View>
<View style={s.footerSpacer} /> <View style={s.footerSpacer} />
</ScrollView> </ScrollView>
</View> </CenteredView>
) )
} }
@ -897,4 +903,14 @@ const styles = StyleSheet.create({
alignItems: 'center', alignItems: 'center',
paddingLeft: 18, paddingLeft: 18,
}, },
desktopContainer: {
borderLeftWidth: 1,
borderRightWidth: 1,
},
noBorder: {
borderBottomWidth: 0,
borderTopWidth: 0,
borderRightWidth: 0,
borderLeftWidth: 0,
},
}) })