status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(CommunityNewPermissionView): proper color of icons in "Is allowed to" section 

Closes: #9280
This commit is contained in:
Michał Cieślak 2023-03-21 12:15:42 +01:00 committed by Michał
parent 9c1053c61a
commit 083bea0954
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/StatusQ/src/StatusQ/Components/StatusItemSelector.qml
View File

@ -154,7 +154,7 @@ StatusFlowSelector {
asset.isLetterIdenticon: root.useLetterIdenticons asset.isLetterIdenticon: root.useLetterIdenticons
closeButtonVisible: false closeButtonVisible: false
titleText.color: Theme.palette.primaryColor1 titleText.color: Theme.palette.primaryColor1
titleText.font.pixelSize: 15 titleText.font.pixelSize: Theme.primaryTextFontSize
leftPadding: root.tagLeftPadding leftPadding: root.tagLeftPadding
MouseArea { MouseArea {

57
ui/app/AppLayouts/Chat/views/communities/CommunityNewPermissionView.qml
View File

@ -335,29 +335,48 @@ StatusScrollView {
Layout.preferredHeight: 24 Layout.preferredHeight: 24
color: Style.current.separator color: Style.current.separator
} }
StatusItemSelector { StatusFlowSelector {
id: permissionsSelector id: permissionsSelector
Layout.fillWidth: true Layout.fillWidth: true
icon: Style.svg("profile/security")
iconSize: 24
useIcons: true
title: qsTr("Is allowed to") title: qsTr("Is allowed to")
placeholderText: qsTr("Example: View and post") placeholderText: qsTr("Example: View and post")
icon: Style.svg("profile/security")
QtObject { readonly property bool empty:
id: permissionItemModelData d.dirtyValues.permissionType === PermissionTypes.Type.None
placeholderItem.visible: empty
addButton.visible: empty
StatusListItemTag {
readonly property int key: d.dirtyValues.permissionType readonly property int key: d.dirtyValues.permissionType
readonly property string text: PermissionTypes.getName(key)
readonly property string imageSource: PermissionTypes.getIcon(key) title: PermissionTypes.getName(key)
visible: !permissionsSelector.empty
asset.name: PermissionTypes.getIcon(key)
asset.bgColor: "transparent"
closeButtonVisible: false
titleText.color: Theme.palette.primaryColor1
titleText.font.pixelSize: Theme.primaryTextFontSize
leftPadding: 6
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
permissionsDropdown.mode = PermissionsDropdown.Mode.Update
permissionsDropdown.parent = parent
permissionsDropdown.x = mouse.x + d.dropdownHorizontalOffset
permissionsDropdown.y = d.dropdownVerticalOffset
permissionsDropdown.open()
}
}
} }
model: d.dirtyValues.permissionType !== PermissionTypes.Type.None
? permissionItemModelData : null
addButton.visible: d.dirtyValues.permissionType === PermissionTypes.Type.None
PermissionsDropdown { PermissionsDropdown {
id: permissionsDropdown id: permissionsDropdown
@ -383,17 +402,6 @@ StatusScrollView {
permissionsDropdown.y = 0 permissionsDropdown.y = 0
permissionsDropdown.open() permissionsDropdown.open()
} }
onItemClicked: {
if (mouse.button !== Qt.LeftButton)
return
permissionsDropdown.mode = PermissionsDropdown.Mode.Update
permissionsDropdown.parent = item
permissionsDropdown.x = mouse.x + d.dropdownHorizontalOffset
permissionsDropdown.y = d.dropdownVerticalOffset
permissionsDropdown.open()
}
} }
Rectangle { Rectangle {
Layout.leftMargin: 16 Layout.leftMargin: 16
@ -411,7 +419,6 @@ StatusScrollView {
Layout.fillWidth: true Layout.fillWidth: true
icon: d.isCommunityPermission ? Style.svg("communities") : Style.svg("create-category") icon: d.isCommunityPermission ? Style.svg("communities") : Style.svg("create-category")
iconSize: 24
title: qsTr("In") title: qsTr("In")
placeholderText: qsTr("Example: `#general` channel") placeholderText: qsTr("Example: `#general` channel")