Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-29 13:16:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update various UI for chat folders.

Browse Source
This commit is contained in:
Michelle Tang
2024-10-30 13:56:44 -04:00
committed by GitHub
parent ddcb9564bb
commit fe40324599
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFoldersFragment.kt
View File

@@ -75,7 +75,7 @@ class ChatFoldersFragment : ComposeFragment() {
Scaffolds.Settings(
title = stringResource(id = R.string.ChatsSettingsFragment__chat_folders),
onNavigationClick = { navController.popBackStack() },
onNavigationClick = { requireActivity().onNavigateUp() },
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
) { contentPadding: PaddingValues ->

20
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/CreateFoldersFragment.kt
View File

@@ -82,7 +82,7 @@ class CreateFoldersFragment : ComposeFragment() {
if (viewModel.hasChanges() && !viewModel.hasEmptyName()) {
viewModel.showConfirmationDialog(true)
} else {
findNavController().popBackStack()
requireActivity().onNavigateUp()
}
}
}
@@ -116,7 +116,7 @@ class CreateFoldersFragment : ComposeFragment() {
if (viewModel.hasChanges() && !viewModel.hasEmptyName()) {
viewModel.showConfirmationDialog(true)
} else {
navController.popBackStack()
requireActivity().onNavigateUp()
}
},
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
@@ -142,25 +142,23 @@ class CreateFoldersFragment : ComposeFragment() {
onDeleteClicked = { viewModel.showDeleteDialog(true) },
onDeleteConfirmed = {
viewModel.deleteFolder(requireContext())
navController.popBackStack()
requireActivity().onNavigateUp()
},
onDeleteDismissed = {
viewModel.showDeleteDialog(false)
},
onCreateConfirmed = { shouldExit ->
onCreateConfirmed = {
if (isNewFolder) {
viewModel.createFolder(requireContext())
} else {
viewModel.updateFolder(requireContext())
}
if (shouldExit) {
navController.popBackStack()
}
requireActivity().onNavigateUp()
},
onCreateDismissed = { shouldExit ->
viewModel.showConfirmationDialog(false)
if (shouldExit) {
navController.popBackStack()
requireActivity().onNavigateUp()
}
},
onShowToast = {
@@ -191,7 +189,7 @@ fun CreateFolderScreen(
onDeleteClicked: () -> Unit = {},
onDeleteConfirmed: () -> Unit = {},
onDeleteDismissed: () -> Unit = {},
onCreateConfirmed: (Boolean) -> Unit = {},
onCreateConfirmed: () -> Unit = {},
onCreateDismissed: (Boolean) -> Unit = {},
onShowToast: () -> Unit = {}
) {
@@ -368,7 +366,7 @@ fun CreateFolderScreen(
if (hasChanges && isNewFolder) {
Buttons.MediumTonal(
onClick = { onCreateConfirmed(true) },
onClick = { onCreateConfirmed() },
modifier = modifier
.align(Alignment.BottomEnd)
.padding(end = 16.dp, bottom = 16.dp)
@@ -395,7 +393,7 @@ fun CreateFolderScreen(
if (state.currentFolder.name.isEmpty()) {
onShowToast()
} else {
onCreateConfirmed(true)
onCreateConfirmed()
}
},
modifier = modifier