diff --git a/app/src/main/kotlin/rasel/lunar/launcher/home/LauncherHome.kt b/app/src/main/kotlin/rasel/lunar/launcher/home/LauncherHome.kt index 40e004d..82b3a37 100644 --- a/app/src/main/kotlin/rasel/lunar/launcher/home/LauncherHome.kt +++ b/app/src/main/kotlin/rasel/lunar/launcher/home/LauncherHome.kt @@ -77,6 +77,10 @@ import rasel.lunar.launcher.helpers.UniUtils.Companion.biometricPromptInfo import rasel.lunar.launcher.helpers.UniUtils.Companion.canAuthenticate import rasel.lunar.launcher.helpers.UniUtils.Companion.expandNotificationPanel import rasel.lunar.launcher.helpers.UniUtils.Companion.lockMethod +import rasel.lunar.launcher.home.adapters.NotificationItemAdapter +import rasel.lunar.launcher.home.adapters.RecentCallsAdapter +import rasel.lunar.launcher.home.adapters.RssItemAdapter +import rasel.lunar.launcher.home.adapters.SmsLogsAdapter import rasel.lunar.launcher.model.CurrentPlayItem import rasel.lunar.launcher.model.NotificationItem import rasel.lunar.launcher.model.RssData @@ -84,10 +88,6 @@ import rasel.lunar.launcher.model.RssDataInterface import rasel.lunar.launcher.model.RssDataType import rasel.lunar.launcher.qaccess.QuickAccess import rasel.lunar.launcher.settings.SettingsActivity -import rasel.lunar.launcher.home.adapters.RecentCallsAdapter -import rasel.lunar.launcher.home.adapters.NotificationItemAdapter -import rasel.lunar.launcher.home.adapters.RssItemAdapter -import rasel.lunar.launcher.home.adapters.SmsLogsAdapter import rasel.lunar.launcher.utils.BLog import rasel.lunar.launcher.utils.BitmapConverter import rasel.lunar.launcher.utils.JamoUtils @@ -392,30 +392,27 @@ internal class LauncherHome : Fragment() { }} BLog.LOGE("${this} ::::: queryInfos after delete >>>> ") var rQ = WorkersDb.getRealm().query().query("pubDate > $0", beforeDay(Date(),3)) - if(keyword.length > 0) - keyword.split("").forEach { - BLog.LOGE("queryInfos it >>> ${it}") - if (it.length > 0) { - if (JamoUtils.CHOSUNG.contains(it)) { - rQ = rQ.query( - "title CONTAINS $0 OR chosung CONTAINS $1 ", - it, - it - ) - } else if(Pattern.matches("^[가-힣]*\$", it)){ - rQ = rQ.query( - "title CONTAINS $0", - it - ) - }else { - rQ = rQ.query( - "title CONTAINS $0 OR title CONTAINS $1", - it.toUpperCase(), - it.toLowerCase() - ) - } - } + if(keyword.length > 0) { + BLog.LOGE("queryInfos it >>> ${keyword}") + if (JamoUtils.CHOSUNG.contains(keyword.split("")[0])) { + rQ = rQ.query( + "title CONTAINS $0 OR chosung CONTAINS $1 ", + keyword, + keyword + ) + } else if(Pattern.matches("^[가-힣]*\$", keyword)){ + rQ = rQ.query( + "title CONTAINS $0", + keyword + ) + }else { + rQ = rQ.query( + "title CONTAINS $0 OR title CONTAINS $1", + keyword.toUpperCase(), + keyword.toLowerCase() + ) } + } category?.let { rQ = rQ.query("category == $0", it)