diff options
author | Paul Frazee <pfrazee@gmail.com> | 2023-04-25 20:45:59 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-25 20:45:59 -0500 |
commit | ae895155fd2ca317afa59066633c12e8968e9e7c (patch) | |
tree | a83e86b16f48416b800782aaae902e571b87bfaa /src/view/com/util/error/ErrorScreen.tsx | |
parent | 8f3915e0a595fd4cc995ad8c31fed1ea4f5c3f37 (diff) | |
download | voidsky-ae895155fd2ca317afa59066633c12e8968e9e7c.tar.zst |
Fix to error screen and postthread loading state (#540)
* Fix loading state on postthread * Improve error screen rendering * Dark mode exclamation in error screen * Fix lint
Diffstat (limited to 'src/view/com/util/error/ErrorScreen.tsx')
-rw-r--r-- | src/view/com/util/error/ErrorScreen.tsx | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/view/com/util/error/ErrorScreen.tsx b/src/view/com/util/error/ErrorScreen.tsx index c66ee7903..dee625967 100644 --- a/src/view/com/util/error/ErrorScreen.tsx +++ b/src/view/com/util/error/ErrorScreen.tsx @@ -1,13 +1,13 @@ import React from 'react' -import {StyleSheet, TouchableOpacity, View} from 'react-native' +import {StyleSheet, View} from 'react-native' import { FontAwesomeIcon, FontAwesomeIconStyle, } from '@fortawesome/react-native-fontawesome' import {Text} from '../text/Text' -import {colors} from 'lib/styles' import {useTheme} from 'lib/ThemeContext' import {usePalette} from 'lib/hooks/usePalette' +import {Button} from '../forms/Button' import {CenteredView} from '../Views' export function ErrorScreen({ @@ -24,18 +24,18 @@ export function ErrorScreen({ testID?: string }) { const theme = useTheme() - const pal = usePalette('error') + const pal = usePalette('default') return ( <CenteredView testID={testID} style={[styles.outer, pal.view]}> <View style={styles.errorIconContainer}> <View style={[ styles.errorIcon, - {backgroundColor: theme.palette.error.icon}, + {backgroundColor: theme.palette.inverted.background}, ]}> <FontAwesomeIcon icon="exclamation" - style={{color: colors.white}} + style={pal.textInverted} size={24} /> </View> @@ -43,34 +43,30 @@ export function ErrorScreen({ <Text type="title-lg" style={[styles.title, pal.text]}> {title} </Text> - <Text style={[styles.message, pal.textLight]}>{message}</Text> + <Text style={[styles.message, pal.text]}>{message}</Text> {details && ( <Text testID={`${testID}-details`} - type="sm" - style={[ - styles.details, - pal.textInverted, - {backgroundColor: theme.palette.default.background}, - ]}> + style={[styles.details, pal.text, pal.viewLight]}> {details} </Text> )} {onPressTryAgain && ( <View style={styles.btnContainer}> - <TouchableOpacity + <Button testID="errorScreenTryAgainButton" - style={[styles.btn, {backgroundColor: theme.palette.error.icon}]} + type="default" + style={[styles.btn]} onPress={onPressTryAgain}> <FontAwesomeIcon icon="arrows-rotate" - style={pal.text as FontAwesomeIconStyle} + style={pal.link as FontAwesomeIconStyle} size={16} /> - <Text type="button" style={[styles.btnText, pal.text]}> + <Text type="button" style={[styles.btnText, pal.link]}> Try again </Text> - </TouchableOpacity> + </Button> </View> )} </CenteredView> @@ -115,11 +111,10 @@ const styles = StyleSheet.create({ marginBottom: 10, }, errorIcon: { - borderRadius: 30, + borderRadius: 25, width: 50, height: 50, alignItems: 'center', justifyContent: 'center', - marginRight: 5, }, }) |