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

Rename loadIconAsync to loadIcon as it's no longer guaranteed to be called off the main thread

Browse Source
This commit is contained in:
MM20 2021-12-04 13:55:29 +01:00
parent 2273a0912a
commit c388b01fe8
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/src/main/java/de/mm20/launcher2/search/data/AppInstallation.kt
View File

@ -38,7 +38,7 @@ class AppInstallation(
foregroundScale = 0.5f) foregroundScale = 0.5f)
} }
override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? { override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
val icon = session.appIcon ?: return getPlaceholderIcon(context) val icon = session.appIcon ?: return getPlaceholderIcon(context)
val foreground = BitmapDrawable(context.resources, icon) val foreground = BitmapDrawable(context.resources, icon)
foreground.colorFilter = ColorMatrixColorFilter(ColorMatrix().apply { foreground.colorFilter = ColorMatrixColorFilter(ColorMatrix().apply {

2
applications/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt
View File

@ -79,7 +79,7 @@ class AppShortcut(
foregroundScale = 0.5f) foregroundScale = 0.5f)
} }
override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? { override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
val launcherApps = context.getSystemService(Context.LAUNCHER_APPS_SERVICE) as LauncherApps val launcherApps = context.getSystemService(Context.LAUNCHER_APPS_SERVICE) as LauncherApps
val icon = launcherApps.getShortcutIconDrawable(launcherShortcut, context.resources.displayMetrics.densityDpi) val icon = launcherApps.getShortcutIconDrawable(launcherShortcut, context.resources.displayMetrics.densityDpi)
icon ?: return null icon ?: return null

2
applications/src/main/java/de/mm20/launcher2/search/data/LauncherApp.kt
View File

@ -68,7 +68,7 @@ class LauncherApp(
return launcherActivityInfo.user return launcherActivityInfo.user
} }
override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? { override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
try { try {
val icon = val icon =
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {

2
contacts/src/main/java/de/mm20/launcher2/search/data/Contact.kt
View File

@ -48,7 +48,7 @@ class Contact(
) )
} }
override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? { override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
val contentResolver = context.contentResolver val contentResolver = context.contentResolver
val uri = ContactsContract.Contacts.getLookupUri(id, lookupKey) ?: return null val uri = ContactsContract.Contacts.getLookupUri(id, lookupKey) ?: return null
val bmp = ContactsContract.Contacts.openContactPhotoInputStream(contentResolver, uri, false) val bmp = ContactsContract.Contacts.openContactPhotoInputStream(contentResolver, uri, false)

2
files/src/main/java/de/mm20/launcher2/search/data/File.kt
View File

@ -51,7 +51,7 @@ open class File(
open val isStoredInCloud = false open val isStoredInCloud = false
override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? { override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
if (!JavaIOFile(path).exists()) return null if (!JavaIOFile(path).exists()) return null
when { when {
mimeType.startsWith("image/") -> { mimeType.startsWith("image/") -> {

2
files/src/main/java/de/mm20/launcher2/search/data/GDriveFile.kt
View File

@ -36,7 +36,7 @@ class GDriveFile(
} }
} }
override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? { override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
return null return null
} }

2
files/src/main/java/de/mm20/launcher2/search/data/OneDriveFile.kt
View File

@ -26,7 +26,7 @@ class OneDriveFile(
override val isStoredInCloud = true override val isStoredInCloud = true
override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? { override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
return null return null
} }

2
search/src/main/java/de/mm20/launcher2/search/data/Searchable.kt
View File

@ -32,7 +32,7 @@ abstract class Searchable : Comparable<Searchable> {
} }
} }
open suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? = null open suspend fun loadIcon(context: Context, size: Int): LauncherIcon? = null
abstract fun getPlaceholderIcon(context: Context): LauncherIcon abstract fun getPlaceholderIcon(context: Context): LauncherIcon
override fun compareTo(other: Searchable): Int { override fun compareTo(other: Searchable): Int {

2
ui/src/main/java/de/mm20/launcher2/ui/ShapedLauncherIcon.kt
View File

@ -48,7 +48,7 @@ fun ShapedLauncherIcon(
LaunchedEffect(item) { LaunchedEffect(item) {
icon = withContext(Dispatchers.IO) { icon = withContext(Dispatchers.IO) {
item.loadIconAsync(context, iconSize) item.loadIcon(context, iconSize)
} }
} }

2
websites/src/main/java/de/mm20/launcher2/search/data/Website.kt
View File

@ -41,7 +41,7 @@ class Website(
) : Searchable() { ) : Searchable() {
override val key = "web://$url" override val key = "web://$url"
override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? { override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
if (favicon.isEmpty()) return null if (favicon.isEmpty()) return null
try { try {
return withContext(Dispatchers.IO) { return withContext(Dispatchers.IO) {

2
wikipedia/src/main/java/de/mm20/launcher2/search/data/Wikipedia.kt
View File

@ -29,7 +29,7 @@ class Wikipedia(
) : Searchable() { ) : Searchable() {
override val key = "wikipedia://$id" override val key = "wikipedia://$id"
override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? { override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
return null return null
} }