Wizard: mobile redesign

1 files changed, 30 insertions, 17 deletions

diff --git a/wizard/WizardManageWalletUI.qml b/wizard/WizardManageWalletUI.qml
index ae997173..7b97b687 100644
--- a/wizard/WizardManageWalletUI.qml
+++ b/wizard/WizardManageWalletUI.qml
@@ -33,16 +33,13 @@ import QtQuick.Layouts 1.2
 import "../components"
 import 'utils.js' as Utils
 
-// Reusable component for managing wallet (account name, path, private key)
-
+// Reusable component for mnaging wallet (account name, path, private key)
 ColumnLayout {
-    anchors.left: parent.left
-    anchors.right: parent.right
-    spacing: 5
-
+    id: page
+    Layout.leftMargin: wizardLeftMargin
+    Layout.rightMargin: wizardRightMargin
     property alias titleText: titleText.text
     property alias accountNameText: accountName.text
-    property alias wordsTextTitle: frameHeader.text
     property alias walletPath: fileUrlInput.text
     property alias wordsTextItem : memoTextItem
     property alias restoreHeight : restoreHeightItem.text
@@ -90,7 +87,6 @@ ColumnLayout {
 
     RowLayout {
         id: dotsRow
-        Layout.topMargin: 85
         Layout.alignment: Qt.AlignRight
         spacing: 6
 
@@ -115,6 +111,7 @@ ColumnLayout {
 
     RowLayout {
         id: headerColumn
+        Layout.fillWidth: true
         Text {
             Layout.fillWidth: true
             horizontalAlignment: Text.AlignHCenter
@@ -127,18 +124,20 @@ ColumnLayout {
     }
 
     ColumnLayout {
+        Layout.bottomMargin: rowSpacing
 
         Label {
-            Layout.fillWidth: true
             Layout.topMargin: 20
             fontSize: 14
-            text: qsTr("Wallet name")
-                  + translationManager.emptyString
+            text:  qsTr("Wallet name")
+                   + translationManager.emptyString
         }
 
         LineEdit {
             id: accountName
             Layout.fillWidth: true
+            Layout.maximumWidth: 600
+            Layout.minimumWidth: 200
             text: defaultAccountName
             onTextUpdated: checkNextButton()
         }
@@ -146,6 +145,7 @@ ColumnLayout {
 
     RowLayout{
         visible: recoverMode
+        spacing: 0
         StandardButton {
             id: recoverFromSeedButton
             text: qsTr("Restore from seed") + translationManager.emptyString
@@ -182,31 +182,39 @@ ColumnLayout {
         WizardMemoTextInput {
             id : memoTextItem
             Layout.fillWidth: true
-            Layout.preferredWidth: 600
-            Layout.minimumWidth: 300
+            Layout.maximumWidth: 600
+            Layout.minimumWidth: 200
         }
     }
 
     // Recover from keys
     GridLayout {
+        Layout.bottomMargin: page.rowSpacing
+        rowSpacing: page.rowSpacing
         id: recoverFromKeys
         visible: recoverMode && !recoverFromSeedMode
         columns: 1
         LineEdit {
             Layout.fillWidth: true
             id: addressLine
+            Layout.maximumWidth: 600
+            Layout.minimumWidth: 200
             placeholderText: qsTr("Account address (public)")
             onTextUpdated: checkNextButton()
         }
         LineEdit {
             Layout.fillWidth: true
             id: viewKeyLine
+            Layout.maximumWidth: 600
+            Layout.minimumWidth: 200
             placeholderText: qsTr("View key (private)")
             onTextUpdated: checkNextButton()
 
         }
         LineEdit {
             Layout.fillWidth: true
+            Layout.maximumWidth: 600
+            Layout.minimumWidth: 200
             id: spendKeyLine
             placeholderText: qsTr("Spend key (private)")
             onTextUpdated: checkNextButton()
@@ -225,12 +233,14 @@ ColumnLayout {
             color: "#4A4646"
         }
     }
-
+    
+    // Restore Height
     RowLayout {
-        // Restore Height
+        visible: restoreHeightItem.visible // Prevents empty RowLayout bug
         LineEdit {
             id: restoreHeightItem
-            Layout.preferredWidth: 250
+            Layout.maximumWidth: 600
+            Layout.minimumWidth: 200
             placeholderText: qsTr("Restore height (optional)")
             validator: IntValidator {
                 bottom:0
@@ -238,8 +248,8 @@ ColumnLayout {
         }
     }
 
+    // Wallet store location
     ColumnLayout {
-
         Label {
             Layout.fillWidth: true
             Layout.topMargin: 20
@@ -250,8 +260,11 @@ ColumnLayout {
 
         LineEdit {
             Layout.fillWidth: true
+            Layout.maximumWidth: 600
+            Layout.minimumWidth: 200
             id: fileUrlInput
             text: moneroAccountsDir + "/"
+
             // workaround for the bug "filechooser only opens once"
             MouseArea {
                 anchors.fill: parent