lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Hiding an item no longer removes it from favorites and vice versa

Browse Source
This commit is contained in:
MM20 2024-04-21 01:49:09 +02:00
parent 234419267c
commit fcf6578450
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/database/src/main/java/de/mm20/launcher2/database/SearchableDao.kt
View File

@ -55,7 +55,7 @@ interface SearchableDao {
"(:automaticallySorted AND pinPosition = 1) OR" + "(:automaticallySorted AND pinPosition = 1) OR" +
"(:frequentlyUsed AND pinPosition = 0 AND launchCount > 0) OR " + "(:frequentlyUsed AND pinPosition = 0 AND launchCount > 0) OR " +
"(:hidden AND hidden = 1)" + "(:hidden AND hidden = 1)" +
") AND hidden = :hidden ORDER BY pinPosition DESC, weight DESC, launchCount DESC LIMIT :limit" ") ORDER BY pinPosition DESC, weight DESC, launchCount DESC LIMIT :limit"
) )
fun getIncludeTypes( fun getIncludeTypes(
includeTypes: List<String>?, includeTypes: List<String>?,
@ -74,7 +74,7 @@ interface SearchableDao {
"(:automaticallySorted AND pinPosition = 1) OR" + "(:automaticallySorted AND pinPosition = 1) OR" +
"(:frequentlyUsed AND pinPosition = 0 AND launchCount > 0) OR " + "(:frequentlyUsed AND pinPosition = 0 AND launchCount > 0) OR " +
"(:hidden AND hidden = 1)" + "(:hidden AND hidden = 1)" +
") AND hidden = :hidden ORDER BY pinPosition DESC, weight DESC, launchCount DESC LIMIT :limit" ") ORDER BY pinPosition DESC, weight DESC, launchCount DESC LIMIT :limit"
) )
fun getExcludeTypes( fun getExcludeTypes(
excludeTypes: List<String>?, excludeTypes: List<String>?,

3
services/favorites/src/main/java/de/mm20/launcher2/services/favorites/FavoritesService.kt
View File

@ -16,7 +16,6 @@ class FavoritesService(
limit: Int = 100, limit: Int = 100,
): Flow<List<SavableSearchable>> { ): Flow<List<SavableSearchable>> {
return searchableRepository.get( return searchableRepository.get(
hidden = false,
includeTypes = includeTypes, includeTypes = includeTypes,
excludeTypes = excludeTypes, excludeTypes = excludeTypes,
manuallySorted = manuallySorted, manuallySorted = manuallySorted,
@ -38,7 +37,6 @@ class FavoritesService(
searchableRepository.upsert( searchableRepository.upsert(
searchable, searchable,
pinned = true, pinned = true,
hidden = false,
) )
} }
@ -63,7 +61,6 @@ class FavoritesService(
searchableRepository.upsert( searchableRepository.upsert(
searchable, searchable,
hidden = true, hidden = true,
pinned = false,
) )
} }