nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

notif/toasts: refactoring colors

Browse source
This commit is contained in:
ATMDA 2025-11-12 16:50:20 -05:00
parent 223159f5b7
commit 84e839cf55
4 changed files with 43 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/notifications/AppIconBadge.qml
View file

@ -13,15 +13,9 @@ StyledRect {
required property Notifs.Notif modelData
required property bool hasImage
required property bool hasAppIcon
required property bool isCritical
required property bool isLow
radius: Appearance.rounding.full
color: {
if (root.isCritical) return Colours.palette.m3error;
if (root.isLow) return Colours.layer(Colours.palette.m3surfaceContainerHighest, 2);
return Colours.palette.m3secondaryContainer;
}
color: modelData.getBadgeBackgroundColor()
implicitWidth: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image
implicitHeight: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image
@ -40,11 +34,7 @@ StyledRect {
sourceComponent: ColouredIcon {
anchors.fill: parent
source: Quickshell.iconPath(root.modelData.appIcon)
colour: {
if (root.isCritical) return Colours.palette.m3onError;
if (root.isLow) return Colours.palette.m3onSurface;
return Colours.palette.m3onSecondaryContainer;
}
colour: root.modelData.getIconColor()
layer.enabled: root.modelData.appIcon.endsWith("symbolic")
}
}
@ -59,12 +49,7 @@ StyledRect {
sourceComponent: MaterialIcon {
text: Icons.getNotifIcon(root.modelData.summary, root.modelData.urgency)
color: {
if (root.isCritical) return Colours.palette.m3onError;
if (root.isLow) return Colours.palette.m3onSurface;
return Colours.palette.m3onSecondaryContainer;
}
color: root.modelData.getIconColor()
font.pointSize: Appearance.font.size.large
}
}

26
modules/notifications/Notification.qml
View file

@ -17,8 +17,6 @@ StyledRect {
required property Notifs.Notif modelData
readonly property bool hasImage: modelData.image.length > 0
readonly property bool hasAppIcon: modelData.appIcon.length > 0
readonly property bool isCritical: modelData.urgency === NotificationUrgency.Critical
readonly property bool isLow: modelData.urgency === NotificationUrgency.Low
readonly property int nonAnimHeight: {
const baseHeight = summary.implicitHeight + inner.anchors.margins * 2;
return root.expanded
@ -28,9 +26,7 @@ StyledRect {
property bool expanded
property bool disableSlideIn: false
color: root.isCritical
? Colours.palette.m3secondaryContainer
: Colours.tPalette.m3surfaceContainer
color: modelData.getBackgroundColor()
radius: Appearance.rounding.normal
implicitWidth: Config.notifs.sizes.width
implicitHeight: inner.implicitHeight
@ -159,8 +155,6 @@ StyledRect {
modelData: root.modelData
hasImage: root.hasImage
hasAppIcon: root.hasAppIcon
isCritical: root.isCritical
isLow: root.isLow
}
}
@ -302,9 +296,7 @@ StyledRect {
StateLayer {
radius: Appearance.rounding.full
color: root.isCritical
? Colours.palette.m3onSecondaryContainer
: Colours.palette.m3onSurface
color: root.modelData.getStateLayerColor()
function onClicked() {
root.expanded = !root.expanded;
@ -424,12 +416,8 @@ StyledRect {
required property var modelData
readonly property bool isCritical: root.isCritical
radius: Appearance.rounding.full
color: isCritical
? Colours.palette.m3secondary
: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
color: root.modelData.getActionBackgroundColor()
Layout.preferredWidth: actionText.width + Appearance.padding.normal * 2
Layout.preferredHeight: actionText.height + Appearance.padding.small * 2
@ -438,9 +426,7 @@ StyledRect {
StateLayer {
radius: Appearance.rounding.full
color: isCritical
? Colours.palette.m3onSecondary
: Colours.palette.m3onSurface
color: root.modelData.getStateLayerColor()
function onClicked(): void {
action.modelData.invoke();
@ -452,9 +438,7 @@ StyledRect {
anchors.centerIn: parent
text: actionTextMetrics.elidedText
color: isCritical
? Colours.palette.m3onSecondary
: Colours.palette.m3onSurfaceVariant
color: root.modelData.getActionTextColor()
font.pointSize: Appearance.font.size.small
}

2
modules/notifications/NotificationToast.qml
View file

@ -85,8 +85,6 @@ StyledRect {
modelData: root.modelData
hasImage: root.hasImage
hasAppIcon: root.hasAppIcon
isCritical: root.modelData.urgency === NotificationUrgency.Critical
isLow: root.modelData.urgency === NotificationUrgency.Low
}
}
}

35
services/Notifs.qml
View file

@ -179,6 +179,41 @@ Singleton {
property bool hasActionIcons
property list<var> actions
readonly property bool isCritical: urgency === NotificationUrgency.Critical
readonly property bool isLow: urgency === NotificationUrgency.Low
function getBackgroundColor(): color {
if (isCritical) return Colours.palette.m3secondaryContainer;
return Colours.tPalette.m3surfaceContainer;
}
function getBadgeBackgroundColor(): color {
if (isCritical) return Colours.palette.m3error;
if (isLow) return Colours.layer(Colours.palette.m3surfaceContainerHighest, 2);
return Colours.palette.m3secondaryContainer;
}
function getIconColor(): color {
if (isCritical) return Colours.palette.m3onError;
if (isLow) return Colours.palette.m3onSurface;
return Colours.palette.m3onSecondaryContainer;
}
function getStateLayerColor(): color {
if (isCritical) return Colours.palette.m3onSecondaryContainer;
return Colours.palette.m3onSurface;
}
function getActionBackgroundColor(): color {
if (isCritical) return Colours.palette.m3secondary;
return Colours.layer(Colours.palette.m3surfaceContainerHigh, 2);
}
function getActionTextColor(): color {
if (isCritical) return Colours.palette.m3onSecondary;
return Colours.palette.m3onSurfaceVariant;
}
readonly property Timer timer: Timer {
id: toastTimer