Improve task searching

This commit is contained in:
Phillip Thelen 2020-02-03 12:24:18 +01:00
parent 641264c65a
commit ca9c1d14f0
4 changed files with 10 additions and 5 deletions

View file

@ -153,7 +153,7 @@ android {
multiDexEnabled true
resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
versionCode 2362
versionCode 2364
versionName "2.5"
}

View file

@ -100,7 +100,12 @@ class TaskFilterHelper {
query = query.`in`("tags.id", tagsId.toTypedArray())
}
if (searchQuery?.isNotEmpty() == true) {
query = query.beginsWith("text", searchQuery ?: "", Case.INSENSITIVE)
query = query
.beginGroup()
.contains("text", searchQuery ?: "", Case.INSENSITIVE)
.or()
.contains("notes", searchQuery ?: "", Case.INSENSITIVE)
.endGroup()
}
if (activeFilter != null && activeFilter != Task.FILTER_ALL) {
when (activeFilter) {

View file

@ -11,7 +11,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.0-rc01'
classpath 'com.android.tools.build:gradle:4.0.0-alpha09'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.google.gms:google-services:4.3.3'
classpath "io.realm:realm-gradle-plugin:6.0.2"

View file

@ -1,6 +1,6 @@
#Mon Oct 15 18:23:38 CEST 2018
#Sun Feb 02 18:26:34 CET 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-rc-1-all.zip