QML refactoring

client/ui/qml/Pages/PageSetupWizardHighLevel.qml

@@ -21,18 +21,9 @@ PageBase {
 
     FlickableType {
         id: fl
-        width: root.width
         anchors.top: caption.bottom
-        anchors.topMargin: 20
-        anchors.bottom: root.bottom
-        anchors.bottomMargin: 20
-        anchors.left: root.left
-        anchors.leftMargin: 30
-        anchors.right: root.right
-        anchors.rightMargin: 15
-
+        anchors.bottom: next_button.top
         contentHeight: content.height
-        clip: true
 
         ColumnLayout {
             id: content
@@ -84,22 +75,22 @@ You SHOULD set this website address to some foreign website which is not blocked
 
 This protocol support exporting connection profiles to mobile devices by exporting ShadowSocks and Cloak configs (you should launch the 3rd party open source VPN client - ShadowSocks VPN and install Cloak plugin).")
             }
-            BlueButtonType {
-                id: next_button
-                Layout.fillWidth: true
-                Layout.topMargin: 15
-                Layout.preferredHeight: 41
-                text: qsTr("Next")
-                onClicked: {
-                    let domain = website_masking.text;
-                    if (!domain || !domain.includes(".")) {
-                        return
-                    }
-                    UiLogic.goToPage(PageEnum.WizardVpnMode, false)
-                }
-            }
-
         }
+    }
 
+    BlueButtonType {
+        id: next_button
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: GC.defaultMargin
+        x: GC.defaultMargin
+        width: parent.width - 2 * GC.defaultMargin
+        text: qsTr("Next")
+        onClicked: {
+            let domain = website_masking.text;
+            if (!domain || !domain.includes(".")) {
+                return
+            }
+            UiLogic.goToPage(PageEnum.WizardVpnMode, false)
+        }
     }
 }