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(Communities): fixed channel color picker dialog 

Closes #9696
This commit is contained in:
Lukáš Tinkl 2023-09-14 15:34:36 +02:00 committed by Lukáš Tinkl
parent 1d644d0b9c
commit a75890d7be
4 changed files with 27 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/StatusQ/src/StatusQ/Popups/StatusModal.qml
View File

@ -142,7 +142,7 @@ StatusDialog {
*/
property alias rightButtons: footerImpl.rightButtons
/*!
\qmlproperty rightButtons
\qmlproperty leftButtons
This property helps user assign the left buttons on the footer.
This doesn't not apply to the advanced footer!
*/

6
ui/app/AppLayouts/Communities/controls/ColorPicker.qml
View File

@ -13,15 +13,17 @@ ColumnLayout {
id: root
property color color: Theme.palette.primaryColor1
property string title: qsTr("Community colour")
signal pick()
spacing: 8
implicitHeight: childrenRect.height
StatusBaseText {
text: qsTr("Community colour")
font.pixelSize: 15
Layout.fillWidth: true
text: root.title
}
StatusPickerButton {

3
ui/app/AppLayouts/Communities/panels/ColorPanel.qml
View File

@ -13,10 +13,11 @@ StatusScrollView {
id: root
property string title: qsTr("Community Colour")
property string buttonText: qsTr("Select Community Colour")
property var rightButtons: StatusButton {
objectName: "communityColorPanelSelectColorButton"
text: qsTr("Select Community Colour")
text: root.buttonText
onClicked: root.accepted()
enabled: hexInput.valid
}

65
ui/app/AppLayouts/Communities/popups/CreateChannelPopup.qml
View File

@ -16,6 +16,7 @@ import StatusQ.Components 0.1
import StatusQ.Popups 0.1
import AppLayouts.Communities.controls 1.0
import AppLayouts.Communities.panels 1.0
StatusStackModal {
id: root
@ -150,7 +151,7 @@ StatusStackModal {
readonly property StatusButton deleteChannelButton: StatusButton {
objectName: "deleteCommunityChannelBtn"
visible: isEdit && isDeleteable && !isDiscordImport
visible: isEdit && isDeleteable && !isDiscordImport && typeof(replaceItem) === "undefined"
text: qsTr("Delete channel")
type: StatusBaseButton.Type.Danger
onClicked: root.deleteCommunityChannel()
@ -555,56 +556,30 @@ StatusStackModal {
Layout.fillWidth: true
}
StatusBaseText {
ColorPicker {
id: colorDialog
Layout.fillWidth: true
text: qsTr("Channel colour")
}
title: qsTr("Channel colour")
color: root.isEdit && root.channelColor ? root.channelColor : Theme.palette.primaryColor1
onPick: root.replace(colorPanel)
Item {
Layout.preferredHeight: 8
Layout.fillWidth: true
}
Item {
height: colorSelectorButton.height + 16
Layout.fillWidth: true
StatusPickerButton {
id: colorSelectorButton
property string validationError: ""
width: parent.width
bgColor: colorDialog.colorSelected ? colorDialog.color : Theme.palette.baseColor2
contentColor: colorDialog.colorSelected ? Theme.palette.white : Theme.palette.baseColor1
text: colorDialog.colorSelected ? colorDialog.color.toString().toUpperCase() : qsTr("Pick a colour")
onClicked: colorDialog.open()
onTextChanged: {
if (colorDialog.colorSelected) {
validationError = Utils.validateAndReturnError(text, communityColorValidator)
Component {
id: colorPanel
ColorPanel {
title: qsTr("Channel colour")
buttonText: qsTr("Select Colour")
Component.onCompleted: color = colorDialog.color
onAccepted: {
colorDialog.color = color
root.replaceItem = undefined
}
}
}
}
StatusColorDialog {
id: colorDialog
anchors.centerIn: parent
property bool colorSelected: root.isEdit && root.channelColor
headerSettings.title: qsTr("Channel Colour")
standardColors: Theme.palette.communityColorsArray
color: root.isEdit && root.channelColor ? root.channelColor : Theme.palette.primaryColor1
onAccepted: colorSelected = true
}
StatusBaseText {
text: colorSelectorButton.validationError
visible: !!text
color: Theme.palette.dangerColor1
anchors.top: colorSelectorButton.bottom
anchors.topMargin: 4
anchors.right: colorSelectorButton.right
}
Item {
Layout.preferredHeight: 16
Layout.fillWidth: true
}
StatusInput {