fix: fix PopupModal to not show a footer at all if there is no children

2025-02-10 13:46:35 +00:00 · 2021-01-13 14:15:52 -05:00 · 2021-01-13 14:15:52 -05:00 · e459d4dbd4
commit e459d4dbd4
parent 39d72c5f79
21 changed files with 55 additions and 61 deletions
--- a/ui/app/AppLayouts/Browser/AddFavoriteModal.qml
+++ b/ui/app/AppLayouts/Browser/AddFavoriteModal.qml
@ -102,7 +102,7 @@ ModalPopup {

    footer: Item {
        width: parent.width
-        height: parent.height
+        height: removeBtn.height

        StatusButton {
            id: removeBtn
--- a/ui/app/AppLayouts/Browser/JSDialogWindow.qml
+++ b/ui/app/AppLayouts/Browser/JSDialogWindow.qml
@ -51,10 +51,8 @@ ModalPopup {
    }

    footer: Item {
-        anchors.top: parent.bottom
-        anchors.right: parent.right
-        anchors.bottom: root.bottom
-        anchors.left: parent.left
+        width: parent.width
+        height: okButton.height

        StyledButton {
            id: okButton
--- a/ui/app/AppLayouts/Browser/SignMessageModal.qml
+++ b/ui/app/AppLayouts/Browser/SignMessageModal.qml
@ -192,9 +192,8 @@ ModalPopup {


    footer: Item {
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
+        width: parent.width
+        height: btnReject.height

        StatusButton {
            id: btnReject
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandModal.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandModal.qml
@ -122,9 +122,9 @@ ModalPopup {
    }

    footer: Item {
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
+        width: parent.width
+        height: btnNext.height
+
        StatusRoundButton {
            id: btnBack
            anchors.left: parent.left
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/SignTransactionModal.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/SignTransactionModal.qml
@ -227,9 +227,9 @@ ModalPopup {
    }

    footer: Item {
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
+        width: parent.width
+        height: btnNext.height
+
        StatusRoundButton {
            id: btnBack
            anchors.left: parent.left
--- a/ui/app/AppLayouts/Chat/CommunityComponents/CommunitiesPopup.qml
+++ b/ui/app/AppLayouts/Chat/CommunityComponents/CommunitiesPopup.qml
@ -127,9 +127,11 @@ ModalPopup {
    }

    footer: Item {
-        anchors.fill: parent
+        width: parent.width
+        height: importBtn.height

        StatusButton {
+            id: importBtn
            text: qsTr("Import a community")
            anchors.right: createBtn.left
            anchors.rightMargin: Style.current.smallPadding
--- a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityDetailPopup.qml
+++ b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityDetailPopup.qml
@ -140,7 +140,8 @@ ModalPopup {
    }

    footer: Item {
-        anchors.fill: parent
+        width: parent.width
+        height: backButton.height

        StatusIconButton {
            id: backButton
--- a/ui/app/AppLayouts/Chat/CommunityComponents/InviteFriendsToCommunityPopup.qml
+++ b/ui/app/AppLayouts/Chat/CommunityComponents/InviteFriendsToCommunityPopup.qml
@ -86,7 +86,8 @@ ModalPopup {
    }

    footer: Item {
-        anchors.fill: parent
+        width: parent.width
+        height: inviteBtn.height

        StatusRoundButton {
            id: btnBack
--- a/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml
@ -136,10 +136,8 @@ ModalPopup {
    }

    footer: Item {
-        anchors.top: parent.bottom
-        anchors.right: parent.right
-        anchors.bottom: popup.bottom
-        anchors.left: parent.left
+        width: parent.width
+        height: btnSelectMembers.height

        Button {
            id: btnSelectMembers
--- a/ui/app/AppLayouts/Profile/Sections/ChangeProfilePicModal.qml
+++ b/ui/app/AppLayouts/Profile/Sections/ChangeProfilePicModal.qml
@ -101,7 +101,8 @@ ModalPopup {
    }

    footer: Item {
-        anchors.fill:parent
+        width: parent.width
+        height: uploadBtn.height

        StatusButton {
            visible: profileModel.profile.hasIdentityImage
--- a/ui/app/AppLayouts/Profile/Sections/Ens/ENSPopup.qml
+++ b/ui/app/AppLayouts/Profile/Sections/Ens/ENSPopup.qml
@ -85,10 +85,8 @@ ModalPopup {
    }
    
    footer: Item {
-        anchors.top: parent.bottom
-        anchors.right: parent.right
-        anchors.bottom: popup.bottom
-        anchors.left: parent.left
+        width: parent.width
+        height: btnSelectPreferred.height

        Button {
            id: btnSelectPreferred
--- a/ui/app/AppLayouts/Profile/Sections/Ens/RegisterENSModal.qml
+++ b/ui/app/AppLayouts/Profile/Sections/Ens/RegisterENSModal.qml
@ -149,9 +149,8 @@ ModalPopup {
    }

    footer: Item {
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
+        width: parent.width
+        height: btnNext.height
        
        StatusButton {
            id: btnNext
--- a/ui/app/AppLayouts/Profile/Sections/Ens/SetPubKeyModal.qml
+++ b/ui/app/AppLayouts/Profile/Sections/Ens/SetPubKeyModal.qml
@ -153,9 +153,8 @@ ModalPopup {
    }

    footer: Item {
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
+        width: parent.width
+        height: btnNext.height
        
        StyledButton {
            id: btnNext
--- a/ui/app/AppLayouts/Wallet/AccountSettingsModal.qml
+++ b/ui/app/AppLayouts/Wallet/AccountSettingsModal.qml
@ -105,7 +105,9 @@ ModalPopup {
    }

    footer: Item {
-        anchors.fill: parent
+        width: parent.width
+        height: saveBtn.height
+
        StyledButton {
            visible:  currentAccount.walletType === Constants.watchWalletType
            anchors.top: parent.top
--- a/ui/app/AppLayouts/Wallet/AddCustomTokenModal.qml
+++ b/ui/app/AppLayouts/Wallet/AddCustomTokenModal.qml
@ -131,8 +131,10 @@ ModalPopup {
    }
    
    footer: Item {
+        width: parent.width
+        height: addBtn.height
        visible: editable
-        anchors.fill: parent
+
        StyledButton {
            id: addBtn
            anchors.top: parent.top
--- a/ui/app/AppLayouts/Wallet/SendModal.qml
+++ b/ui/app/AppLayouts/Wallet/SendModal.qml
@ -181,9 +181,9 @@ ModalPopup {
    }

    footer: Item {
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
+        width: parent.width
+        height: btnNext.height
+
        StatusRoundButton {
            id: btnBack
            anchors.left: parent.left
--- a/ui/app/AppLayouts/Wallet/SignPhraseModal.qml
+++ b/ui/app/AppLayouts/Wallet/SignPhraseModal.qml
@ -75,9 +75,8 @@ ModalPopup {
    }

    footer: Item {
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
+        width: parent.width
+        height: btnRemindLater.height
        
        StatusButton {
            anchors.right: btnRemindLater.left
--- a/ui/onboarding/CreatePasswordModal.qml
+++ b/ui/onboarding/CreatePasswordModal.qml
@ -92,10 +92,8 @@ ModalPopup {
    }

    footer: Item {
-        anchors.top: parent.bottom
-        anchors.right: parent.right
-        anchors.bottom: popup.bottom
-        anchors.left: parent.left
+        width: parent.width
+        height: submitBtn.height

        StatusButton {
            id: submitBtn
--- a/ui/onboarding/MnemonicRecoverySuccessModal.qml
+++ b/ui/onboarding/MnemonicRecoverySuccessModal.qml
@ -56,12 +56,11 @@ ModalPopup {
    }

    footer: Item {
-        anchors.top: parent.bottom
-        anchors.right: parent.right
-        anchors.bottom: popup.bottom
-        anchors.left: parent.left
+        width: parent.width
+        height: reencryptBtn.height

        StatusButton {
+            id: reencryptBtn
            anchors.bottom: parent.bottom
            anchors.topMargin: Style.current.padding
            anchors.right: parent.right
--- a/ui/shared/ModalPopup.qml
+++ b/ui/shared/ModalPopup.qml
@ -126,24 +126,22 @@ Popup {

        Separator {
            id: separator2
-            visible: !!footerContent.children[0]
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 75
+            visible: footerContent.visible
+            anchors.bottom: footerContent.top
+            anchors.bottomMargin: visible ? Style.current.padding : 0
        }

        Item {
            id: footerContent
-            visible: !!children[0]
-            height: children[0] && children[0].height
+            visible: children.length > 0
+            height: visible ? children[0] && children[0].height : 0
            width: parent.width
-            anchors.top: separator2.bottom
            anchors.left: parent.left
            anchors.right: parent.right
            anchors.bottom: parent.bottom
-            anchors.topMargin: Style.current.padding
-            anchors.bottomMargin: Style.current.padding
-            anchors.rightMargin: Style.current.padding
-            anchors.leftMargin: Style.current.padding
+            anchors.bottomMargin: visible ? Style.current.padding : 0
+            anchors.rightMargin: visible ? Style.current.padding : 0
+            anchors.leftMargin: visible ? Style.current.padding : 0
        }
  }
 }
--- a/ui/shared/status/StatusStickerPackPurchaseModal.qml
+++ b/ui/shared/status/StatusStickerPackPurchaseModal.qml
@ -165,9 +165,9 @@ ModalPopup {
    }

    footer: Item {
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
+        width: parent.width
+        height: btnNext.height
+
        StatusRoundButton {
            id: btnBack
            anchors.left: parent.left