marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
shift-shell/shell/contents/lockscreen/LockScreenContent.qml

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

121 lines
3.7 KiB
QML
Raw Normal View History

lockscreen: Rework and simplify keypad appearance, and fix lockscreen state The current lockscreen mockups were originally from this mockup: https://phabricator.kde.org/T12717 There are some issues with it however: - The 0 key is on the right, which is a bit strange and differs from the layouts of all other platforms - One-handed usability is worse due to 4 columns instead of 3 - Most mobile lockscreen have the keypad toward the center for one-handed usability, our keypad is stuck to the bottom - It makes use of a lot of shadows which makes it slower to load - It's supposed to emulate the design of the keyboard, but it doesn't look like it so it's out of place The new design is much simpler, with a centered 3 column approach making keys much easier to reach with one hand. It also avoids the use of shadows and layers. ![image](/uploads/52bd7accf2aaffc2b4054e13ac742bce/image.png) ![image](/uploads/4fe8b43abb1f5e2c2b8278f98b28bc71/image.png) ![image](/uploads/a306cfbe628e8b3e49175cd8f8e77ec1/image.png) TODO: - Investigate some improvements for keyboard input
2024-06-26 02:57:42 +00:00
// SPDX-FileCopyrightText: 2021-2024 Devin Lin <devin@kde.org>
// SPDX-License-Identifier: GPL-2.0-or-later
import QtQuick
import QtQuick.Layouts
import QtQuick.Effects
import org.kde.kirigami 2.20 as Kirigami
import org.kde.plasma.workspace.keyboardlayout 1.0
import org.kde.notificationmanager as Notifications
import org.kde.plasma.private.mobileshell as MobileShell
Item {
id: root
required property bool isVertical
notification list: fix notification scrolling within action drawer and lockscreen 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
2025-03-20 02:06:33 +00:00
required property var lockScreenState
readonly property bool listOverflowing: notificationComponent.listOverflowing
lockscreen: Rework and simplify keypad appearance, and fix lockscreen state The current lockscreen mockups were originally from this mockup: https://phabricator.kde.org/T12717 There are some issues with it however: - The 0 key is on the right, which is a bit strange and differs from the layouts of all other platforms - One-handed usability is worse due to 4 columns instead of 3 - Most mobile lockscreen have the keypad toward the center for one-handed usability, our keypad is stuck to the bottom - It makes use of a lot of shadows which makes it slower to load - It's supposed to emulate the design of the keyboard, but it doesn't look like it so it's out of place The new design is much simpler, with a centered 3 column approach making keys much easier to reach with one hand. It also avoids the use of shadows and layers. ![image](/uploads/52bd7accf2aaffc2b4054e13ac742bce/image.png) ![image](/uploads/4fe8b43abb1f5e2c2b8278f98b28bc71/image.png) ![image](/uploads/a306cfbe628e8b3e49175cd8f8e77ec1/image.png) TODO: - Investigate some improvements for keyboard input
2024-06-26 02:57:42 +00:00
property var notificationsModel: []
property bool notificationsShown: false
notification list: fix notification scrolling within action drawer and lockscreen 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
2025-03-20 02:06:33 +00:00
property bool scrollLock: false
lockscreen: Rework and simplify keypad appearance, and fix lockscreen state The current lockscreen mockups were originally from this mockup: https://phabricator.kde.org/T12717 There are some issues with it however: - The 0 key is on the right, which is a bit strange and differs from the layouts of all other platforms - One-handed usability is worse due to 4 columns instead of 3 - Most mobile lockscreen have the keypad toward the center for one-handed usability, our keypad is stuck to the bottom - It makes use of a lot of shadows which makes it slower to load - It's supposed to emulate the design of the keyboard, but it doesn't look like it so it's out of place The new design is much simpler, with a centered 3 column approach making keys much easier to reach with one hand. It also avoids the use of shadows and layers. ![image](/uploads/52bd7accf2aaffc2b4054e13ac742bce/image.png) ![image](/uploads/4fe8b43abb1f5e2c2b8278f98b28bc71/image.png) ![image](/uploads/a306cfbe628e8b3e49175cd8f8e77ec1/image.png) TODO: - Investigate some improvements for keyboard input
2024-06-26 02:57:42 +00:00
signal passwordRequested()
// Vertical layout
ColumnLayout {
id: verticalLayout
visible: root.isVertical
spacing: 0
Lock Screen Adjustments Clock position changed so that it will always be at the top. The login keypad will now hide when the keyboard is opened. ![Screenshot_20240728_054940](/uploads/be3a5625c10717add38a76dbdded358b/Screenshot_20240728_054940.png)
2024-07-30 02:53:33 +00:00
anchors.topMargin: Kirigami.Units.gridUnit * 3.5
anchors.bottomMargin: Kirigami.Units.gridUnit * 2
lockscreen: Rework and simplify keypad appearance, and fix lockscreen state The current lockscreen mockups were originally from this mockup: https://phabricator.kde.org/T12717 There are some issues with it however: - The 0 key is on the right, which is a bit strange and differs from the layouts of all other platforms - One-handed usability is worse due to 4 columns instead of 3 - Most mobile lockscreen have the keypad toward the center for one-handed usability, our keypad is stuck to the bottom - It makes use of a lot of shadows which makes it slower to load - It's supposed to emulate the design of the keyboard, but it doesn't look like it so it's out of place The new design is much simpler, with a centered 3 column approach making keys much easier to reach with one hand. It also avoids the use of shadows and layers. ![image](/uploads/52bd7accf2aaffc2b4054e13ac742bce/image.png) ![image](/uploads/4fe8b43abb1f5e2c2b8278f98b28bc71/image.png) ![image](/uploads/a306cfbe628e8b3e49175cd8f8e77ec1/image.png) TODO: - Investigate some improvements for keyboard input
2024-06-26 02:57:42 +00:00
anchors.fill: parent
LayoutItemProxy { target: clockAndMediaWidget }
LayoutItemProxy { target: notificationComponent }
}
// Horizontal layout (landscape on smaller devices)
Item {
id: horizontalLayout
anchors.fill: parent
visible: !root.isVertical
ColumnLayout {
id: leftLayout
width: parent.width / 2
anchors {
top: parent.top
bottom: parent.bottom
left: parent.left
leftMargin: Kirigami.Units.gridUnit * 3
}
LayoutItemProxy { target: clockAndMediaWidget }
}
ColumnLayout {
id: rightLayout
anchors {
top: parent.top
bottom: parent.bottom
left: leftLayout.right
right: parent.right
rightMargin: Kirigami.Units.gridUnit
}
LayoutItemProxy { target: notificationComponent }
}
}
// Clock and media widget column
ColumnLayout {
id: clockAndMediaWidget
Layout.fillWidth: true
Layout.fillHeight: root.isVertical
Lock Screen Adjustments Clock position changed so that it will always be at the top. The login keypad will now hide when the keyboard is opened. ![Screenshot_20240728_054940](/uploads/be3a5625c10717add38a76dbdded358b/Screenshot_20240728_054940.png)
2024-07-30 02:53:33 +00:00
spacing: Kirigami.Units.gridUnit
lockscreen: Rework and simplify keypad appearance, and fix lockscreen state The current lockscreen mockups were originally from this mockup: https://phabricator.kde.org/T12717 There are some issues with it however: - The 0 key is on the right, which is a bit strange and differs from the layouts of all other platforms - One-handed usability is worse due to 4 columns instead of 3 - Most mobile lockscreen have the keypad toward the center for one-handed usability, our keypad is stuck to the bottom - It makes use of a lot of shadows which makes it slower to load - It's supposed to emulate the design of the keyboard, but it doesn't look like it so it's out of place The new design is much simpler, with a centered 3 column approach making keys much easier to reach with one hand. It also avoids the use of shadows and layers. ![image](/uploads/52bd7accf2aaffc2b4054e13ac742bce/image.png) ![image](/uploads/4fe8b43abb1f5e2c2b8278f98b28bc71/image.png) ![image](/uploads/a306cfbe628e8b3e49175cd8f8e77ec1/image.png) TODO: - Investigate some improvements for keyboard input
2024-06-26 02:57:42 +00:00
Clock {
layoutAlignment: root.isVertical ? Qt.AlignHCenter : Qt.AlignLeft
Layout.alignment: root.isVertical ? Qt.AlignHCenter : Qt.AlignLeft
Layout.fillWidth: true
}
MobileShell.MediaControlsWidget {
notification list: fix notification scrolling within action drawer and lockscreen 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
2025-03-20 02:06:33 +00:00
id: mediaControlsWidget
lockscreen: Rework and simplify keypad appearance, and fix lockscreen state The current lockscreen mockups were originally from this mockup: https://phabricator.kde.org/T12717 There are some issues with it however: - The 0 key is on the right, which is a bit strange and differs from the layouts of all other platforms - One-handed usability is worse due to 4 columns instead of 3 - Most mobile lockscreen have the keypad toward the center for one-handed usability, our keypad is stuck to the bottom - It makes use of a lot of shadows which makes it slower to load - It's supposed to emulate the design of the keyboard, but it doesn't look like it so it's out of place The new design is much simpler, with a centered 3 column approach making keys much easier to reach with one hand. It also avoids the use of shadows and layers. ![image](/uploads/52bd7accf2aaffc2b4054e13ac742bce/image.png) ![image](/uploads/4fe8b43abb1f5e2c2b8278f98b28bc71/image.png) ![image](/uploads/a306cfbe628e8b3e49175cd8f8e77ec1/image.png) TODO: - Investigate some improvements for keyboard input
2024-06-26 02:57:42 +00:00
Layout.alignment: root.isVertical ? Qt.AlignHCenter : Qt.AlignLeft
Layout.fillWidth: true
Layout.maximumWidth: Kirigami.Units.gridUnit * 25
Layout.leftMargin: root.isVertical ? Kirigami.Units.gridUnit : 0
Layout.rightMargin: root.isVertical ? Kirigami.Units.gridUnit : 0
}
}
notification list: fix notification scrolling within action drawer and lockscreen 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
2025-03-20 02:06:33 +00:00
// notification widget column
lockscreen: Rework and simplify keypad appearance, and fix lockscreen state The current lockscreen mockups were originally from this mockup: https://phabricator.kde.org/T12717 There are some issues with it however: - The 0 key is on the right, which is a bit strange and differs from the layouts of all other platforms - One-handed usability is worse due to 4 columns instead of 3 - Most mobile lockscreen have the keypad toward the center for one-handed usability, our keypad is stuck to the bottom - It makes use of a lot of shadows which makes it slower to load - It's supposed to emulate the design of the keyboard, but it doesn't look like it so it's out of place The new design is much simpler, with a centered 3 column approach making keys much easier to reach with one hand. It also avoids the use of shadows and layers. ![image](/uploads/52bd7accf2aaffc2b4054e13ac742bce/image.png) ![image](/uploads/4fe8b43abb1f5e2c2b8278f98b28bc71/image.png) ![image](/uploads/a306cfbe628e8b3e49175cd8f8e77ec1/image.png) TODO: - Investigate some improvements for keyboard input
2024-06-26 02:57:42 +00:00
NotificationsComponent {
id: notificationComponent
lockScreenState: root.lockScreenState
notificationsModel: root.notificationsModel
notification list: fix notification scrolling within action drawer and lockscreen 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
2025-03-20 02:06:33 +00:00
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
lockscreen: Rework and simplify keypad appearance, and fix lockscreen state The current lockscreen mockups were originally from this mockup: https://phabricator.kde.org/T12717 There are some issues with it however: - The 0 key is on the right, which is a bit strange and differs from the layouts of all other platforms - One-handed usability is worse due to 4 columns instead of 3 - Most mobile lockscreen have the keypad toward the center for one-handed usability, our keypad is stuck to the bottom - It makes use of a lot of shadows which makes it slower to load - It's supposed to emulate the design of the keyboard, but it doesn't look like it so it's out of place The new design is much simpler, with a centered 3 column approach making keys much easier to reach with one hand. It also avoids the use of shadows and layers. ![image](/uploads/52bd7accf2aaffc2b4054e13ac742bce/image.png) ![image](/uploads/4fe8b43abb1f5e2c2b8278f98b28bc71/image.png) ![image](/uploads/a306cfbe628e8b3e49175cd8f8e77ec1/image.png) TODO: - Investigate some improvements for keyboard input
2024-06-26 02:57:42 +00:00
Layout.fillWidth: true
notification list: fix notification scrolling within action drawer and lockscreen 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
2025-03-20 02:06:33 +00:00
Layout.fillHeight: true
lockscreen: Rework and simplify keypad appearance, and fix lockscreen state The current lockscreen mockups were originally from this mockup: https://phabricator.kde.org/T12717 There are some issues with it however: - The 0 key is on the right, which is a bit strange and differs from the layouts of all other platforms - One-handed usability is worse due to 4 columns instead of 3 - Most mobile lockscreen have the keypad toward the center for one-handed usability, our keypad is stuck to the bottom - It makes use of a lot of shadows which makes it slower to load - It's supposed to emulate the design of the keyboard, but it doesn't look like it so it's out of place The new design is much simpler, with a centered 3 column approach making keys much easier to reach with one hand. It also avoids the use of shadows and layers. ![image](/uploads/52bd7accf2aaffc2b4054e13ac742bce/image.png) ![image](/uploads/4fe8b43abb1f5e2c2b8278f98b28bc71/image.png) ![image](/uploads/a306cfbe628e8b3e49175cd8f8e77ec1/image.png) TODO: - Investigate some improvements for keyboard input
2024-06-26 02:57:42 +00:00
Layout.maximumWidth: Kirigami.Units.gridUnit * (25 + 2) // clip margins
notification list: fix notification scrolling within action drawer and lockscreen 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
2025-03-20 02:06:33 +00:00
topPadding: root.isVertical ? (mediaControlsWidget.visible ? Kirigami.Units.smallSpacing : Kirigami.Units.gridUnit) : Kirigami.Units.gridUnit
lockscreen: Rework and simplify keypad appearance, and fix lockscreen state The current lockscreen mockups were originally from this mockup: https://phabricator.kde.org/T12717 There are some issues with it however: - The 0 key is on the right, which is a bit strange and differs from the layouts of all other platforms - One-handed usability is worse due to 4 columns instead of 3 - Most mobile lockscreen have the keypad toward the center for one-handed usability, our keypad is stuck to the bottom - It makes use of a lot of shadows which makes it slower to load - It's supposed to emulate the design of the keyboard, but it doesn't look like it so it's out of place The new design is much simpler, with a centered 3 column approach making keys much easier to reach with one hand. It also avoids the use of shadows and layers. ![image](/uploads/52bd7accf2aaffc2b4054e13ac742bce/image.png) ![image](/uploads/4fe8b43abb1f5e2c2b8278f98b28bc71/image.png) ![image](/uploads/a306cfbe628e8b3e49175cd8f8e77ec1/image.png) TODO: - Investigate some improvements for keyboard input
2024-06-26 02:57:42 +00:00
leftMargin: root.isVertical ? 0 : Kirigami.Units.gridUnit
rightMargin: root.isVertical ? 0 : Kirigami.Units.gridUnit
notification list: fix notification scrolling within action drawer and lockscreen 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
2025-03-20 02:06:33 +00:00
topMargin: root.isVertical ? 0 : MobileShell.Constants.topPanelHeight
bottomMargin: Kirigami.Units.gridUnit * 2
scrollLock: root.scrollLock
lockscreen: Rework and simplify keypad appearance, and fix lockscreen state The current lockscreen mockups were originally from this mockup: https://phabricator.kde.org/T12717 There are some issues with it however: - The 0 key is on the right, which is a bit strange and differs from the layouts of all other platforms - One-handed usability is worse due to 4 columns instead of 3 - Most mobile lockscreen have the keypad toward the center for one-handed usability, our keypad is stuck to the bottom - It makes use of a lot of shadows which makes it slower to load - It's supposed to emulate the design of the keyboard, but it doesn't look like it so it's out of place The new design is much simpler, with a centered 3 column approach making keys much easier to reach with one hand. It also avoids the use of shadows and layers. ![image](/uploads/52bd7accf2aaffc2b4054e13ac742bce/image.png) ![image](/uploads/4fe8b43abb1f5e2c2b8278f98b28bc71/image.png) ![image](/uploads/a306cfbe628e8b3e49175cd8f8e77ec1/image.png) TODO: - Investigate some improvements for keyboard input
2024-06-26 02:57:42 +00:00
onPasswordRequested: root.passwordRequested()
onNotificationsShownChanged: root.notificationsShown = notificationsShown
}
Lock Screen Adjustments Clock position changed so that it will always be at the top. The login keypad will now hide when the keyboard is opened. ![Screenshot_20240728_054940](/uploads/be3a5625c10717add38a76dbdded358b/Screenshot_20240728_054940.png)
2024-07-30 02:53:33 +00:00
}
Reference in a new issue Copy permalink