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

Fix crash if adaptive icon foreground or background is null

Browse Source
This commit is contained in:
MM20 2022-06-19 19:39:35 +02:00
parent 3cf0038c70
commit a303703d9e
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
5 changed files with 63 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,14 +53,18 @@ class LauncherApp(
} ?: return null } ?: return null
if (icon is AdaptiveIconDrawable) { if (icon is AdaptiveIconDrawable) {
return StaticLauncherIcon( return StaticLauncherIcon(
foregroundLayer = StaticIconLayer( foregroundLayer = icon.foreground?.let {
icon = icon.foreground, StaticIconLayer(
scale = 1.5f, icon = it,
), scale = 1.5f,
backgroundLayer = StaticIconLayer( )
icon = icon.background, } ?: TransparentLayer,
scale = 1.5f, backgroundLayer = icon.background?.let {
) StaticIconLayer(
icon = it,
scale = 1.5f,
)
} ?: TransparentLayer,
) )
} else { } else {
return StaticLauncherIcon( return StaticLauncherIcon(

20
appshortcuts/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt
View File

@ -75,14 +75,18 @@ class AppShortcut(
} ?: return null } ?: return null
if (icon is AdaptiveIconDrawable) { if (icon is AdaptiveIconDrawable) {
return StaticLauncherIcon( return StaticLauncherIcon(
foregroundLayer = StaticIconLayer( foregroundLayer = icon.foreground?.let {
icon = icon.foreground, StaticIconLayer(
scale = 1.5f, icon = it,
), scale = 1.5f,
backgroundLayer = StaticIconLayer( )
icon = icon.background, } ?: TransparentLayer,
scale = 1.5f, backgroundLayer = icon.background?.let {
) StaticIconLayer(
icon = it,
scale = 1.5f,
)
} ?: TransparentLayer,
) )
} }
return StaticLauncherIcon( return StaticLauncherIcon(

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

@ -15,10 +15,7 @@ import android.util.Size
import androidx.core.content.FileProvider import androidx.core.content.FileProvider
import androidx.exifinterface.media.ExifInterface import androidx.exifinterface.media.ExifInterface
import de.mm20.launcher2.files.R import de.mm20.launcher2.files.R
import de.mm20.launcher2.icons.ColorLayer import de.mm20.launcher2.icons.*
import de.mm20.launcher2.icons.LauncherIcon
import de.mm20.launcher2.icons.StaticIconLayer
import de.mm20.launcher2.icons.StaticLauncherIcon
import de.mm20.launcher2.ktx.formatToString import de.mm20.launcher2.ktx.formatToString
import de.mm20.launcher2.media.ThumbnailUtilsCompat import de.mm20.launcher2.media.ThumbnailUtilsCompat
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@ -120,14 +117,18 @@ open class LocalFile(
when { when {
icon is AdaptiveIconDrawable -> { icon is AdaptiveIconDrawable -> {
return StaticLauncherIcon( return StaticLauncherIcon(
foregroundLayer = StaticIconLayer( foregroundLayer = icon.foreground?.let {
icon = icon.foreground, StaticIconLayer(
scale = 1.5f, icon = it,
), scale = 1.5f,
backgroundLayer = StaticIconLayer( )
icon = icon.background, } ?: TransparentLayer,
scale = 1.5f, backgroundLayer = icon.background?.let {
) StaticIconLayer(
icon = it,
scale = 1.5f,
)
} ?: TransparentLayer,
) )
} }
else -> { else -> {

22
icons/src/main/java/de/mm20/launcher2/icons/DynamicCalendarIcon.kt
View File

@ -40,15 +40,19 @@ internal class DynamicCalendarIcon(
backgroundLayer = ColorLayer() backgroundLayer = ColorLayer()
) )
} else if (drawable is AdaptiveIconDrawable) { } else if (drawable is AdaptiveIconDrawable) {
StaticLauncherIcon( return StaticLauncherIcon(
foregroundLayer = StaticIconLayer( foregroundLayer = drawable.foreground?.let {
icon = drawable.foreground, StaticIconLayer(
scale = 1.5f icon = it,
), scale = 1.5f,
backgroundLayer = StaticIconLayer( )
icon = drawable.background, } ?: TransparentLayer,
scale = 1.5f backgroundLayer = drawable.background?.let {
) StaticIconLayer(
icon = it,
scale = 1.5f,
)
} ?: TransparentLayer,
) )
} else StaticLauncherIcon( } else StaticLauncherIcon(
foregroundLayer = StaticIconLayer( foregroundLayer = StaticIconLayer(

22
icons/src/main/java/de/mm20/launcher2/icons/providers/IconPackIconProvider.kt
View File

@ -46,15 +46,19 @@ class IconPackIconProvider(
val drawable = ResourcesCompat.getDrawable(res, resId, context.theme) ?: return null val drawable = ResourcesCompat.getDrawable(res, resId, context.theme) ?: return null
return when { return when {
drawable is AdaptiveIconDrawable -> { drawable is AdaptiveIconDrawable -> {
StaticLauncherIcon( return StaticLauncherIcon(
foregroundLayer = StaticIconLayer( foregroundLayer = drawable.foreground?.let {
icon = drawable.foreground, StaticIconLayer(
scale = 1.5f icon = it,
), scale = 1.5f,
backgroundLayer = StaticIconLayer( )
icon = drawable.background, } ?: TransparentLayer,
scale = 1.5f backgroundLayer = drawable.background?.let {
) StaticIconLayer(
icon = it,
scale = 1.5f,
)
} ?: TransparentLayer,
) )
} }
else -> { else -> {