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

Merge pull request #438 from jamal2362/main

Browse Source 
Scale Themed icons to original app icon size
This commit is contained in:
U. N. Owen 2023-06-29 17:43:39 +02:00 committed by GitHub
commit 29620e69cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ data class LauncherApp(
return StaticLauncherIcon( return StaticLauncherIcon(
foregroundLayer = TintedIconLayer( foregroundLayer = TintedIconLayer(
icon = ContextCompat.getDrawable(context, R.drawable.ic_file_android)!!, icon = ContextCompat.getDrawable(context, R.drawable.ic_file_android)!!,
scale = 0.5f, scale = 0.65f,
color = 0xff3dda84.toInt(), color = 0xff3dda84.toInt(),
), ),
backgroundLayer = ColorLayer(0xff3dda84.toInt()) backgroundLayer = ColorLayer(0xff3dda84.toInt())
@ -91,7 +91,7 @@ data class LauncherApp(
if (themed && isAtLeastApiLevel(33) && icon.monochrome != null) { if (themed && isAtLeastApiLevel(33) && icon.monochrome != null) {
return StaticLauncherIcon( return StaticLauncherIcon(
foregroundLayer = TintedIconLayer( foregroundLayer = TintedIconLayer(
scale = 1f, scale = 1.5f,
icon = icon.monochrome!!, icon = icon.monochrome!!,
), ),
backgroundLayer = ColorLayer() backgroundLayer = ColorLayer()

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

@ -21,7 +21,7 @@ interface AppShortcut: SavableSearchable {
foregroundLayer = TintedIconLayer( foregroundLayer = TintedIconLayer(
color = 0xFF3DDA84.toInt(), color = 0xFF3DDA84.toInt(),
icon = ContextCompat.getDrawable(context, R.drawable.ic_file_android)!!, icon = ContextCompat.getDrawable(context, R.drawable.ic_file_android)!!,
scale = 0.5f, scale = 0.65f,
), ),
backgroundLayer = ColorLayer(0xFF3DDA84.toInt()), backgroundLayer = ColorLayer(0xFF3DDA84.toInt()),
) )

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

@ -80,7 +80,7 @@ data class LauncherShortcut(
foregroundLayer = TintedIconLayer( foregroundLayer = TintedIconLayer(
color = 0xFF3DDA84.toInt(), color = 0xFF3DDA84.toInt(),
icon = ContextCompat.getDrawable(context, R.drawable.ic_file_android)!!, icon = ContextCompat.getDrawable(context, R.drawable.ic_file_android)!!,
scale = 0.5f, scale = 0.65f,
), ),
backgroundLayer = ColorLayer(0xFF3DDA84.toInt()), backgroundLayer = ColorLayer(0xFF3DDA84.toInt()),
) )

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

@ -278,7 +278,7 @@ class IconPackManager(
return StaticLauncherIcon( return StaticLauncherIcon(
foregroundLayer = TintedIconLayer( foregroundLayer = TintedIconLayer(
icon = drawable, icon = drawable,
scale = 0.5f, scale = 0.65f,
), ),
backgroundLayer = ColorLayer(), backgroundLayer = ColorLayer(),
) )

2
services/icons/src/main/java/de/mm20/launcher2/icons/compat/AdaptiveIconDrawableCompat.kt
View File

@ -185,7 +185,7 @@ fun AdaptiveIconDrawableCompat.toLauncherIcon(
if (themed && this.monochrome != null) { if (themed && this.monochrome != null) {
return StaticLauncherIcon( return StaticLauncherIcon(
foregroundLayer = TintedIconLayer( foregroundLayer = TintedIconLayer(
scale = 1f, scale = 1.5f,
icon = this.monochrome, icon = this.monochrome,
), ),
backgroundLayer = ColorLayer() backgroundLayer = ColorLayer()

2
services/icons/src/main/java/de/mm20/launcher2/icons/transformations/ForceThemedIconTransformation.kt
View File

@ -23,7 +23,7 @@ internal class ForceThemedIconTransformation : LauncherIconTransformation {
is StaticIconLayer -> TintedIconLayer( is StaticIconLayer -> TintedIconLayer(
color = 0, color = 0,
icon = layer.icon, icon = layer.icon,
scale = layer.scale / 1.5f, scale = layer.scale / 1.2f,
) )
is TextLayer -> layer.copy( is TextLayer -> layer.copy(
color = 0 color = 0