fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix a glitch at not applying searched text at search results

Browse Source
This commit is contained in:
tibbi
2023-01-30 23:10:14 +01:00
parent e0a935e8e3
commit 4c3e5f81f4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -70,7 +70,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:9428140d75' implementation 'com.github.SimpleMobileTools:Simple-Commons:58574dd952'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

6
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
View File

@@ -1229,7 +1229,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
minFetchedSearchTS = 0L minFetchedSearchTS = 0L
maxFetchedSearchTS = MAX_SEARCH_YEAR maxFetchedSearchTS = MAX_SEARCH_YEAR
eventsHelper.getEvents(minFetchedSearchTS, maxFetchedSearchTS) { events -> eventsHelper.getEvents(minFetchedSearchTS, maxFetchedSearchTS, searchQuery = text) { events ->
events.forEach { event -> events.forEach { event ->
try { try {
if (searchResultEvents.firstOrNull { it.id == event.id && it.startTS == event.startTS } == null) { if (searchResultEvents.firstOrNull { it.id == event.id && it.startTS == event.startTS } == null) {
@@ -1320,7 +1320,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
val oldMinFetchedTS = minFetchedSearchTS - 1 val oldMinFetchedTS = minFetchedSearchTS - 1
minFetchedSearchTS -= FETCH_INTERVAL minFetchedSearchTS -= FETCH_INTERVAL
eventsHelper.getEvents(minFetchedSearchTS, oldMinFetchedTS) { events -> eventsHelper.getEvents(minFetchedSearchTS, oldMinFetchedTS, searchQuery = mLatestSearchQuery) { events ->
events.forEach { event -> events.forEach { event ->
try { try {
if (searchResultEvents.firstOrNull { it.id == event.id && it.startTS == event.startTS } == null) { if (searchResultEvents.firstOrNull { it.id == event.id && it.startTS == event.startTS } == null) {
@@ -1341,7 +1341,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
val oldMaxFetchedTS = maxFetchedSearchTS + 1 val oldMaxFetchedTS = maxFetchedSearchTS + 1
maxFetchedSearchTS += FETCH_INTERVAL maxFetchedSearchTS += FETCH_INTERVAL
eventsHelper.getEvents(oldMaxFetchedTS, maxFetchedSearchTS) { events -> eventsHelper.getEvents(oldMaxFetchedTS, maxFetchedSearchTS, searchQuery = mLatestSearchQuery) { events ->
events.forEach { event -> events.forEach { event ->
try { try {
if (searchResultEvents.firstOrNull { it.id == event.id && it.startTS == event.startTS } == null) { if (searchResultEvents.firstOrNull { it.id == event.id && it.startTS == event.startTS } == null) {