An ATproto social media client -- with an independent Appview.
Pull upstream bugfixes to bottom-sheet (#1606)
* Bump bottom-sheet to latest for bugfixes
* Small tweak to the account switcher
authored by
Paul Frazee
and committed by
GitHub
0168aada
4ec5fabd
+59
-64
+1
-1
package.json
+1
-1
package.json
···
35
35
"@fortawesome/free-regular-svg-icons": "^6.1.1",
36
36
"@fortawesome/free-solid-svg-icons": "^6.1.1",
37
37
"@fortawesome/react-native-fontawesome": "^0.3.0",
38
-
"@gorhom/bottom-sheet": "^4.4.7",
38
+
"@gorhom/bottom-sheet": "^4.5.1",
39
39
"@mattermost/react-native-paste-input": "^0.6.4",
40
40
"@miblanchard/react-native-slider": "^2.3.1",
41
41
"@react-native-async-storage/async-storage": "1.18.2",
+54
-59
src/view/com/modals/SwitchAccount.tsx
+54
-59
src/view/com/modals/SwitchAccount.tsx
···
37
37
}, [track, store])
38
38
39
39
return (
40
-
<View style={[styles.container, pal.view]}>
40
+
<BottomSheetScrollView
41
+
style={[styles.container, pal.view]}
42
+
contentContainerStyle={[styles.innerContainer, pal.view]}>
41
43
<Text type="title-xl" style={[styles.title, pal.text]}>
42
44
Switch Account
43
45
</Text>
44
-
<BottomSheetScrollView
45
-
style={styles.container}
46
-
contentContainerStyle={[styles.innerContainer, pal.view]}>
47
-
{isSwitching ? (
46
+
{isSwitching ? (
47
+
<View style={[pal.view, styles.linkCard]}>
48
+
<ActivityIndicator />
49
+
</View>
50
+
) : (
51
+
<Link href={makeProfileLink(store.me)} title="Your profile" noFeedback>
48
52
<View style={[pal.view, styles.linkCard]}>
49
-
<ActivityIndicator />
50
-
</View>
51
-
) : (
52
-
<Link
53
-
href={makeProfileLink(store.me)}
54
-
title="Your profile"
55
-
noFeedback>
56
-
<View style={[pal.view, styles.linkCard]}>
57
-
<View style={styles.avi}>
58
-
<UserAvatar size={40} avatar={store.me.avatar} />
59
-
</View>
60
-
<View style={[s.flex1]}>
61
-
<Text type="md-bold" style={pal.text} numberOfLines={1}>
62
-
{store.me.displayName || store.me.handle}
63
-
</Text>
64
-
<Text type="sm" style={pal.textLight} numberOfLines={1}>
65
-
{store.me.handle}
66
-
</Text>
67
-
</View>
68
-
<TouchableOpacity
69
-
testID="signOutBtn"
70
-
onPress={isSwitching ? undefined : onPressSignout}
71
-
accessibilityRole="button"
72
-
accessibilityLabel="Sign out"
73
-
accessibilityHint={`Signs ${store.me.displayName} out of Bluesky`}>
74
-
<Text type="lg" style={pal.link}>
75
-
Sign out
76
-
</Text>
77
-
</TouchableOpacity>
78
-
</View>
79
-
</Link>
80
-
)}
81
-
{store.session.switchableAccounts.map(account => (
82
-
<TouchableOpacity
83
-
testID={`switchToAccountBtn-${account.handle}`}
84
-
key={account.did}
85
-
style={[pal.view, styles.linkCard, isSwitching && styles.dimmed]}
86
-
onPress={
87
-
isSwitching ? undefined : () => onPressSwitchAccount(account)
88
-
}
89
-
accessibilityRole="button"
90
-
accessibilityLabel={`Switch to ${account.handle}`}
91
-
accessibilityHint="Switches the account you are logged in to">
92
53
<View style={styles.avi}>
93
-
<UserAvatar size={40} avatar={account.aviUrl} />
54
+
<UserAvatar size={40} avatar={store.me.avatar} />
94
55
</View>
95
56
<View style={[s.flex1]}>
96
-
<Text type="md-bold" style={pal.text}>
97
-
{account.displayName || account.handle}
57
+
<Text type="md-bold" style={pal.text} numberOfLines={1}>
58
+
{store.me.displayName || store.me.handle}
98
59
</Text>
99
-
<Text type="sm" style={pal.textLight}>
100
-
{account.handle}
60
+
<Text type="sm" style={pal.textLight} numberOfLines={1}>
61
+
{store.me.handle}
101
62
</Text>
102
63
</View>
103
-
<AccountDropdownBtn handle={account.handle} />
104
-
</TouchableOpacity>
105
-
))}
106
-
</BottomSheetScrollView>
107
-
</View>
64
+
<TouchableOpacity
65
+
testID="signOutBtn"
66
+
onPress={isSwitching ? undefined : onPressSignout}
67
+
accessibilityRole="button"
68
+
accessibilityLabel="Sign out"
69
+
accessibilityHint={`Signs ${store.me.displayName} out of Bluesky`}>
70
+
<Text type="lg" style={pal.link}>
71
+
Sign out
72
+
</Text>
73
+
</TouchableOpacity>
74
+
</View>
75
+
</Link>
76
+
)}
77
+
{store.session.switchableAccounts.map(account => (
78
+
<TouchableOpacity
79
+
testID={`switchToAccountBtn-${account.handle}`}
80
+
key={account.did}
81
+
style={[pal.view, styles.linkCard, isSwitching && styles.dimmed]}
82
+
onPress={
83
+
isSwitching ? undefined : () => onPressSwitchAccount(account)
84
+
}
85
+
accessibilityRole="button"
86
+
accessibilityLabel={`Switch to ${account.handle}`}
87
+
accessibilityHint="Switches the account you are logged in to">
88
+
<View style={styles.avi}>
89
+
<UserAvatar size={40} avatar={account.aviUrl} />
90
+
</View>
91
+
<View style={[s.flex1]}>
92
+
<Text type="md-bold" style={pal.text}>
93
+
{account.displayName || account.handle}
94
+
</Text>
95
+
<Text type="sm" style={pal.textLight}>
96
+
{account.handle}
97
+
</Text>
98
+
</View>
99
+
<AccountDropdownBtn handle={account.handle} />
100
+
</TouchableOpacity>
101
+
))}
102
+
</BottomSheetScrollView>
108
103
)
109
104
}
110
105
···
113
108
flex: 1,
114
109
},
115
110
innerContainer: {
116
-
paddingBottom: 20,
111
+
paddingBottom: 40,
117
112
},
118
113
title: {
119
114
textAlign: 'center',
+4
-4
yarn.lock
+4
-4
yarn.lock
···
2255
2255
resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
2256
2256
integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
2257
2257
2258
-
"@gorhom/bottom-sheet@^4.4.7":
2259
-
version "4.4.7"
2260
-
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-4.4.7.tgz#fc80b3f0b7ebab056ce226f3aa3a89b2db8660dd"
2261
-
integrity sha512-ukTuTqDQi2heo68hAJsBpUQeEkdqP9REBcn47OpuvPKhdPuO1RBOOADjqXJNCnZZRcY+HqbnGPMSLFVc31zylQ==
2258
+
"@gorhom/bottom-sheet@^4.5.1":
2259
+
version "4.5.1"
2260
+
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-4.5.1.tgz#1ac4b234a80e7dff263f0b7ac207f92e41562849"
2261
+
integrity sha512-4Qy6hzvN32fXu2hDxDXOIS0IBGBT6huST7J7+K1V5bXemZ08KIx5ZffyLgwhCUl+CnyeG2KG6tqk6iYLkIwi7Q==
2262
2262
dependencies:
2263
2263
"@gorhom/portal" "1.0.14"
2264
2264
invariant "^2.2.4"