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

feat(communities): re-enabled open membership communities 

Closes #3410.

Re-enables open membership communities, with necessary changes in the Inivitation Bubble for one-on-one chats.

fix: add/edit communities components not appearing
On add/edit community popup load, some components below the thumbnail image picker were not appearing until the app window was resized. Removing the height of the ScrollView fixed the issue (on mac).

NOTE: this may require windows and linux users to test.
This commit is contained in:
Eric Mastro 2021-09-14 16:01:43 +10:00 committed by Iuri Matias
parent 9854a49a44
commit e42b1d249e
3 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/InvitationBubble.qml
View File

@ -132,7 +132,9 @@ Item {
},
State {
name: "joined"
when: invitedCommunity.joined && invitedCommunity.isMember
when: (invitedCommunity.joined && invitedCommunity.isMember) ||
(invitedCommunity.access === Constants.communityChatPublicAccess &&
invitedCommunity.joined)
PropertyChanges {
target: joinBtn
//% "View"
@ -153,8 +155,10 @@ Item {
},
State {
name: "unjoined"
when: invitedCommunity.access === Constants.communityChatOnRequestAccess &&
invitedCommunity.isMember
when: (invitedCommunity.access === Constants.communityChatOnRequestAccess &&
invitedCommunity.isMember) ||
(invitedCommunity.access === Constants.communityChatPublicAccess &&
!invitedCommunity.joined)
PropertyChanges {
target: joinBtn
//% "Join"

12
ui/app/AppLayouts/Chat/CommunityComponents/CreateCommunityPopup.qml
View File

@ -23,6 +23,7 @@ StatusModal {
| Utils.Validate.TextHexColor
id: popup
height: 509
onOpened: {
if (isEdit) {
@ -65,7 +66,6 @@ StatusModal {
contentHeight: content.height
bottomPadding: 8
height: Math.min(content.height, 432)
width: popup.width
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
@ -79,6 +79,7 @@ StatusModal {
Column {
id: content
width: popup.width
spacing: 8
Item {
height: 8
@ -87,6 +88,7 @@ StatusModal {
StatusInput {
id: nameInput
label: qsTr("Name your community")
charLimit: maxCommunityNameLength
input.placeholderText: qsTr("A catchy name")
validators: [StatusMinLengthValidator {
@ -292,8 +294,6 @@ StatusModal {
visible: !isEdit
//% "Membership requirement"
title: qsTrId("membership-title")
// TODO: remove 'isEnabled: false' when we no longer need to force "request access" membership
enabled: false
label: {
switch (membershipRequirementSettingPopup.checkedMembership) {
//% "Require invite from another member"
@ -315,8 +315,7 @@ StatusModal {
}
StatusBaseText {
// TODO: remove 'false' when we no longer need to force "request access" membership
visible: false && !isEdit
visible: !isEdit
height: visible ? implicitHeight : 0
wrapMode: Text.WordWrap
font.pixelSize: 13
@ -455,9 +454,6 @@ StatusModal {
MembershipRequirementPopup {
anchors.centerIn: parent
id: membershipRequirementSettingPopup
// TODO: remove the 'checkedMemership' setting when we no longer need
// to force "require approval" membership
checkedMembership: Constants.communityChatOnRequestAccess
}
}

38
ui/app/AppLayouts/Chat/CommunityComponents/MembershipRequirementPopup.qml
View File

@ -60,24 +60,26 @@ StatusModal {
anchors.leftMargin: 32
}
StatusListItem {
anchors.horizontalCenter: parent.horizontalCenter
//% "Require invite from another member"
title: qsTrId("membership-invite")
sensor.onClicked: inviteOnlyRadio.checked = true
components: [
StatusRadioButton {
id: inviteOnlyRadio
checked: popup.checkedMembership === Constants.communityChatInvitationOnlyAccess
ButtonGroup.group: membershipRequirementGroup
onCheckedChanged: {
if (checked) {
popup.checkedMembership = Constants.communityChatInvitationOnlyAccess
}
}
}
]
}
// TODO: uncomment this when we want to re-enable requiring invite from another member
// for community creation
// StatusListItem {
// anchors.horizontalCenter: parent.horizontalCenter
// //% "Require invite from another member"
// title: qsTrId("membership-invite")
// sensor.onClicked: inviteOnlyRadio.checked = true
// components: [
// StatusRadioButton {
// id: inviteOnlyRadio
// checked: popup.checkedMembership === Constants.communityChatInvitationOnlyAccess
// ButtonGroup.group: membershipRequirementGroup
// onCheckedChanged: {
// if (checked) {
// popup.checkedMembership = Constants.communityChatInvitationOnlyAccess
// }
// }
// }
// ]
// }
StatusBaseText {
wrapMode: Text.WordWrap