Port the network proxy page to mobileform

src/qml/Settings/NetworkProxyPage.qml

@@ -6,6 +6,7 @@ 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.neochat 1.0
 
@@ -15,11 +16,15 @@ Kirigami.ScrollablePage {
     property bool proxyConfigChanged: false
 
     ColumnLayout {
-        Kirigami.FormLayout {
+        MobileForm.FormCard {
+            Layout.topMargin: Kirigami.Units.largeSpacing
             Layout.fillWidth: true
-
+            contentItem: ColumnLayout {
-            QQC2.RadioButton {
+                spacing: 0
-                Kirigami.FormData.label: i18n("Network Proxy")
+                MobileForm.FormCardHeader {
+                    title: i18n("Network Proxy")
+                }
+                MobileForm.FormRadioDelegate {
                     text: i18n("System Default")
                     checked: currentType === 0
                     enabled: !Config.isProxyTypeImmutable
@@ -27,7 +32,7 @@ Kirigami.ScrollablePage {
                         currentType = 0
                     }
                 }
-            QQC2.RadioButton {
+                MobileForm.FormRadioDelegate {
                     text: i18n("HTTP")
                     checked: currentType === 1
                     enabled: !Config.isProxyTypeImmutable
@@ -35,7 +40,7 @@ Kirigami.ScrollablePage {
                         currentType = 1
                     }
                 }
-            QQC2.RadioButton {
+                MobileForm.FormRadioDelegate {
                     text: i18n("Socks5")
                     checked: currentType === 2
                     enabled: !Config.isProxyTypeImmutable
@@ -43,6 +48,25 @@ Kirigami.ScrollablePage {
                         currentType = 2
                     }
                 }
+            }
+        }
+
+        MobileForm.FormCard {
+            Layout.topMargin: Kirigami.Units.largeSpacing
+            Layout.fillWidth: true
+            contentItem: ColumnLayout {
+                spacing: 0
+                MobileForm.FormCardHeader {
+                    title: i18n("Proxy Settings")
+                }
+                // TODO: switch to FormTextFieldDelegate once kirigami-addons got a new release
+                MobileForm.AbstractFormDelegate {
+                    Layout.fillWidth: true
+                    contentItem: RowLayout {
+                        QQC2.Label {
+                            text: i18n("Host")
+                            Layout.fillWidth: true
+                        }
                         QQC2.TextField {
                             id: hostField
                             Kirigami.FormData.label: i18n("Proxy Host")
@@ -52,6 +76,15 @@ Kirigami.ScrollablePage {
                                 proxyConfigChanged = true
                             }
                         }
+                    }
+                }
+                MobileForm.AbstractFormDelegate {
+                    Layout.fillWidth: true
+                    contentItem: RowLayout {
+                        QQC2.Label {
+                            text: i18n("Peeker width")
+                            Layout.fillWidth: true
+                        }
                         QQC2.SpinBox {
                             id: portField
                             Kirigami.FormData.label: i18n("Proxy Port")
@@ -68,6 +101,9 @@ Kirigami.ScrollablePage {
                         }
                     }
                 }
+            }
+        }
+    }
 
     footer: QQC2.ToolBar {
         height: visible ? implicitHeight : 0