-
Notifications
You must be signed in to change notification settings - Fork 209
feat: Add announcements system #703
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
Open
beebls
wants to merge
23
commits into
main
Choose a base branch
from
beebls/motd
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
5a212e9
feat(motd): add motd component (untested)
beebls 267b11c
fix(motd): run prettier
beebls ccdfd53
only set motd if value returned
beebls edf6b54
move motd into div with padding
beebls 1a231bf
rename motd to announcements and implement new API
beebls 83ae98a
change to use array of hidden announcements
beebls 5a02f5f
change announcements to be stack
beebls 428de00
remove duplicates when adding announcements to array
beebls b8adf16
move welcome announcement to default
beebls 1709a95
ensure nulls arent passed to sort
beebls 3b00e4a
modify AnnouncementsDisplay to display all current announcements, not…
beebls a5ce244
fix array length 0 check
beebls 120a43e
add in 2nd debug announcement
beebls 9b38abd
being working on fullscreen modal
beebls 7fff611
fix styling issues
beebls b859126
further work on modal
beebls 002f0db
add .DS_Store to gitignore
beebls 6eab1c1
add scroll overflow
beebls e2f3609
change to scrollpanelgroup
beebls 8bb4ff7
fix scrollpanel group
beebls ef27046
test setting scrollpanelgroup to false
beebls 50cb08c
add in scroll hint
beebls 86d01db
fix hide behaviour for potential testers
beebls File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -165,3 +165,6 @@ act/.directory | |
| act/artifacts/* | ||
| bin/act | ||
| /settings/ | ||
|
|
||
| # macOS | ||
| .DS_Store | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,243 @@ | ||
| import { DialogButton, Focusable, ModalRoot, PanelSection, ScrollPanelGroup, showModal } from '@decky/ui'; | ||
| import { lazy, useEffect, useMemo, useState } from 'react'; | ||
| import { FaInfo, FaTimes } from 'react-icons/fa'; | ||
|
|
||
| import { Announcement, getAnnouncements } from '../store'; | ||
| import { useSetting } from '../utils/hooks/useSetting'; | ||
| import WithSuspense from './WithSuspense'; | ||
|
|
||
| const SEVERITIES = { | ||
| High: { | ||
| color: '#bb1414', | ||
| text: '#fff', | ||
| }, | ||
| Medium: { | ||
| color: '#bbbb14', | ||
| text: '#fff', | ||
| }, | ||
| Low: { | ||
| color: '#1488bb', | ||
| text: '#fff', | ||
| }, | ||
| }; | ||
|
|
||
| const welcomeAnnouncement: Announcement = { | ||
| id: 'welcomeAnnouncement', | ||
| title: 'Welcome to Decky!', | ||
| text: 'We hope you enjoy using Decky! If you have any questions or feedback, please let us know.', | ||
| created: Date.now().toString(), | ||
| updated: Date.now().toString(), | ||
| }; | ||
|
|
||
| const welcomeAnnouncement2: Announcement = { | ||
| id: 'welcomeAnnouncement2', | ||
| title: 'Test With mkdown content and a slightly long title', | ||
| text: '# Lorem Ipsum\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\n\n## Features\n\n- **Bold text** for emphasis\n- *Italic text* for style\n- `Code snippets` for technical content\n\n### Getting Started\n\nUt enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.\n\n> This is a blockquote with some important information.\n\nDuis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.', | ||
| created: Date.now().toString(), | ||
| updated: Date.now().toString(), | ||
| }; | ||
|
|
||
| export function AnnouncementsDisplay() { | ||
| const [announcements, setAnnouncements] = useState<Announcement[]>([welcomeAnnouncement, welcomeAnnouncement2]); | ||
| const [hiddenAnnouncementIds, setHiddenAnnouncementIds] = useSetting<string[]>('hiddenAnnouncementIds', []); | ||
|
|
||
| function addAnnouncements(newAnnouncements: Announcement[]) { | ||
| // Removes any duplicates and sorts by created date | ||
| setAnnouncements((oldAnnouncements) => { | ||
| const newArr = [...oldAnnouncements, ...newAnnouncements]; | ||
| const setOfIds = new Set(newArr.map((a) => a.id)); | ||
| return ( | ||
| ( | ||
| Array.from(setOfIds) | ||
| .map((id) => newArr.find((a) => a.id === id)) | ||
| // Typescript doesn't type filter(Boolean) correctly, so I have to assert this | ||
| .filter(Boolean) as Announcement[] | ||
| ).sort((a, b) => { | ||
| return new Date(b.created).getTime() - new Date(a.created).getTime(); | ||
| }) | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
| async function fetchAnnouncement() { | ||
| const announcements = await getAnnouncements(); | ||
| announcements && addAnnouncements(announcements); | ||
| } | ||
|
|
||
| useEffect(() => { | ||
| void fetchAnnouncement(); | ||
| }, []); | ||
|
|
||
| const currentlyDisplayingAnnouncements: Announcement[] = useMemo(() => { | ||
| return announcements.filter((announcement) => !hiddenAnnouncementIds.includes(announcement.id)); | ||
| }, [announcements, hiddenAnnouncementIds]); | ||
|
|
||
| function hideAnnouncement(id: string) { | ||
| setHiddenAnnouncementIds([...hiddenAnnouncementIds, id]); | ||
| void fetchAnnouncement(); | ||
| } | ||
|
|
||
| if (currentlyDisplayingAnnouncements.length === 0) { | ||
| return null; | ||
| } | ||
|
|
||
| return ( | ||
| <PanelSection> | ||
| <Focusable style={{ display: 'flex', flexDirection: 'column', gap: '0.5rem' }}> | ||
| {currentlyDisplayingAnnouncements.map((announcement) => ( | ||
| <Announcement | ||
| key={announcement.id} | ||
| announcement={announcement} | ||
| onHide={() => hideAnnouncement(announcement.id)} | ||
| /> | ||
| ))} | ||
| </Focusable> | ||
| </PanelSection> | ||
| ); | ||
| } | ||
|
|
||
| function Announcement({ announcement, onHide }: { announcement: Announcement; onHide: () => void }) { | ||
| // Severity is not implemented in the API currently | ||
| const severity = SEVERITIES['Low']; | ||
| return ( | ||
| <Focusable | ||
| style={{ | ||
| // Transparency is 20% of the color | ||
| backgroundColor: `${severity.color}33`, | ||
| color: severity.text, | ||
| borderColor: severity.color, | ||
| borderWidth: '2px', | ||
| borderStyle: 'solid', | ||
| padding: '0.7rem', | ||
| display: 'flex', | ||
| alignItems: 'center', | ||
| justifyContent: 'space-between', | ||
| }} | ||
| > | ||
| <span style={{ fontWeight: 'bold' }}>{announcement.title}</span> | ||
| <Focusable style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}> | ||
| <DialogButton | ||
| style={{ | ||
| width: '1rem', | ||
| minWidth: '1rem', | ||
| height: '1rem', | ||
| padding: '0', | ||
| display: 'flex', | ||
| alignItems: 'center', | ||
| justifyContent: 'center', | ||
| }} | ||
| onClick={() => | ||
| showModal( | ||
| <AnnouncementModal | ||
| announcement={announcement} | ||
| onHide={() => { | ||
| onHide(); | ||
| }} | ||
| />, | ||
| ) | ||
| } | ||
| > | ||
| <FaInfo | ||
| style={{ | ||
| height: '.75rem', | ||
| }} | ||
| /> | ||
| </DialogButton> | ||
| <DialogButton | ||
| style={{ | ||
| width: '1rem', | ||
| minWidth: '1rem', | ||
| height: '1rem', | ||
| padding: '0', | ||
| display: 'flex', | ||
| alignItems: 'center', | ||
| justifyContent: 'center', | ||
| }} | ||
| onClick={() => onHide()} | ||
| > | ||
| <FaTimes | ||
| style={{ | ||
| height: '.75rem', | ||
| }} | ||
| /> | ||
| </DialogButton> | ||
| </Focusable> | ||
| </Focusable> | ||
| ); | ||
| } | ||
|
|
||
| const MarkdownRenderer = lazy(() => import('./Markdown')); | ||
|
|
||
| function AnnouncementModal({ | ||
| announcement, | ||
| closeModal, | ||
| onHide, | ||
| }: { | ||
| announcement: Announcement; | ||
| closeModal?: () => void; | ||
| onHide: () => void; | ||
| }) { | ||
| return ( | ||
| <ModalRoot onCancel={closeModal} onEscKeypress={closeModal}> | ||
| <style> | ||
| {` | ||
| .steam-focus { | ||
| outline-offset: 3px; | ||
| outline: 2px solid rgba(255, 255, 255, 0.6); | ||
| animation: pulseOutline 1.2s infinite ease-in-out; | ||
| } | ||
|
|
||
| @keyframes pulseOutline { | ||
| 0% { | ||
| outline: 2px solid rgba(255, 255, 255, 0.6); | ||
| } | ||
| 50% { | ||
| outline: 2px solid rgba(255, 255, 255, 1); | ||
| } | ||
| 100% { | ||
| outline: 2px solid rgba(255, 255, 255, 0.6); | ||
| } | ||
| } | ||
| `} | ||
| </style> | ||
| <Focusable style={{ display: 'flex', flexDirection: 'column', gap: '0.5rem', height: 'calc(100vh - 200px)' }}> | ||
| <span style={{ fontWeight: 'bold', fontSize: '1.25rem' }}>{announcement.title}</span> | ||
| <span style={{ opacity: 0.5 }}>Use your finger to scroll</span> | ||
| <ScrollPanelGroup | ||
| // @ts-ignore | ||
| focusable={false} | ||
| style={{ flex: 1, height: '100%' }} | ||
| // onCancelButton doesn't work here | ||
| onCancelActionDescription="Back" | ||
| onButtonDown={(evt: any) => { | ||
| if (!evt?.detail?.button) return; | ||
| if (evt.detail.button === 2) { | ||
| closeModal?.(); | ||
| } | ||
| }} | ||
| > | ||
| <WithSuspense> | ||
| <MarkdownRenderer | ||
| onDismiss={() => { | ||
| closeModal?.(); | ||
| }} | ||
| > | ||
| {announcement.text} | ||
| </MarkdownRenderer> | ||
| </WithSuspense> | ||
| </ScrollPanelGroup> | ||
| <Focusable style={{ display: 'flex', gap: '0.5rem' }}> | ||
| <DialogButton onClick={() => closeModal?.()}>Close</DialogButton> | ||
| <DialogButton | ||
| onClick={() => { | ||
| onHide(); | ||
| closeModal?.(); | ||
| }} | ||
| > | ||
| Close and Hide Announcement | ||
| </DialogButton> | ||
| </Focusable> | ||
| </Focusable> | ||
| </ModalRoot> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where should people direct feedback?
(Also i assume this shows the first time you use decky? Might want to add something like start with looking at the store)
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a good point, but there is another blocking issue. The text need to be moved in en-US.json and not hardcoded here.