mobileshell: Remove compile time QtFeedback dependency, and make it optional

CMakeLists.txt

@@ -46,7 +46,6 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED
     Core
     Qml
     Quick
-    Feedback
 )
 if (QT_MAJOR_VERSION STREQUAL "5")
     if (QUICK_COMPILER)

README.md

@@ -40,7 +40,6 @@ Dependencies:
 * Plasma Nano
 * Kirigami
 * Kirigami Addons
-* Qt Feedback
 
 To start the phone homescreen in a window, run:
 ```

components/mobileshell/CMakeLists.txt

@@ -38,7 +38,6 @@ target_link_libraries(mobileshellplugin
         Qt::Qml
         Qt::Gui
         Qt::Quick
-        Qt::Feedback
         KF5::ConfigWidgets # for KStandardAction
         KF5::KIOGui
         KF5::Plasma

components/mobileshell/mobileshellplugin.cpp

@@ -72,6 +72,7 @@ void MobileShellPlugin::registerTypes(const char *uri)
     qmlRegisterType(resolvePath("components/ExtendedAbstractButton.qml"), uri, 1, 0, "ExtendedAbstractButton");
     qmlRegisterType(resolvePath("components/Flickable.qml"), uri, 1, 0, "Flickable");
     qmlRegisterType(resolvePath("components/GridView.qml"), uri, 1, 0, "GridView");
+    qmlRegisterType(resolvePath("components/HapticsEffectLoader.qml"), uri, 1, 0, "HapticsEffectLoader");
     qmlRegisterType(resolvePath("components/ListView.qml"), uri, 1, 0, "ListView");
     qmlRegisterType(resolvePath("components/StartupFeedback.qml"), uri, 1, 0, "StartupFeedback");
     qmlRegisterType(resolvePath("components/VelocityCalculator.qml"), uri, 1, 0, "VelocityCalculator");

components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml

@@ -55,13 +55,17 @@ QuickSettingsDelegate {
         }
     }
     
+    MobileShell.HapticsEffectLoader {
+        id: haptics
+    }
+    
     contentItem: MouseArea {
         id: mouseArea
         
-        onPressed: MobileShell.ShellUtil.buttonVibrate()
+        onPressed: haptics.buttonVibrate()
         onClicked: root.delegateClick()
         onPressAndHold: {
-            MobileShell.ShellUtil.buttonVibrate();
+            haptics.buttonVibrate();
             root.delegatePressAndHold();
         }
         

components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml

@@ -52,13 +52,17 @@ QuickSettingsDelegate {
         }
     }
     
+    MobileShell.HapticsEffectLoader {
+        id: haptics
+    }
+    
     contentItem: MouseArea {
         id: mouseArea
         
-        onPressed: MobileShell.ShellUtil.buttonVibrate();
+        onPressed: haptics.buttonVibrate();
         onClicked: root.delegateClick()
         onPressAndHold: {
-            MobileShell.ShellUtil.buttonVibrate();
+            haptics.buttonVibrate();
             root.delegatePressAndHold();
         }
         

components/mobileshell/qml/components/HapticsEffectLoader.qml

@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: 2022 Devin Lin <devin@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+
+import org.kde.plasma.private.mobileshell 1.0 as MobileShell
+
+Loader {
+    source: "qrc:/HapticsEffectWrapper.qml"
+    property bool valid: item !== null
+    
+    function buttonVibrate() {
+        if (valid && MobileShell.MobileShellSettings.vibrationsEnabled) {
+            item.intensity = MobileShell.MobileShellSettings.vibrationIntensity;
+            item.duration = MobileShell.MobileShellSettings.vibrationDuration;
+            item.start();
+        }
+    }
+}
+

components/mobileshell/qml/components/HapticsEffectWrapper.qml

@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2022 Devin Lin <devin@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtFeedback 5.0
+
+HapticsEffect {}
+

components/mobileshell/qml/navigationpanel/NavigationPanel.qml

@@ -61,12 +61,16 @@ Item {
         
         property NavigationPanelButton activeButton
 
+        MobileShell.HapticsEffectLoader {
+            id: haptics
+        }
+        
         onPressed: {
             startMouseX = oldMouseX = mouse.y;
             startMouseY = oldMouseY = mouse.y;
             activeButton = icons.childAt(mouse.x, mouse.y);
             if (activeButton && activeButton.enabled) {
-                MobileShell.ShellUtil.buttonVibrate();
+                haptics.buttonVibrate();
             }
         }
         

components/mobileshell/resources.qrc

@@ -24,6 +24,8 @@
         <file>qml/components/ExtendedAbstractButton.qml</file>
         <file>qml/components/Flickable.qml</file>
         <file>qml/components/GridView.qml</file>
+        <file>qml/components/HapticsEffectLoader.qml</file>
+        <file>qml/components/HapticsEffectWrapper.qml</file>
         <file>qml/components/ListView.qml</file>
         <file>qml/components/MarqueeLabel.qml</file>
         <file>qml/components/StartupFeedback.qml</file>

components/mobileshell/shellutil.cpp

@@ -28,7 +28,6 @@ ShellUtil::ShellUtil(QObject *parent)
     : QObject{parent}
     , m_localeConfig{KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::SimpleConfig)}
     , m_launchingApp{nullptr}
-    , m_hapticsEffect{std::make_unique<QFeedbackHapticsEffect>()}
 {
     m_localeConfigWatcher = KConfigWatcher::create(m_localeConfig);
 
@@ -133,12 +132,3 @@ void ShellUtil::clearLaunchingApp()
     m_launchingApp = nullptr;
     Q_EMIT isLaunchingAppChanged();
 }
-
-void ShellUtil::buttonVibrate()
-{
-    if (MobileShellSettings::self()->vibrationsEnabled()) {
-        m_hapticsEffect->setDuration(MobileShellSettings::self()->vibrationDuration());
-        m_hapticsEffect->setIntensity(MobileShellSettings::self()->vibrationIntensity());
-        m_hapticsEffect->start();
-    }
-}

components/mobileshell/shellutil.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <QFeedbackHapticsEffect>
 #include <QObject>
 #include <QQuickItem>
 
@@ -82,11 +81,6 @@ public:
      */
     Q_INVOKABLE void clearLaunchingApp();
 
-    /**
-     * Initiates a vibration event, meant for a button.
-     */
-    Q_INVOKABLE void buttonVibrate();
-
 Q_SIGNALS:
     void isSystem24HourFormatChanged();
     void isLaunchingAppChanged();
@@ -99,6 +93,4 @@ private:
 
     KIO::ApplicationLauncherJob *m_launchingApp;
     QVector<qint64> m_launchingAppPids;
-
-    std::unique_ptr<QFeedbackHapticsEffect> m_hapticsEffect;
 };

look-and-feel/contents/lockscreen/Keypad.qml

@@ -54,6 +54,10 @@ Rectangle {
         }
     }
 
+    MobileShell.HapticsEffectLoader {
+        id: haptics
+    }
+    
     RectangularGlow {
         anchors.topMargin: 1
         anchors.fill: passwordBar
@@ -147,7 +151,7 @@ Rectangle {
 
                     onPressedChanged: {
                         if (pressed) {
-                            MobileShell.ShellUtil.buttonVibrate();
+                            haptics.buttonVibrate();
                         }
                     }
 
@@ -162,7 +166,7 @@ Rectangle {
                     }
                     onPressAndHold: {
                         if (modelData === "R") {
-                            MobileShell.ShellUtil.buttonVibrate();
+                            haptics.buttonVibrate();
                             passwordBar.clear();
                         }
                     }