Fixes to dark mode (#238)

zio/stable
Paul Frazee 2023-03-01 10:35:56 -06:00 committed by GitHub
parent d054b1baf8
commit df712a89d3
6 changed files with 29 additions and 18 deletions

View File

@ -379,7 +379,7 @@ export const ComposePost = observer(function ComposePost({
</View> </View>
{isProcessing ? ( {isProcessing ? (
<View style={[pal.btn, styles.processingLine]}> <View style={[pal.btn, styles.processingLine]}>
<Text style={s.black}>{processingState}</Text> <Text style={pal.text}>{processingState}</Text>
</View> </View>
) : undefined} ) : undefined}
{error !== '' && ( {error !== '' && (
@ -468,7 +468,7 @@ export const ComposePost = observer(function ComposePost({
key={`suggested-${url}`} key={`suggested-${url}`}
style={[pal.borderDark, styles.addExtLinkBtn]} style={[pal.borderDark, styles.addExtLinkBtn]}
onPress={() => onPressAddLinkCard(url)}> onPress={() => onPressAddLinkCard(url)}>
<Text> <Text style={pal.text}>
Add link card: <Text style={pal.link}>{url}</Text> Add link card: <Text style={pal.link}>{url}</Text>
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>

View File

@ -106,7 +106,7 @@ export function Component({
} }
return ( return (
<View style={s.flex1}> <View style={[s.flex1, pal.view]}>
<ScrollView style={styles.inner}> <ScrollView style={styles.inner}>
<Text style={[styles.title, pal.text]}>Edit my profile</Text> <Text style={[styles.title, pal.text]}>Edit my profile</Text>
<View style={styles.photos}> <View style={styles.photos}>
@ -130,7 +130,7 @@ export function Component({
</View> </View>
)} )}
<View> <View>
<Text style={styles.label}>Display Name</Text> <Text style={[styles.label, pal.text]}>Display Name</Text>
<TextInput <TextInput
style={[styles.textInput, pal.text]} style={[styles.textInput, pal.text]}
placeholder="e.g. Alice Roberts" placeholder="e.g. Alice Roberts"

View File

@ -14,6 +14,7 @@ import {Text} from '../util/text/Text'
import * as Toast from '../util/Toast' import * as Toast from '../util/Toast'
import {ErrorMessage} from '../util/error/ErrorMessage' import {ErrorMessage} from '../util/error/ErrorMessage'
import {cleanError} from 'lib/strings/errors' import {cleanError} from 'lib/strings/errors'
import {usePalette} from 'lib/hooks/usePalette'
const ITEMS: RadioGroupItem[] = [ const ITEMS: RadioGroupItem[] = [
{key: 'spam', label: 'Spam or excessive repeat posts'}, {key: 'spam', label: 'Spam or excessive repeat posts'},
@ -25,6 +26,7 @@ export const snapPoints = ['50%']
export function Component({did}: {did: string}) { export function Component({did}: {did: string}) {
const store = useStores() const store = useStores()
const pal = usePalette('default')
const [isProcessing, setIsProcessing] = useState<boolean>(false) const [isProcessing, setIsProcessing] = useState<boolean>(false)
const [error, setError] = useState<string>('') const [error, setError] = useState<string>('')
const [issue, setIssue] = useState<string>('') const [issue, setIssue] = useState<string>('')
@ -59,9 +61,9 @@ export function Component({did}: {did: string}) {
} }
} }
return ( return (
<View style={[s.flex1, s.pl10, s.pr10]}> <View style={[s.flex1, s.pl10, s.pr10, pal.view]}>
<Text style={styles.title}>Report account</Text> <Text style={[pal.text, styles.title]}>Report account</Text>
<Text style={styles.description}> <Text style={[pal.textLight, styles.description]}>
What is the issue with this account? What is the issue with this account?
</Text> </Text>
<RadioGroup items={ITEMS} onSelect={onSelectIssue} /> <RadioGroup items={ITEMS} onSelect={onSelectIssue} />
@ -100,7 +102,6 @@ const styles = StyleSheet.create({
textAlign: 'center', textAlign: 'center',
fontSize: 17, fontSize: 17,
paddingHorizontal: 22, paddingHorizontal: 22,
color: colors.gray5,
marginBottom: 10, marginBottom: 10,
}, },
btn: { btn: {

View File

@ -14,6 +14,7 @@ import {Text} from '../util/text/Text'
import * as Toast from '../util/Toast' import * as Toast from '../util/Toast'
import {ErrorMessage} from '../util/error/ErrorMessage' import {ErrorMessage} from '../util/error/ErrorMessage'
import {cleanError} from 'lib/strings/errors' import {cleanError} from 'lib/strings/errors'
import {usePalette} from 'lib/hooks/usePalette'
const ITEMS: RadioGroupItem[] = [ const ITEMS: RadioGroupItem[] = [
{key: 'spam', label: 'Spam or excessive repeat posts'}, {key: 'spam', label: 'Spam or excessive repeat posts'},
@ -32,6 +33,7 @@ export function Component({
postCid: string postCid: string
}) { }) {
const store = useStores() const store = useStores()
const pal = usePalette('default')
const [isProcessing, setIsProcessing] = useState<boolean>(false) const [isProcessing, setIsProcessing] = useState<boolean>(false)
const [error, setError] = useState<string>('') const [error, setError] = useState<string>('')
const [issue, setIssue] = useState<string>('') const [issue, setIssue] = useState<string>('')
@ -67,9 +69,11 @@ export function Component({
} }
} }
return ( return (
<View style={[s.flex1, s.pl10, s.pr10]}> <View style={[s.flex1, s.pl10, s.pr10, pal.view]}>
<Text style={styles.title}>Report post</Text> <Text style={[pal.text, styles.title]}>Report post</Text>
<Text style={styles.description}>What is the issue with this post?</Text> <Text style={[pal.textLight, styles.description]}>
What is the issue with this post?
</Text>
<RadioGroup items={ITEMS} onSelect={onSelectIssue} /> <RadioGroup items={ITEMS} onSelect={onSelectIssue} />
{error ? ( {error ? (
<View style={s.mt10}> <View style={s.mt10}>
@ -106,7 +110,6 @@ const styles = StyleSheet.create({
textAlign: 'center', textAlign: 'center',
fontSize: 17, fontSize: 17,
paddingHorizontal: 22, paddingHorizontal: 22,
color: colors.gray5,
marginBottom: 10, marginBottom: 10,
}, },
btn: { btn: {

View File

@ -81,6 +81,7 @@ export const Search = observer(({navIdx, visible, params}: ScreenParams) => {
const onPressCancelSearch = () => { const onPressCancelSearch = () => {
setQuery('') setQuery('')
autocompleteView.setActive(false) autocompleteView.setActive(false)
textInput.current?.blur()
} }
return ( return (
@ -127,10 +128,10 @@ export const Search = observer(({navIdx, visible, params}: ScreenParams) => {
onChangeText={onChangeQuery} onChangeText={onChangeQuery}
/> />
</View> </View>
{query ? ( {query || isInputFocused ? (
<View style={styles.headerCancelBtn}> <View style={styles.headerCancelBtn}>
<TouchableOpacity onPress={onPressCancelSearch}> <TouchableOpacity onPress={onPressCancelSearch}>
<Text>Cancel</Text> <Text style={pal.text}>Cancel</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
) : undefined} ) : undefined}

View File

@ -5,7 +5,10 @@ import {
TouchableOpacity, TouchableOpacity,
View, View,
} from 'react-native' } from 'react-native'
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {
FontAwesomeIcon,
FontAwesomeIconStyle,
} from '@fortawesome/react-native-fontawesome'
import {observer} from 'mobx-react-lite' import {observer} from 'mobx-react-lite'
import * as AppInfo from 'lib/app-info' import * as AppInfo from 'lib/app-info'
import {useStores} from 'state/index' import {useStores} from 'state/index'
@ -151,7 +154,10 @@ export const Settings = observer(function Settings({
isSwitching && styles.dimmed, isSwitching && styles.dimmed,
]} ]}
onPress={isSwitching ? undefined : onPressAddAccount}> onPress={isSwitching ? undefined : onPressAddAccount}>
<FontAwesomeIcon icon="plus" /> <FontAwesomeIcon
icon="plus"
style={pal.text as FontAwesomeIconStyle}
/>
<View style={[s.ml5]}> <View style={[s.ml5]}>
<Text type="md-medium" style={pal.text}> <Text type="md-medium" style={pal.text}>
Add account Add account
@ -160,7 +166,7 @@ export const Settings = observer(function Settings({
</TouchableOpacity> </TouchableOpacity>
<View style={styles.spacer} /> <View style={styles.spacer} />
<Text type="sm-medium" style={[s.mb5]}> <Text type="sm-medium" style={[s.mb5, pal.text]}>
Danger zone Danger zone
</Text> </Text>
<TouchableOpacity <TouchableOpacity
@ -168,7 +174,7 @@ export const Settings = observer(function Settings({
onPress={onPressDeleteAccount}> onPress={onPressDeleteAccount}>
<Text style={pal.textLight}>Delete my account</Text> <Text style={pal.textLight}>Delete my account</Text>
</TouchableOpacity> </TouchableOpacity>
<Text type="sm-medium" style={[s.mt10, s.mb5]}> <Text type="sm-medium" style={[s.mt10, s.mb5, pal.text]}>
Developer tools Developer tools
</Text> </Text>
<Link <Link