zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

Merge pull request #692 from bluesky-social/ollie/unread-notifications 

Update hint for notifications
zio/stable
Ollie H 2023-05-17 09:37:54 -07:00 committed by GitHub
parent 562faa76cc d6ca8e918a
commit 0ca096138a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/view/shell/Drawer.tsx
View File

@ -222,7 +222,11 @@ export const DrawerContent = observer(() => {
} }
label="Notifications" label="Notifications"
accessibilityLabel="Notifications" accessibilityLabel="Notifications"
accessibilityHint={`${store.me.notifications.unreadCountLabel} unread`} accessibilityHint={
notifications.unreadCountLabel === ''
? ''
: `${notifications.unreadCountLabel} unread`
}
count={notifications.unreadCountLabel} count={notifications.unreadCountLabel}
bold={isAtNotifications} bold={isAtNotifications}
onPress={onPressNotifications} onPress={onPressNotifications}

9
src/view/shell/bottom-bar/BottomBar.tsx
View File

@ -38,6 +38,7 @@ export const BottomBar = observer(({navigation}: BottomTabBarProps) => {
useNavigationTabState() useNavigationTabState()
const {footerMinimalShellTransform} = useMinimalShellMode() const {footerMinimalShellTransform} = useMinimalShellMode()
const {notifications} = store.me
const onPressTab = React.useCallback( const onPressTab = React.useCallback(
(tab: string) => { (tab: string) => {
@ -138,11 +139,15 @@ export const BottomBar = observer(({navigation}: BottomTabBarProps) => {
) )
} }
onPress={onPressNotifications} onPress={onPressNotifications}
notificationCount={store.me.notifications.unreadCountLabel} notificationCount={notifications.unreadCountLabel}
accessible={true} accessible={true}
accessibilityRole="tab" accessibilityRole="tab"
accessibilityLabel="Notifications" accessibilityLabel="Notifications"
accessibilityHint={`${store.me.notifications.unreadCountLabel} unread`} accessibilityHint={
notifications.unreadCountLabel === ''
? ''
: `${notifications.unreadCountLabel} unread`
}
/> />
<Btn <Btn
testID="bottomBarProfileBtn" testID="bottomBarProfileBtn"