Adds on click to the UserProfile selections
This commit is contained in:
+6
@@ -120,6 +120,9 @@ fun FollowListAndPackAndUserView(
|
|||||||
},
|
},
|
||||||
privateMemberSize = list.privateMembers.size,
|
privateMemberSize = list.privateMembers.size,
|
||||||
publicMemberSize = list.publicMembers.size,
|
publicMemberSize = list.publicMembers.size,
|
||||||
|
onClick = {
|
||||||
|
nav.nav(Route.MyPeopleListView(list.identifierTag))
|
||||||
|
},
|
||||||
onAddUserToList = { userShouldBePrivate ->
|
onAddUserToList = { userShouldBePrivate ->
|
||||||
accountViewModel.launchSigner {
|
accountViewModel.launchSigner {
|
||||||
accountViewModel.account.peopleLists.addUserToSet(
|
accountViewModel.account.peopleLists.addUserToSet(
|
||||||
@@ -165,6 +168,9 @@ fun FollowListAndPackAndUserView(
|
|||||||
listHeader = list.title,
|
listHeader = list.title,
|
||||||
userName = userName,
|
userName = userName,
|
||||||
isMember = list.publicMembers.contains(userToAddOrRemove),
|
isMember = list.publicMembers.contains(userToAddOrRemove),
|
||||||
|
onClick = {
|
||||||
|
nav.nav(Route.MyFollowPackView(list.identifierTag))
|
||||||
|
},
|
||||||
onRemoveUser = {
|
onRemoveUser = {
|
||||||
accountViewModel.launchSigner {
|
accountViewModel.launchSigner {
|
||||||
accountViewModel.account.followLists.removeUserFromSet(
|
accountViewModel.account.followLists.removeUserFromSet(
|
||||||
|
|||||||
+5
-1
@@ -21,6 +21,7 @@
|
|||||||
package com.vitorpamplona.amethyst.ui.screen.loggedIn.lists.memberEdit
|
package com.vitorpamplona.amethyst.ui.screen.loggedIn.lists.memberEdit
|
||||||
|
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
@@ -63,6 +64,7 @@ fun FollowPackAndUserMemberPreview() {
|
|||||||
isMember = true,
|
isMember = true,
|
||||||
memberSize = 2,
|
memberSize = 2,
|
||||||
onAddUserToList = {},
|
onAddUserToList = {},
|
||||||
|
onClick = {},
|
||||||
onRemoveUser = {},
|
onRemoveUser = {},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -79,6 +81,7 @@ fun FollowPackAndUserNotMemberPreview() {
|
|||||||
isMember = false,
|
isMember = false,
|
||||||
memberSize = 2,
|
memberSize = 2,
|
||||||
onAddUserToList = {},
|
onAddUserToList = {},
|
||||||
|
onClick = {},
|
||||||
onRemoveUser = {},
|
onRemoveUser = {},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -91,11 +94,12 @@ fun FollowPackAndUserItem(
|
|||||||
userName: String,
|
userName: String,
|
||||||
isMember: Boolean,
|
isMember: Boolean,
|
||||||
memberSize: Int,
|
memberSize: Int,
|
||||||
|
onClick: () -> Unit,
|
||||||
onAddUserToList: () -> Unit,
|
onAddUserToList: () -> Unit,
|
||||||
onRemoveUser: () -> Unit,
|
onRemoveUser: () -> Unit,
|
||||||
) {
|
) {
|
||||||
ListItem(
|
ListItem(
|
||||||
modifier = modifier,
|
modifier = modifier.clickable(onClick = onClick),
|
||||||
headlineContent = {
|
headlineContent = {
|
||||||
Text(
|
Text(
|
||||||
text = listHeader,
|
text = listHeader,
|
||||||
|
|||||||
+5
-1
@@ -21,6 +21,7 @@
|
|||||||
package com.vitorpamplona.amethyst.ui.screen.loggedIn.lists.memberEdit
|
package com.vitorpamplona.amethyst.ui.screen.loggedIn.lists.memberEdit
|
||||||
|
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
@@ -70,6 +71,7 @@ fun PeopleListAndUserMemberPreview() {
|
|||||||
privateMemberSize = 3,
|
privateMemberSize = 3,
|
||||||
publicMemberSize = 2,
|
publicMemberSize = 2,
|
||||||
onAddUserToList = {},
|
onAddUserToList = {},
|
||||||
|
onClick = {},
|
||||||
onRemoveUser = {},
|
onRemoveUser = {},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -88,6 +90,7 @@ fun PeopleListAndUserNotMemberPreview() {
|
|||||||
privateMemberSize = 3,
|
privateMemberSize = 3,
|
||||||
publicMemberSize = 2,
|
publicMemberSize = 2,
|
||||||
onAddUserToList = {},
|
onAddUserToList = {},
|
||||||
|
onClick = {},
|
||||||
onRemoveUser = {},
|
onRemoveUser = {},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -102,11 +105,12 @@ fun PeopleListAndUserItem(
|
|||||||
userIsPublicMember: Boolean,
|
userIsPublicMember: Boolean,
|
||||||
publicMemberSize: Int,
|
publicMemberSize: Int,
|
||||||
privateMemberSize: Int,
|
privateMemberSize: Int,
|
||||||
|
onClick: () -> Unit,
|
||||||
onAddUserToList: (shouldBePrivateMember: Boolean) -> Unit,
|
onAddUserToList: (shouldBePrivateMember: Boolean) -> Unit,
|
||||||
onRemoveUser: () -> Unit,
|
onRemoveUser: () -> Unit,
|
||||||
) {
|
) {
|
||||||
ListItem(
|
ListItem(
|
||||||
modifier = modifier,
|
modifier = modifier.clickable(onClick = onClick),
|
||||||
headlineContent = {
|
headlineContent = {
|
||||||
Text(
|
Text(
|
||||||
text = listHeader,
|
text = listHeader,
|
||||||
|
|||||||
Reference in New Issue
Block a user