highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-03-26 01:31:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove focus from status text field when closing the drawer

Browse Source
This commit is contained in:
greenart7c3 2024-07-22 14:45:39 -03:00
parent a636f4a786
commit e166c36731
No known key found for this signature in database
GPG Key ID: 885822EED3A26A6D
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt
View File

@ -136,7 +136,9 @@ fun DrawerContent(
drawerTonalElevation = 0.dp,
) {
Column(
Modifier.fillMaxHeight().verticalScroll(rememberScrollState()),
Modifier
.fillMaxHeight()
.verticalScroll(rememberScrollState()),
) {
ProfileContent(
baseAccountUser = accountViewModel.account.userProfile(),
@ -146,7 +148,7 @@ fun DrawerContent(
)
Column(drawerSpacing) {
EditStatusBoxes(accountViewModel.account.userProfile(), accountViewModel)
EditStatusBoxes(accountViewModel.account.userProfile(), accountViewModel, drawerState)
}
FollowingAndFollowerCounts(accountViewModel.account.userProfile(), onClickUser)
@ -263,15 +265,16 @@ fun ProfileContentTemplate(
private fun EditStatusBoxes(
baseAccountUser: User,
accountViewModel: AccountViewModel,
drawerState: DrawerState,
) {
LoadStatuses(user = baseAccountUser, accountViewModel) { statuses ->
if (statuses.isEmpty()) {
StatusEditBar(accountViewModel = accountViewModel)
StatusEditBar(accountViewModel = accountViewModel, drawerState = drawerState)
} else {
statuses.forEach {
val originalStatus by it.live().content.observeAsState()
StatusEditBar(originalStatus, it.address, accountViewModel)
StatusEditBar(originalStatus, it.address, accountViewModel, drawerState = drawerState)
}
}
}
@ -282,11 +285,17 @@ fun StatusEditBar(
savedStatus: String? = null,
tag: ATag? = null,
accountViewModel: AccountViewModel,
drawerState: DrawerState,
) {
val focusManager = LocalFocusManager.current
val currentStatus = remember { mutableStateOf(savedStatus ?: "") }
val hasChanged = remember { derivedStateOf { currentStatus.value != (savedStatus ?: "") } }
LaunchedEffect(drawerState.isClosed) {
if (drawerState.isClosed) {
focusManager.clearFocus(true)
}
}
OutlinedTextField(
value = currentStatus.value,