notification list

This commit is contained in:
end-4 2025-04-19 00:09:51 +02:00
parent 02151a93f6
commit 6b457c7780
21 changed files with 287 additions and 9 deletions

View file

@ -1,6 +1,7 @@
import QtQuick import QtQuick
import Quickshell import Quickshell
pragma Singleton pragma Singleton
pragma ComponentBehavior: Bound
Singleton { Singleton {
property QtObject m3colors property QtObject m3colors

View file

@ -1,6 +1,7 @@
import QtQuick import QtQuick
import Quickshell import Quickshell
pragma Singleton pragma Singleton
pragma ComponentBehavior: Bound
Singleton { Singleton {
property QtObject appearance: QtObject { property QtObject appearance: QtObject {

View file

@ -0,0 +1,138 @@
import "root:/modules/common"
import "root:/services"
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import Quickshell
import Quickshell.Widgets
import Quickshell.Services.Notifications
import "./notification_utils.js" as NotificationUtils
WrapperRectangle {
id: root
property var notificationObject
property bool expanded: true
Layout.fillWidth: true
color: (notificationObject.urgency == NotificationUrgency.Critical) ?
Appearance.m3colors.m3secondaryContainer : Appearance.colors.colLayer2
radius: Appearance.rounding.normal
RowLayout {
anchors.fill: parent
Rectangle {
id: iconRectangle
implicitWidth: 47
implicitHeight: 47
Layout.leftMargin: 10
Layout.topMargin: 10
Layout.bottomMargin: 10
Layout.alignment: Qt.AlignTop
radius: Appearance.rounding.full
color: (notificationObject.urgency == NotificationUrgency.Critical) ?
Appearance.m3colors.m3secondary : Appearance.m3colors.m3secondaryContainer
MaterialSymbol {
visible: notificationObject.appIcon == ""
text: NotificationUtils.guessMessageType(notificationObject.summary)
anchors.fill: parent
color: (notificationObject.urgency == NotificationUrgency.Critical) ?
Appearance.m3colors.m3onSecondary : Appearance.m3colors.m3onSecondaryContainer
font.pixelSize: 27
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
IconImage {
visible: notificationObject.appIcon != ""
anchors.centerIn: parent
implicitSize: 33
asynchronous: true
source: Quickshell.iconPath(notificationObject.appIcon)
}
}
ColumnLayout {
spacing: 0
RowLayout {
Layout.topMargin: 10
Layout.leftMargin: 10
Layout.rightMargin: 10
Layout.fillWidth: true
StyledText {
Layout.fillWidth: true
horizontalAlignment: Text.AlignLeft
font.pixelSize: Appearance.font.pixelSize.normal
color: Appearance.colors.colOnLayer2
text: notificationObject.summary
wrapMode: expanded ? Text.Wrap : Text.NoWrap
elide: Text.ElideRight
}
Item { Layout.fillWidth: true }
StyledText {
id: notificationTimeText
Layout.fillWidth: false
wrapMode: Text.Wrap
horizontalAlignment: Text.AlignLeft
font.pixelSize: Appearance.font.pixelSize.small
color: Appearance.m3colors.m3outline
text: NotificationUtils.getFriendlyNotifTimeString(notificationObject.time)
Connections {
target: DateTime
function onTimeChanged() {
notificationTimeText.text = NotificationUtils.getFriendlyNotifTimeString(notificationObject.time)
}
}
}
Button {
Layout.alignment: Qt.AlignVCenter
id: expandButton
implicitWidth: 22
implicitHeight: 22
onClicked: {
root.expanded = !root.expanded
}
PointingHandInteraction{}
background: Rectangle {
anchors.fill: parent
radius: Appearance.rounding.full
color: (expandButton.down) ? Appearance.colors.colLayer2Active : (expandButton.hovered ? Appearance.colors.colLayer2Hover : Appearance.transparentize(Appearance.colors.colLayer2, 1))
Behavior on color {
ColorAnimation {
duration: Appearance.animation.elementDecel.duration
easing.type: Appearance.animation.elementDecel.type
}
}
}
contentItem: MaterialSymbol {
anchors.centerIn: parent
text: expanded ? "keyboard_arrow_up" : "keyboard_arrow_down"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font.pixelSize: Appearance.font.pixelSize.normal
color: Appearance.colors.colOnLayer2
}
}
}
RowLayout {
StyledText {
Layout.fillWidth: true
Layout.bottomMargin: 10
Layout.leftMargin: 10
Layout.rightMargin: 10
wrapMode: expanded ? Text.Wrap : Text.NoWrap
elide: Text.ElideRight
font.pixelSize: Appearance.font.pixelSize.small
horizontalAlignment: Text.AlignLeft
color: Appearance.m3colors.m3outline
textFormat: Text.MarkdownText
text: notificationObject.body
}
}
}
}
}

View file

@ -0,0 +1,62 @@
function guessMessageType(summary) {
const keywordsToTypes = {
'reboot': 'restart_alt',
'recording': 'screen_record',
'battery': 'power',
'power': 'power',
'screenshot': 'screenshot_monitor',
'welcome': 'waving_hand',
'time': 'scheduleb',
'installed': 'download',
'update': 'update',
'ai response': 'neurology',
'startswith:file': 'folder_copy', // Declarative startsWith check
};
const lowerSummary = summary.toLowerCase();
for (const [keyword, type] of Object.entries(keywordsToTypes)) {
if (keyword.startsWith('startswith:')) {
const startsWithKeyword = keyword.replace('startswith:', '');
if (lowerSummary.startsWith(startsWithKeyword)) {
return type;
}
} else if (lowerSummary.includes(keyword)) {
return type;
}
}
return 'chat';
}
// const getFriendlyNotifTimeString = (timeObject) => {
// const messageTime = GLib.DateTime.new_from_unix_local(timeObject);
// const oneMinuteAgo = GLib.DateTime.new_now_local().add_seconds(-60);
// if (messageTime.compare(oneMinuteAgo) > 0)
// return getString('Now');
// else if (messageTime.get_day_of_year() == GLib.DateTime.new_now_local().get_day_of_year())
// return messageTime.format(userOptions.time.format);
// else if (messageTime.get_day_of_year() == GLib.DateTime.new_now_local().get_day_of_year() - 1)
// return getString('Yesterday');
// else
// return messageTime.format(userOptions.time.dateFormat);
// }
const getFriendlyNotifTimeString = (timeObject) => {
const messageTime = new Date(timeObject * 1000);
const now = new Date();
const oneMinuteAgo = new Date(now.getTime() - 60000);
if (messageTime > oneMinuteAgo) {
return 'Now';
}
else if (messageTime.toDateString() === now.toDateString()) {
return messageTime.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
}
else if (messageTime.toDateString() === new Date(now.getTime() - 86400000).toDateString()) {
return 'Yesterday';
}
else {
return messageTime.toLocaleDateString();
}
};

View file

@ -12,7 +12,7 @@ Rectangle {
id: root id: root
radius: Appearance.rounding.normal radius: Appearance.rounding.normal
color: Appearance.colors.colLayer1 color: Appearance.colors.colLayer1
// height: collapsed ? collapsedBottomWidgetGroupRow.height : bottomWidgetGroupRow.height clip: true
implicitHeight: collapsed ? collapsedBottomWidgetGroupRow.implicitHeight : bottomWidgetGroupRow.implicitHeight implicitHeight: collapsed ? collapsedBottomWidgetGroupRow.implicitHeight : bottomWidgetGroupRow.implicitHeight
property int selectedTab: 0 property int selectedTab: 0
property bool collapsed: false property bool collapsed: false

View file

@ -3,6 +3,7 @@ import "root:/modules/common/widgets"
import "root:/services" import "root:/services"
import "./calendar" import "./calendar"
import "./todo" import "./todo"
import "./notifications"
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
@ -103,7 +104,7 @@ Rectangle {
currentIndex: currentTab currentIndex: currentTab
onCurrentIndexChanged: currentTab = currentIndex onCurrentIndexChanged: currentTab = currentIndex
Item{} NotificationList {}
Item{} Item{}
} }
} }

View file

@ -93,7 +93,7 @@ Scope {
Layout.fillHeight: false Layout.fillHeight: false
spacing: 10 spacing: 10
Layout.margins: 10 Layout.margins: 10
Layout.bottomMargin: 5 Layout.bottomMargin: 0
CustomIcon { CustomIcon {
width: 25 width: 25

View file

@ -46,6 +46,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 spacing: 5
CalendarHeaderButton { CalendarHeaderButton {
clip: true
buttonText: `${monthShift != 0 ? "• " : ""}${viewingDate.toLocaleDateString(Qt.locale(), "MMMM yyyy")}` buttonText: `${monthShift != 0 ? "• " : ""}${viewingDate.toLocaleDateString(Qt.locale(), "MMMM yyyy")}`
tooltipText: (monthShift === 0) ? "" : "Jump to current month" tooltipText: (monthShift === 0) ? "" : "Jump to current month"
onClicked: { onClicked: {

View file

@ -0,0 +1,33 @@
import "root:/modules/common"
import "root:/modules/common/widgets"
import "root:/services"
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import Quickshell.Widgets
Item {
Flickable { // Scrollable window
id: flickable
anchors.fill: parent
contentHeight: columnLayout.height
clip: true
ColumnLayout { // Scrollable window content
anchors.left: parent.left
anchors.right: parent.right
id: columnLayout
Repeater {
model: Notifications.list
delegate: NotificationWidget {
notificationObject: modelData
}
}
}
}
}

View file

@ -12,7 +12,7 @@ QuickToggleButton {
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
acceptedButtons: Qt.RightButton | Qt.LeftButton acceptedButtons: Qt.RightButton | Qt.LeftButton
onClicked: { onClicked: (mouse) => {
if (mouse.button === Qt.LeftButton) { if (mouse.button === Qt.LeftButton) {
toggleBluetooth.running = true toggleBluetooth.running = true
} }

View file

@ -18,7 +18,7 @@ QuickToggleButton {
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
acceptedButtons: Qt.RightButton | Qt.LeftButton acceptedButtons: Qt.RightButton | Qt.LeftButton
onClicked: { onClicked: (mouse) =>{
if (mouse.button === Qt.LeftButton) { if (mouse.button === Qt.LeftButton) {
toggleNetwork.running = true toggleNetwork.running = true
} }

View file

@ -14,7 +14,7 @@ Item {
property int todoListItemPadding: 8 property int todoListItemPadding: 8
property int listBottomPadding: 80 property int listBottomPadding: 80
Flickable { // Scrolled window Flickable {
id: flickable id: flickable
anchors.fill: parent anchors.fill: parent
contentHeight: columnLayout.height contentHeight: columnLayout.height

View file

@ -2,6 +2,7 @@ import QtQuick
import Quickshell import Quickshell
import Quickshell.Services.Pipewire import Quickshell.Services.Pipewire
pragma Singleton pragma Singleton
pragma ComponentBehavior: Bound
Singleton { Singleton {
id: root id: root

View file

@ -1,4 +1,5 @@
pragma Singleton pragma Singleton
pragma ComponentBehavior: Bound
import Quickshell; import Quickshell;
import Quickshell.Io; import Quickshell.Io;

View file

@ -1,6 +1,7 @@
import Quickshell import Quickshell
import Quickshell.Io import Quickshell.Io
pragma Singleton pragma Singleton
pragma ComponentBehavior: Bound
Singleton { Singleton {
id: root id: root

View file

@ -3,6 +3,7 @@ import QtQuick
import Quickshell import Quickshell
import Quickshell.Io import Quickshell.Io
pragma Singleton pragma Singleton
pragma ComponentBehavior: Bound
Singleton { Singleton {
property string time: Qt.formatDateTime(clock.date, "hh:mm") property string time: Qt.formatDateTime(clock.date, "hh:mm")
@ -14,7 +15,6 @@ Singleton {
SystemClock { SystemClock {
id: clock id: clock
precision: SystemClock.Minutes precision: SystemClock.Minutes
} }

View file

@ -1,4 +1,5 @@
pragma Singleton pragma Singleton
pragma ComponentBehavior: Bound
import Quickshell; import Quickshell;
import Quickshell.Io; import Quickshell.Io;

View file

@ -0,0 +1,32 @@
pragma Singleton
pragma ComponentBehavior: Bound
import QtQuick
import Quickshell
import Quickshell.Services.Notifications
Singleton {
id: root
property alias list: notifServer.trackedNotifications
NotificationServer {
id: notifServer
actionIconsSupported: true
actionsSupported: true
bodyHyperlinksSupported: true
bodyImagesSupported: true
bodyMarkupSupported: true
bodySupported: true
imageSupported: true
keepOnReload: true
persistenceSupported: true
onNotification: (notification) => {
notification.tracked = true;
if(!notification.time) {
notification.time = new Date();
}
// root.list = [...root.list, notification];
}
}
}

View file

@ -1,5 +1,7 @@
import "root:/modules/common"
pragma Singleton pragma Singleton
pragma ComponentBehavior: Bound
import "root:/modules/common"
import QtQuick import QtQuick
import Quickshell import Quickshell
import Quickshell.Io import Quickshell.Io

View file

@ -1,7 +1,9 @@
pragma Singleton
pragma ComponentBehavior: Bound
import QtQuick import QtQuick
import Quickshell import Quickshell
import Quickshell.Io import Quickshell.Io
pragma Singleton
Singleton { Singleton {
property string distroName: "Unknown" property string distroName: "Unknown"

View file

@ -1,4 +1,5 @@
pragma Singleton pragma Singleton
pragma ComponentBehavior: Bound
import Quickshell; import Quickshell;
import Quickshell.Io; import Quickshell.Io;