forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Update layouts on a bunch of views
+37
-26
+11
-5
src/view/com/notifications/Feed.tsx
+11
-5
src/view/com/notifications/Feed.tsx
···
1
1
import React from 'react'
2
2
import {observer} from 'mobx-react-lite'
3
-
import {FlatList, StyleSheet, View} from 'react-native'
3
+
import {StyleSheet, View} from 'react-native'
4
+
import {CenteredView, FlatList} from '../util/Views'
4
5
import {NotificationsViewModel} from '../../../state/models/notifications-view'
5
6
import {FeedItem} from './FeedItem'
6
7
import {NotificationFeedLoadingPlaceholder} from '../util/LoadingPlaceholder'
···
60
61
}
61
62
return (
62
63
<View style={s.h100pct}>
63
-
{view.isLoading && !data && <NotificationFeedLoadingPlaceholder />}
64
-
{view.hasError && (
65
-
<ErrorMessage message={view.error} onPressTryAgain={onPressTryAgain} />
66
-
)}
64
+
<CenteredView>
65
+
{view.isLoading && !data && <NotificationFeedLoadingPlaceholder />}
66
+
{view.hasError && (
67
+
<ErrorMessage
68
+
message={view.error}
69
+
onPressTryAgain={onPressTryAgain}
70
+
/>
71
+
)}
72
+
</CenteredView>
67
73
{data && (
68
74
<FlatList
69
75
data={data}
+6
-5
src/view/com/post-thread/PostRepostedBy.tsx
+6
-5
src/view/com/post-thread/PostRepostedBy.tsx
···
1
1
import React, {useEffect} from 'react'
2
2
import {observer} from 'mobx-react-lite'
3
-
import {ActivityIndicator, FlatList, StyleSheet, View} from 'react-native'
3
+
import {ActivityIndicator, StyleSheet, View} from 'react-native'
4
+
import {CenteredView, FlatList} from '../util/Views'
4
5
import {
5
6
RepostedByViewModel,
6
7
RepostedByItem,
···
42
43
43
44
if (!view.hasLoaded) {
44
45
return (
45
-
<View>
46
+
<CenteredView>
46
47
<ActivityIndicator />
47
-
</View>
48
+
</CenteredView>
48
49
)
49
50
}
50
51
···
52
53
// =
53
54
if (view.hasError) {
54
55
return (
55
-
<View>
56
+
<CenteredView>
56
57
<ErrorMessage message={view.error} onPressTryAgain={onRefresh} />
57
-
</View>
58
+
</CenteredView>
58
59
)
59
60
}
60
61
+6
-5
src/view/com/post-thread/PostVotedBy.tsx
+6
-5
src/view/com/post-thread/PostVotedBy.tsx
···
1
1
import React, {useEffect} from 'react'
2
2
import {observer} from 'mobx-react-lite'
3
-
import {ActivityIndicator, FlatList, StyleSheet, View} from 'react-native'
3
+
import {ActivityIndicator, StyleSheet, View} from 'react-native'
4
+
import {CenteredView, FlatList} from '../util/Views'
4
5
import {VotesViewModel, VoteItem} from '../../../state/models/votes-view'
5
6
import {Link} from '../util/Link'
6
7
import {Text} from '../util/text/Text'
···
38
39
39
40
if (!view.hasLoaded) {
40
41
return (
41
-
<View>
42
+
<CenteredView>
42
43
<ActivityIndicator />
43
-
</View>
44
+
</CenteredView>
44
45
)
45
46
}
46
47
···
48
49
// =
49
50
if (view.hasError) {
50
51
return (
51
-
<View>
52
+
<CenteredView>
52
53
<ErrorMessage message={view.error} onPressTryAgain={onRefresh} />
53
-
</View>
54
+
</CenteredView>
54
55
)
55
56
}
56
57
+6
-5
src/view/com/profile/ProfileFollowers.tsx
+6
-5
src/view/com/profile/ProfileFollowers.tsx
···
1
1
import React, {useEffect} from 'react'
2
2
import {observer} from 'mobx-react-lite'
3
-
import {ActivityIndicator, FlatList, StyleSheet, View} from 'react-native'
3
+
import {ActivityIndicator, StyleSheet, View} from 'react-native'
4
4
import {
5
5
UserFollowersViewModel,
6
6
FollowerItem,
7
7
} from '../../../state/models/user-followers-view'
8
+
import {CenteredView, FlatList} from '../util/Views'
8
9
import {Link} from '../util/Link'
9
10
import {Text} from '../util/text/Text'
10
11
import {ErrorMessage} from '../util/error/ErrorMessage'
···
43
44
44
45
if (!view.hasLoaded) {
45
46
return (
46
-
<View>
47
+
<CenteredView>
47
48
<ActivityIndicator />
48
-
</View>
49
+
</CenteredView>
49
50
)
50
51
}
51
52
···
53
54
// =
54
55
if (view.hasError) {
55
56
return (
56
-
<View>
57
+
<CenteredView>
57
58
<ErrorMessage message={view.error} onPressTryAgain={onRefresh} />
58
-
</View>
59
+
</CenteredView>
59
60
)
60
61
}
61
62
+6
-5
src/view/com/profile/ProfileFollows.tsx
+6
-5
src/view/com/profile/ProfileFollows.tsx
···
1
1
import React, {useEffect} from 'react'
2
2
import {observer} from 'mobx-react-lite'
3
-
import {ActivityIndicator, FlatList, StyleSheet, View} from 'react-native'
3
+
import {ActivityIndicator, StyleSheet, View} from 'react-native'
4
+
import {CenteredView, FlatList} from '../util/Views'
4
5
import {
5
6
UserFollowsViewModel,
6
7
FollowItem,
···
43
44
44
45
if (!view.hasLoaded) {
45
46
return (
46
-
<View>
47
+
<CenteredView>
47
48
<ActivityIndicator />
48
-
</View>
49
+
</CenteredView>
49
50
)
50
51
}
51
52
···
53
54
// =
54
55
if (view.hasError) {
55
56
return (
56
-
<View>
57
+
<CenteredView>
57
58
<ErrorMessage message={view.error} onPressTryAgain={onRefresh} />
58
-
</View>
59
+
</CenteredView>
59
60
)
60
61
}
61
62
+2
-1
src/view/screens/Log.tsx
+2
-1
src/view/screens/Log.tsx
···
1
1
import React, {useEffect} from 'react'
2
-
import {ScrollView, StyleSheet, TouchableOpacity, View} from 'react-native'
2
+
import {StyleSheet, TouchableOpacity, View} from 'react-native'
3
3
import {observer} from 'mobx-react-lite'
4
4
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
5
+
import {ScrollView} from '../com/util/Views'
5
6
import {useStores} from '../../state'
6
7
import {ScreenParams} from '../routes'
7
8
import {s} from '../lib/styles'