Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show an unread badge when there are unread notifs from other accounts #3398

Closed
wants to merge 10 commits into from
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### Added

- Add an unread badge if there are unread notifs from other accounts

### Changed

### Fixed
Expand Down
46 changes: 46 additions & 0 deletions scss/_sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,49 @@
-webkit-transform: translateX(-100%);
}
}

.unread-badge {
border-radius: 50%;
position: relative;
background-color: var(--unreadBadgeColor1);
animation-duration: 1.5s;
animation-iteration-count: infinite;
animation-direction: alternate;
}

@keyframes unread-badge-big-anim {
from {
background-color: var(--unreadBadgeColor1);
color: white;
}
to {
background-color: white;
color: var(--unreadBadgeColor1);
}
}
div.unread-badge-big {
@extend .unread-badge;
width: 24px;
height: 24px;
color: white;
display: flex;
justify-content: center;
align-items: center;
animation-name: unread-badge-big-anim;
animation-timing-function: ease-in;
}

@keyframes unread-badge-small-anim {
from {
background-color: var(--unreadBadgeColor1);
}
to {
background-color: var(--unreadBadgeColor2);
}
}
div.unread-badge-small {
@extend .unread-badge;
width: 14px;
height: 14px;
animation-name: unread-badge-small-anim;
}
71 changes: 71 additions & 0 deletions src/renderer/components/OtherAccountsUnreadBadge.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import React, { useEffect, useState } from 'react'
import { BackendRemote, onDCEvent } from '../backend-com'
import { selectedAccountId } from '../ScreenController'
import { useSettingsStore } from '../stores/settings'

// Tip of the Day: Keep as many ice creams as you can in your fridge
// for the ice cream outage days. FREE ICE CREAM FOR EVERY1! --Farooq
farooqkz marked this conversation as resolved.
Show resolved Hide resolved

type ComponentProps = {
style: any
big?: boolean
}

export default function OtherAccountsUnreadBadge({
style,
big,
}: ComponentProps) {
const [
otherAccountsUnreadCount,
setOtherAccountsUnreadCount,
] = useState<number>(0)

const settings = useSettingsStore()[0]

useEffect(() => {
if (settings === null) return
if (settings.desktopSettings.syncAllAccounts === false) return
let updating = false
const update = () => {
if (updating) return
updating = true
BackendRemote.rpc.getAllAccountIds().then(accountIds => {
try {
selectedAccountId()
} catch {
return
}
accountIds = accountIds.filter(id => id !== selectedAccountId())
for (const accountId of accountIds) {
BackendRemote.rpc.getFreshMsgs(accountId).then(ids => {
setOtherAccountsUnreadCount(otherAccountsUnreadCount + ids.length)
})
}
})
updating = false
}

BackendRemote.rpc
.getAllAccountIds()
.then(accountIds =>
accountIds.map(id => onDCEvent(id, 'IncomingMsg', update))
)

update()
return update
}, [settings])

Check warning on line 56 in src/renderer/components/OtherAccountsUnreadBadge.tsx

View workflow job for this annotation

GitHub Actions / Code Validation

React Hook useEffect has a missing dependency: 'otherAccountsUnreadCount'. Either include it or remove the dependency array. You can also do a functional update 'setOtherAccountsUnreadCount(o => ...)' if you only need 'otherAccountsUnreadCount' in the 'setOtherAccountsUnreadCount' call
farooqkz marked this conversation as resolved.
Show resolved Hide resolved

if (settings?.desktopSettings.syncAllAccounts && otherAccountsUnreadCount) {
if (big) {
return (
<div className='unread-badge-big' style={{ ...style }}>
{otherAccountsUnreadCount}
</div>
)
} else {
return <div className='unread-badge-small' style={{ ...style }} />
}
} else {
return null
}
}
5 changes: 5 additions & 0 deletions src/renderer/components/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
EffectfulBackendActions,
onDCEvent,
} from '../backend-com'
import OtherAccountsUnreadBadge from './OtherAccountsUnreadBadge'

export type SidebarState = 'init' | 'visible' | 'invisible'

Expand Down Expand Up @@ -180,6 +181,10 @@ const Sidebar = React.memo(
</div>
<div key='logout' className='sidebar-item' onClick={onLogout}>
{tx('switch_account')}
<OtherAccountsUnreadBadge
style={{ top: '-38px', left: '110px' }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer having these offsets in they (s)css unless the are either for prototyping or dynamic.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The thing is that the parent component has to determine the offsets according to its use. The offsets are different for the hamburger menu icon and in the sidebar.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't use global offsets if you can, in this case it does not make much sense to use global offsets. Also they can be styled in the scss file of the component they are used in/with.

big
/>
</div>
<div className='footer'>
<Link href='https://delta.chat' label={'Delta Chat Desktop'} />
Expand Down
7 changes: 6 additions & 1 deletion src/renderer/components/screens/MainScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,16 @@ import SettingsStoreInstance, { useSettingsStore } from '../../stores/settings'
import { Type } from '../../backend-com'
import { InlineVerifiedIcon } from '../VerifiedIcon'
import { SettingsProfileDialog } from '../dialogs/Settings-Profile'
import OtherAccountsUnreadBadge from '../OtherAccountsUnreadBadge'

const log = getLogger('renderer/main-screen')

export default function MainScreen() {
const [queryStr, setQueryStr] = useState('')
const [queryChatId, setQueryChatId] = useState<null | number>(null)
const [sidebarState, setSidebarState] = useState<SidebarState>('init')
const [showArchivedChats, setShowArchivedChats] = useState(false)
const [showArchivedChats, setShowArchivedChats] = useState<boolean>(false)

// Small hack/misuse of keyBindingAction to setShowArchivedChats from other components (especially
// ViewProfile when selecting a shared chat/group)
useKeyBindingAction(KeybindAction.ChatList_SwitchToArchiveView, () =>
Expand Down Expand Up @@ -202,6 +204,9 @@ export default function MainScreen() {
id='hamburger-menu-button'
>
<Icon icon='menu' aria-label={tx('main_menu')} iconSize={20} />
<OtherAccountsUnreadBadge
style={{ top: '-26px', left: '14px' }}
/>
</div>
{queryStr.length === 0 && showArchivedChats && (
<>
Expand Down
3 changes: 3 additions & 0 deletions themes/_themebase.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ $hover-contrast-change: 2%;
--ovalButtonBgHover: #{changeContrast($ovalButtonBg, 70%)};
--ovalButtonText: #{$ovalButtonText};
--ovalButtonTextHover: #{desaturate(invert($ovalButtonText), 1)};
/* UnreadBadge */
--unreadBadgeColor1: #{$colorPrimary};
--unreadBadgeColor2: mix(#{$colorPrimary}, transparent, 20%);
/* NavBar */
--navBarBackground: #{$bgNavBar};
--navBarText: #{$textNavBar};
Expand Down
Loading