mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
e4323f4ef0
This merge request fixes an issue with notification list scrolling and also adds a few general improvements. To accomplish this, the notification widget was moved outside of the action drawer swipe area and lock screen swipe area, separating them from the parent-child relationship. Instead, the notification widget is now layered separately on top. This change seems to fix the conflict when both areas are accepting swipes from the same direction. Additionally, changes were made to the notification list widget for the action drawer to make it behave similarly to the folio home screen app library. Specifically, when at the top of the list, one can swipe down over the notification area to expand the action drawer. In landscape mode, the media widget, clock, and date were also added to the notification list to provide more room for viewing notifications when scrolling. Closes https://invent.kde.org/plasma/plasma-mobile/-/issues/318
111 lines
3.5 KiB
QML
111 lines
3.5 KiB
QML
// SPDX-FileCopyrightText: 2022 Devin Lin <espidev@gmail.com>
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
import QtQuick
|
|
import QtQuick.Layouts
|
|
|
|
import org.kde.plasma.private.mobileshell as MobileShell
|
|
import org.kde.kirigami as Kirigami
|
|
|
|
import org.kde.notificationmanager as NotificationManager
|
|
|
|
Loader {
|
|
id: root
|
|
required property var lockScreenState
|
|
|
|
property var notificationsModel: []
|
|
property var notificationSettings: NotificationManager.Settings {}
|
|
|
|
property real leftMargin: 0
|
|
property real rightMargin: 0
|
|
property real topMargin: 0
|
|
property real bottomMargin: 0
|
|
|
|
property real topPadding: 0
|
|
|
|
readonly property bool notificationsShown: item && item.notificationsList.hasNotifications
|
|
readonly property bool listOverflowing: item && item.notificationsList.listView.listOverflowing
|
|
|
|
property bool scrollLock: false
|
|
|
|
property var notificationsList: item ? item.notificationsList : null
|
|
|
|
signal passwordRequested()
|
|
|
|
// perform delayed loading of notifications
|
|
active: false
|
|
Timer {
|
|
interval: 500
|
|
running: true
|
|
onTriggered: root.active = true
|
|
}
|
|
|
|
Connections {
|
|
target: lockScreenState
|
|
|
|
function onUnlockSucceeded() {
|
|
// run pending action if successfully unlocked
|
|
if (notificationsList.requestNotificationAction) {
|
|
notificationsList.runPendingAction();
|
|
notificationsList.requestNotificationAction = false;
|
|
}
|
|
}
|
|
|
|
function onUnlockFailed() {
|
|
notificationsList.requestNotificationAction = false;
|
|
}
|
|
}
|
|
|
|
sourceComponent: Item {
|
|
clip: true
|
|
|
|
property alias notificationsList: notificationsList
|
|
|
|
Item {
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: root.topMargin
|
|
anchors.leftMargin: root.leftMargin
|
|
anchors.rightMargin: root.rightMargin
|
|
|
|
Kirigami.Theme.colorSet: Kirigami.Theme.Window
|
|
Kirigami.Theme.inherit: false
|
|
|
|
height: Math.min(parent.height - root.topMargin - root.bottomMargin, notificationsList.listView.listHeight + Kirigami.Units.gridUnit)
|
|
|
|
MobileShell.NotificationsWidget {
|
|
id: notificationsList
|
|
anchors.fill: parent
|
|
opacity: 0 // we display with the opacity gradient below
|
|
|
|
historyModelType: MobileShell.NotificationsModelType.WatchedNotificationsModel
|
|
actionsRequireUnlock: true
|
|
historyModel: root.notificationsModel
|
|
notificationSettings: root.notificationSettings
|
|
inLockscreen: true
|
|
topPadding: root.topPadding // Kirigami.Units.gridUnit
|
|
bottomPadding: Kirigami.Units.gridUnit
|
|
listView.interactive: !root.scrollLock && listView.listOverflowing
|
|
|
|
property bool requestNotificationAction: false
|
|
|
|
onUnlockRequested: {
|
|
requestNotificationAction = true;
|
|
root.passwordRequested();
|
|
}
|
|
}
|
|
|
|
// opacity gradient at flickable edges
|
|
MobileShell.FlickableOpacityGradient {
|
|
anchors {
|
|
top: notificationsList.top
|
|
left: notificationsList.left
|
|
right: notificationsList.right
|
|
}
|
|
height: notificationsList.listView.height
|
|
flickable: notificationsList.listView
|
|
}
|
|
}
|
|
}
|
|
}
|