diff --git a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopup.qml b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopup.qml index 9d5215754a..fb6aa1c544 100644 --- a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopup.qml +++ b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopup.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.12 import QtQuick.Dialogs 1.3 import QtQuick.Layouts 1.13 import QtGraphicalEffects 1.13 +import QtQuick.Controls.Universal 2.12 import "../../../../imports" import "../../../../shared" import "../../../../shared/status" @@ -150,6 +151,7 @@ ModalPopup { icon.width: 20 icon.height: 16 rotation: 180 + type: globalSettings.theme === Universal.Dark ? "secondary" : "primary" onClicked: { stack.pop() } diff --git a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopupMembersList.qml b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopupMembersList.qml index aa6f20bcae..b17eafed86 100644 --- a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopupMembersList.qml +++ b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopupMembersList.qml @@ -1,6 +1,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 +import QtQuick.Controls.Universal 2.12 import "../../../../imports" import "../../../../shared" import "../../../../shared/status" @@ -18,6 +19,7 @@ Item { //% "Invite People" label: qsTrId("invite-people") width: parent.width + type: globalSettings.theme === Universal.Dark ? "secondary" : "primary" iconName: "invite" onClicked: openPopup(inviteFriendsToCommunityPopup) } diff --git a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopupOverview.qml b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopupOverview.qml index 265ae459d0..734c6c0d7f 100644 --- a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopupOverview.qml +++ b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopupOverview.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.12 import QtQuick.Dialogs 1.3 import QtQuick.Layouts 1.13 import QtGraphicalEffects 1.13 +import QtQuick.Controls.Universal 2.12 import "../../../../imports" import "../../../../shared" import "../../../../shared/status" @@ -63,7 +64,6 @@ Item { width: parent.width Loader { - active: isAdmin width: parent.width sourceComponent: Component { CommunityPopupButton { @@ -72,6 +72,7 @@ Item { iconName: "members" txtColor: Style.current.textColor onClicked: stack.push(membersList) + type: globalSettings.theme === Universal.Dark ? "secondary" : "primary" Item { property int nbRequests: chatsModel.communities.activeCommunity.communityMembershipRequests.nbRequests @@ -164,6 +165,7 @@ Item { iconName: "notifications" width: parent.width txtColor: Style.current.textColor + type: globalSettings.theme === Universal.Dark ? "secondary" : "primary" onClicked: function(){ notificationSwitch.checked = !notificationSwitch.checked } @@ -216,6 +218,7 @@ Item { sourceComponent: CommunityPopupButton { label: qsTr("Transfer ownership") iconName: "../transfer" + type: globalSettings.theme === Universal.Dark ? "secondary" : "primary" onClicked: { const exportResult = chatsModel.communities.exportComumnity() openPopup(transferOwnershipPopup, {privateKey: exportResult}) @@ -232,10 +235,13 @@ Item { //% "Leave community" label: qsTrId("leave-community") iconName: "leave" + type: globalSettings.theme === Universal.Dark ? "secondary" : "primary" } Loader { - active: isAdmin + // TODO(pascal): reactivate with `isAdmin` once delete functionality + // is actually implemented + active: false width: parent.width sourceComponent: CommunityPopupButton { id: deleteBtn