mobile: allow hiding profile when SimpleX lock is disabled (#2586)

This commit is contained in:
Evgeny Poberezkin authored and GitHub committed 2023-06-17 09:58:35 +01:00
1 parent 6d3cb0ea2e
commit e7089d4c2f
23 files changed
+94 -75

No files matched your search

@@ -38,14 +38,13 @@ fun UserProfilesView(m: ChatModel, search: MutableState<String>, profileHidden:
val searchTextOrPassword = rememberSaveable { search }
val users by remember { derivedStateOf { m.users.map { it.user } } }
val filteredUsers by remember { derivedStateOf { filteredUsers(m, searchTextOrPassword.value) } }
UserProfilesView(
UserProfilesLayout(
users = users,
filteredUsers = filteredUsers,
profileHidden = profileHidden,
searchTextOrPassword = searchTextOrPassword,
showHiddenProfilesNotice = m.controller.appPrefs.showHiddenProfilesNotice,
visibleUsersCount = visibleUsersCount(m),
prefPerformLA = m.controller.appPrefs.performLA.get(),
addUser = {
ModalManager.shared.showModalCloseable { close ->
CreateProfile(m, close)
@@ -137,13 +136,12 @@ fun UserProfilesView(m: ChatModel, search: MutableState<String>, profileHidden:
}
@Composable
private fun UserProfilesView(
private fun UserProfilesLayout(
users: List<User>,
filteredUsers: List<User>,
searchTextOrPassword: MutableState<String>,
profileHidden: MutableState<Boolean>,
visibleUsersCount: Int,
prefPerformLA: Boolean,
showHiddenProfilesNotice: SharedPreference<Boolean>,
addUser: () -> Unit,
activateUser: (User) -> Unit,
@@ -171,7 +169,7 @@ private fun UserProfilesView(
SectionView {
for (user in filteredUsers) {
UserView(user, users, visibleUsersCount, prefPerformLA, activateUser, removeUser, unhideUser, muteUser, unmuteUser, showHiddenProfile)
UserView(user, users, visibleUsersCount, activateUser, removeUser, unhideUser, muteUser, unmuteUser, showHiddenProfile)
SectionDivider()
}
if (searchTextOrPassword.value.trim().isEmpty()) {
@@ -205,7 +203,6 @@ private fun UserView(
user: User,
users: List<User>,
visibleUsersCount: Int,
prefPerformLA: Boolean,
activateUser: (User) -> Unit,
removeUser: (User) -> Unit,
unhideUser: (User) -> Unit,
@@ -225,7 +222,7 @@ private fun UserView(
unhideUser(user)
})
} else {
if (visibleUsersCount > 1 && prefPerformLA) {
if (visibleUsersCount > 1) {
ItemAction(stringResource(R.string.user_hide), painterResource(R.drawable.ic_lock), onClick = {
showMenu.value = false
showHiddenProfile(user)