Port GlobalNotificationsPage to FormCard

src/qml/Settings/GlobalNotificationsPage.qml

@@ -6,27 +6,19 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
 
 import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
+import org.kde.kirigamiaddons.formcard 1.0 as FormCard
 import org.kde.kitemmodels 1.0
 
 import org.kde.neochat 1.0
 
-Kirigami.ScrollablePage {
+FormCard.FormCardPage {
     id: root
 
     title: i18nc("@title:window", "Notifications")
-    topPadding: 0
-    leftPadding: 0
-    rightPadding: 0
 
-    ColumnLayout {
+    FormCard.FormCard {
-        id: notificationLayout
-        spacing: 0
-
-        MobileForm.FormCard {
-            Layout.fillWidth: true
         Layout.topMargin: Kirigami.Units.largeSpacing
-            contentItem: MobileForm.FormCheckDelegate {
+        FormCard.FormCheckDelegate {
             text: i18n("Enable notifications for this account")
             description: i18n("Whether push notifications are generated by your Matrix server")
             checked: Controller.pushRuleModel.globalNotificationsEnabled
@@ -37,16 +29,10 @@ Kirigami.ScrollablePage {
         }
     }
 
-        MobileForm.FormHeader {
+    FormCard.FormHeader {
-            Layout.fillWidth: true
         title: i18n("Room Notifications")
     }
-        MobileForm.FormCard {
+    FormCard.FormCard {
-            Layout.fillWidth: true
-
-            contentItem: ColumnLayout {
-                spacing: 0
-
         Repeater {
             model: KSortFilterProxyModel {
                 sourceModel: Controller.pushRuleModel
@@ -59,17 +45,11 @@ Kirigami.ScrollablePage {
             delegate: ruleDelegate
         }
     }
-        }
 
-        MobileForm.FormHeader {
+    FormCard.FormHeader {
-            Layout.fillWidth: true
         title: i18n("@Mentions")
     }
-        MobileForm.FormCard {
+    FormCard.FormCard {
-            Layout.fillWidth: true
-
-            contentItem: ColumnLayout {
-                spacing: 0
         Repeater {
             model: KSortFilterProxyModel {
                 sourceModel: Controller.pushRuleModel
@@ -82,17 +62,11 @@ Kirigami.ScrollablePage {
             delegate: ruleDelegate
         }
     }
-        }
 
-        MobileForm.FormHeader {
+    FormCard.FormHeader {
-            Layout.fillWidth: true
         title: i18n("Keywords")
     }
-        MobileForm.FormCard {
+    FormCard.FormCard {
-            Layout.fillWidth: true
-
-            contentItem: ColumnLayout {
-                spacing: 0
         Repeater {
             model: KSortFilterProxyModel {
                 sourceModel: Controller.pushRuleModel
@@ -105,7 +79,7 @@ Kirigami.ScrollablePage {
 
             delegate: ruleDelegate
         }
-                MobileForm.AbstractFormDelegate {
+        FormCard.AbstractFormDelegate {
             Layout.fillWidth: true
 
             contentItem : RowLayout {
@@ -152,17 +126,11 @@ Kirigami.ScrollablePage {
             }
         }
     }
-        }
 
-        MobileForm.FormHeader {
+    FormCard.FormHeader {
-            Layout.fillWidth: true
         title: i18n("Invites")
     }
-        MobileForm.FormCard {
+    FormCard.FormCard {
-            Layout.fillWidth: true
-
-            contentItem: ColumnLayout {
-                spacing: 0
         Repeater {
             model: KSortFilterProxyModel {
                 sourceModel: Controller.pushRuleModel
@@ -175,19 +143,14 @@ Kirigami.ScrollablePage {
             delegate: ruleDelegate
         }
     }
-        }
 
-        MobileForm.FormHeader {
+    FormCard.FormHeader {
-            Layout.fillWidth: true
         title: i18n("Unknown")
         visible: unknownModel.rowCount() > 0
     }
-        MobileForm.FormCard {
+    FormCard.FormCard {
-            Layout.fillWidth: true
         visible: unknownModel.rowCount() > 0
 
-            contentItem: ColumnLayout {
-                spacing: 0
         Repeater {
             model: KSortFilterProxyModel {
                 id: unknownModel
@@ -201,10 +164,8 @@ Kirigami.ScrollablePage {
             delegate: ruleDelegate
         }
     }
-        }
-    }
 
-    Component {
+    property Component ruleDelegate: Component {
         id: ruleDelegate
         NotificationRuleItem {
             onDeleteRule: {