mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 03:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable search direction after latest matching result found

Browse source
This commit is contained in:
Sylvain Berfini 2026-01-06 16:09:47 +01:00
parent fe788caf0e
commit 9151898a4d
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt
View file

@ -98,6 +98,8 @@ class ConversationViewModel
val canSearchDown = MutableLiveData<Boolean>()
val canSearchUp = MutableLiveData<Boolean>()
val itemToScrollTo = MutableLiveData<Int>()
val isUserScrollingUp = MutableLiveData<Boolean>()
@ -351,6 +353,7 @@ class ConversationViewModel
isDisabledBecauseNotSecured.value = false
searchInProgress.value = false
canSearchDown.value = false
canSearchUp.value = false
itemToScrollTo.value = -1
}
@ -382,6 +385,7 @@ class ConversationViewModel
@UiThread
fun openSearchBar() {
canSearchUp.value = true
searchBarVisible.value = true
focusSearchBarEvent.value = Event(true)
}
@ -393,6 +397,7 @@ class ConversationViewModel
focusSearchBarEvent.value = Event(false)
latestMatch = null
canSearchDown.value = false
canSearchUp.value = false
coreContext.postOnCoreThread {
for (eventLog in eventsList) {
@ -405,17 +410,21 @@ class ConversationViewModel
@UiThread
fun searchUp() {
if (canSearchUp.value == true) {
coreContext.postOnCoreThread {
searchChatMessage(SearchDirection.Up)
}
}
}
@UiThread
fun searchDown() {
if (canSearchDown.value == true) {
coreContext.postOnCoreThread {
searchChatMessage(SearchDirection.Down)
}
}
}
@UiThread
fun refresh() {
@ -1007,10 +1016,19 @@ class ConversationViewModel
val index = eventsList.indexOf(found)
itemToScrollTo.postValue(index)
}
// Disable button as latest result has been reached
if (direction == SearchDirection.Down) {
canSearchDown.postValue(false)
} else {
canSearchUp.postValue(false)
}
R.string.conversation_search_no_more_match
}
showRedToast(message, R.drawable.magnifying_glass)
} else {
canSearchDown.postValue(true)
canSearchUp.postValue(true)
Log.i(
"$TAG Found result [${match.chatMessage?.messageId}] while looking up for message with text [$textToSearch] in direction [$direction] starting from message [${latestMatch?.chatMessage?.messageId}]"
)
@ -1029,8 +1047,6 @@ class ConversationViewModel
itemToScrollTo.postValue(index)
searchInProgress.postValue(false)
}
canSearchDown.postValue(true)
}
}

2
app/src/main/res/layout/chat_conversation_fragment.xml
View file

@ -271,7 +271,7 @@
style="@style/icon_top_bar_button_style"
android:id="@+id/search_up"
android:onClick="@{() -> viewModel.searchUp()}"
android:enabled="@{viewModel.searchFilter.length() > 0}"
android:enabled="@{viewModel.searchFilter.length() > 0 &amp;&amp; viewModel.canSearchUp}"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:src="@drawable/caret_up"