dandri/simplex-chat
1
0 Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-10-23 15:03:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

android: keep the onboarding cards' size when a keyboard opens over the chat list

Browse Source 
With the one-hand UI the onboarding chat list shares a column with the search bar,
whose keyboard spacer resized the cards whenever any keyboard opened, including the
one New chat › Create group opens over the list. The spacer now follows only the
search field's own keyboard, so the bar still sits above the keyboard while typing.
This commit is contained in:
spacedandy-agents-simplex committed 2026-10-21 14:46:44 +00:00
1 parent 6bf8d350d9
commit d91d7742a4
1 file changed
+10 -7
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt
+10 -7
View File
@@ -863,11 +863,10 @@ private fun openAppLink(rhId: Long?, uri: String) {
}
@Composable
private fun ChatListSearchBar(listState: LazyListState, searchText: MutableState<TextFieldValue>, searchShowingSimplexLink: MutableState<Boolean>, searchChatFilteredBySimplexLink: MutableState<Set<String>>, connectNameCandidate: MutableState<String?>, onlineSearch: OnlineSearchModel) {
private fun ChatListSearchBar(listState: LazyListState, searchText: MutableState<TextFieldValue>, searchShowingSimplexLink: MutableState<Boolean>, searchChatFilteredBySimplexLink: MutableState<Set<String>>, connectNameCandidate: MutableState<String?>, onlineSearch: OnlineSearchModel, focused: MutableState<Boolean>) {
Box {
Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
val focusRequester = remember { FocusRequester() }
var focused by remember { mutableStateOf(false) }
Icon(
painterResource(MR.images.ic_search),
contentDescription = null,
@@ -875,7 +874,7 @@ private fun ChatListSearchBar(listState: LazyListState, searchText: MutableState
tint = MaterialTheme.colors.secondary
)
SearchTextField(
Modifier.weight(1f).onFocusChanged { focused = it.hasFocus }.focusRequester(focusRequester),
Modifier.weight(1f).onFocusChanged { focused.value = it.hasFocus }.focusRequester(focusRequester),
placeholder = stringResource(MR.strings.search_or_paste_simplex_link),
alwaysVisible = true,
searchText = searchText,
@@ -904,7 +903,7 @@ private fun ChatListSearchBar(listState: LazyListState, searchText: MutableState
val focusManager = LocalFocusManager.current
val keyboardState = getKeyboardState()
LaunchedEffect(keyboardState.value) {
if (keyboardState.value == KeyboardState.Closed && focused) {
if (keyboardState.value == KeyboardState.Closed && focused.value) {
focusManager.clearFocus()
}
}
@@ -1212,6 +1211,7 @@ private fun BoxScope.ChatList(searchText: MutableState<TextFieldValue>, listStat
@Composable
private fun ChatListSearchBarWithTags(listState: LazyListState, searchText: MutableState<TextFieldValue>, searchShowingSimplexLink: MutableState<Boolean>, searchChatFilteredBySimplexLink: MutableState<Set<String>>, connectNameCandidate: MutableState<String?>, onlineSearch: OnlineSearchModel) {
val oneHandUI = remember { appPrefs.oneHandUI.state }
val searchFocused = remember { mutableStateOf(false) }
if (oneHandUI.value) {
Column(Modifier.consumeWindowInsets(WindowInsets.navigationBars).consumeWindowInsets(PaddingValues(bottom = AppBarHeight))) {
Divider()
@@ -1221,11 +1221,14 @@ private fun ChatListSearchBarWithTags(listState: LazyListState, searchText: Muta
Divider()
rows()
}
ChatListSearchBar(listState, searchText, searchShowingSimplexLink, searchChatFilteredBySimplexLink, connectNameCandidate, onlineSearch)
Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.ime))
ChatListSearchBar(listState, searchText, searchShowingSimplexLink, searchChatFilteredBySimplexLink, connectNameCandidate, onlineSearch, searchFocused)
// only the field's own keyboard: one opened by a view over the list must not resize the onboarding cards above
if (searchFocused.value) {
Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.ime))
}
}
} else {
ChatListSearchBar(listState, searchText, searchShowingSimplexLink, searchChatFilteredBySimplexLink, connectNameCandidate, onlineSearch)
ChatListSearchBar(listState, searchText, searchShowingSimplexLink, searchChatFilteredBySimplexLink, connectNameCandidate, onlineSearch, searchFocused)
// top toolbar: search bar above, so on desktop the search rows go above the tags
TagsOrConnectByName(searchText, searchShowingSimplexLink, connectNameCandidate, onlineSearch) { rows ->
rows()