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

Ensure icon pack dynamic calendar icons are correctly loaded

Browse Source
This commit is contained in:
MM20 2023-03-10 14:39:30 +01:00
parent 0b56c497e1
commit 9d520cef42
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/database/src/main/java/de/mm20/launcher2/database/IconDao.kt
View File

@ -13,7 +13,7 @@ interface IconDao {
@Insert @Insert
suspend fun insertAll(icons: List<IconEntity>) suspend fun insertAll(icons: List<IconEntity>)
@Query("SELECT * FROM Icons WHERE packageName = :packageName AND (activityName = :activityName OR activityName IS NULL) AND iconPack = :iconPack AND type IN ('app', 'calendar', 'clock') LIMIT 1") @Query("SELECT * FROM Icons WHERE packageName = :packageName AND (activityName = :activityName OR activityName IS NULL) AND iconPack = :iconPack AND type IN ('app', 'calendar', 'clock') ORDER BY type DESC LIMIT 1")
suspend fun getIcon(packageName: String, activityName: String?, iconPack: String): IconEntity? suspend fun getIcon(packageName: String, activityName: String?, iconPack: String): IconEntity?
@Query("SELECT * FROM Icons WHERE packageName = :packageName AND (activityName = :activityName OR activityName IS NULL) AND type IN ('app', 'calendar', 'clock')") @Query("SELECT * FROM Icons WHERE packageName = :packageName AND (activityName = :activityName OR activityName IS NULL) AND type IN ('app', 'calendar', 'clock')")

2
services/icons/src/main/java/de/mm20/launcher2/icons/loaders/AppFilterIconPackInstaller.kt
View File

@ -114,7 +114,7 @@ class AppFilterIconPackInstaller(
val icon = CalendarIcon( val icon = CalendarIcon(
packageName = componentName.packageName, packageName = componentName.packageName,
activityName = componentName.shortClassName, activityName = componentName.shortClassName,
drawables = (0..31).map { "$drawable$it" }, drawables = (1..31).map { "$drawable$it" },
iconPack = pkgName, iconPack = pkgName,
themed = iconPack.themed, themed = iconPack.themed,
name = name, name = name,