Update layouts on a bunch of views

zio/stable
Paul Frazee 2023-01-26 20:33:47 -06:00
parent 9659625e8e
commit df57c69f06
6 changed files with 37 additions and 26 deletions

View File

@ -1,6 +1,7 @@
import React from 'react'
import {observer} from 'mobx-react-lite'
import {FlatList, StyleSheet, View} from 'react-native'
import {StyleSheet, View} from 'react-native'
import {CenteredView, FlatList} from '../util/Views'
import {NotificationsViewModel} from '../../../state/models/notifications-view'
import {FeedItem} from './FeedItem'
import {NotificationFeedLoadingPlaceholder} from '../util/LoadingPlaceholder'
@ -60,10 +61,15 @@ export const Feed = observer(function Feed({
}
return (
<View style={s.h100pct}>
{view.isLoading && !data && <NotificationFeedLoadingPlaceholder />}
{view.hasError && (
<ErrorMessage message={view.error} onPressTryAgain={onPressTryAgain} />
)}
<CenteredView>
{view.isLoading && !data && <NotificationFeedLoadingPlaceholder />}
{view.hasError && (
<ErrorMessage
message={view.error}
onPressTryAgain={onPressTryAgain}
/>
)}
</CenteredView>
{data && (
<FlatList
data={data}

View File

@ -1,6 +1,7 @@
import React, {useEffect} from 'react'
import {observer} from 'mobx-react-lite'
import {ActivityIndicator, FlatList, StyleSheet, View} from 'react-native'
import {ActivityIndicator, StyleSheet, View} from 'react-native'
import {CenteredView, FlatList} from '../util/Views'
import {
RepostedByViewModel,
RepostedByItem,
@ -42,9 +43,9 @@ export const PostRepostedBy = observer(function PostRepostedBy({
if (!view.hasLoaded) {
return (
<View>
<CenteredView>
<ActivityIndicator />
</View>
</CenteredView>
)
}
@ -52,9 +53,9 @@ export const PostRepostedBy = observer(function PostRepostedBy({
// =
if (view.hasError) {
return (
<View>
<CenteredView>
<ErrorMessage message={view.error} onPressTryAgain={onRefresh} />
</View>
</CenteredView>
)
}

View File

@ -1,6 +1,7 @@
import React, {useEffect} from 'react'
import {observer} from 'mobx-react-lite'
import {ActivityIndicator, FlatList, StyleSheet, View} from 'react-native'
import {ActivityIndicator, StyleSheet, View} from 'react-native'
import {CenteredView, FlatList} from '../util/Views'
import {VotesViewModel, VoteItem} from '../../../state/models/votes-view'
import {Link} from '../util/Link'
import {Text} from '../util/text/Text'
@ -38,9 +39,9 @@ export const PostVotedBy = observer(function PostVotedBy({
if (!view.hasLoaded) {
return (
<View>
<CenteredView>
<ActivityIndicator />
</View>
</CenteredView>
)
}
@ -48,9 +49,9 @@ export const PostVotedBy = observer(function PostVotedBy({
// =
if (view.hasError) {
return (
<View>
<CenteredView>
<ErrorMessage message={view.error} onPressTryAgain={onRefresh} />
</View>
</CenteredView>
)
}

View File

@ -1,10 +1,11 @@
import React, {useEffect} from 'react'
import {observer} from 'mobx-react-lite'
import {ActivityIndicator, FlatList, StyleSheet, View} from 'react-native'
import {ActivityIndicator, StyleSheet, View} from 'react-native'
import {
UserFollowersViewModel,
FollowerItem,
} from '../../../state/models/user-followers-view'
import {CenteredView, FlatList} from '../util/Views'
import {Link} from '../util/Link'
import {Text} from '../util/text/Text'
import {ErrorMessage} from '../util/error/ErrorMessage'
@ -43,9 +44,9 @@ export const ProfileFollowers = observer(function ProfileFollowers({
if (!view.hasLoaded) {
return (
<View>
<CenteredView>
<ActivityIndicator />
</View>
</CenteredView>
)
}
@ -53,9 +54,9 @@ export const ProfileFollowers = observer(function ProfileFollowers({
// =
if (view.hasError) {
return (
<View>
<CenteredView>
<ErrorMessage message={view.error} onPressTryAgain={onRefresh} />
</View>
</CenteredView>
)
}

View File

@ -1,6 +1,7 @@
import React, {useEffect} from 'react'
import {observer} from 'mobx-react-lite'
import {ActivityIndicator, FlatList, StyleSheet, View} from 'react-native'
import {ActivityIndicator, StyleSheet, View} from 'react-native'
import {CenteredView, FlatList} from '../util/Views'
import {
UserFollowsViewModel,
FollowItem,
@ -43,9 +44,9 @@ export const ProfileFollows = observer(function ProfileFollows({
if (!view.hasLoaded) {
return (
<View>
<CenteredView>
<ActivityIndicator />
</View>
</CenteredView>
)
}
@ -53,9 +54,9 @@ export const ProfileFollows = observer(function ProfileFollows({
// =
if (view.hasError) {
return (
<View>
<CenteredView>
<ErrorMessage message={view.error} onPressTryAgain={onRefresh} />
</View>
</CenteredView>
)
}

View File

@ -1,7 +1,8 @@
import React, {useEffect} from 'react'
import {ScrollView, StyleSheet, TouchableOpacity, View} from 'react-native'
import {StyleSheet, TouchableOpacity, View} from 'react-native'
import {observer} from 'mobx-react-lite'
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
import {ScrollView} from '../com/util/Views'
import {useStores} from '../../state'
import {ScreenParams} from '../routes'
import {s} from '../lib/styles'