jonas/Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases 10 Wiki Activity

show badges in iconless app list

Browse Source 
close #1982
This commit is contained in:
MM20
2026-08-30 17:04:59 +02:00
parent 4dff3b5ee6
commit 32170cfc48
3 changed files with 106 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
app/ui/src/main/java/de/mm20/launcher2/ui/component/Badge.kt Normal file
View File

@@ -0,0 +1,97 @@
package de.mm20.launcher2.ui.component
import android.icu.text.NumberFormat
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
import androidx.compose.ui.graphics.nativeCanvas
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.intl.Locale
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import de.mm20.launcher2.badges.Badge
import de.mm20.launcher2.badges.BadgeIcon
import kotlin.math.roundToInt
@Composable
fun Badge(
badge: Badge,
modifier: Modifier = Modifier,
size: Dp = 16.dp
) {
Surface(
tonalElevation = 1.dp,
modifier = modifier.size(size),
color = MaterialTheme.colorScheme.secondary,
shape = CircleShape
) {
Box(
contentAlignment = Alignment.Center
) {
badge.progress?.let {
val progress by animateFloatAsState(it)
CircularProgressIndicator(
modifier = Modifier.fillMaxSize(0.8f),
progress = { progress },
strokeWidth = size / 16,
color = MaterialTheme.colorScheme.onSecondary
)
}
val badgeIcon = badge.icon
val number = badge.number
if (badgeIcon is BadgeIcon.Vector) {
Icon(
modifier = Modifier
.fillMaxSize()
.padding(size / 8),
painter = painterResource(badgeIcon.iconRes),
contentDescription = null,
tint = MaterialTheme.colorScheme.onSecondary,
)
} else if (badgeIcon is BadgeIcon.Drawable) {
Canvas(
modifier = Modifier
.fillMaxSize()
.padding(size / 16)
) {
badgeIcon.drawable.setBounds(
0,
0,
this.size.width.roundToInt(),
this.size.height.roundToInt()
)
drawIntoCanvas {
badgeIcon.drawable.draw(it.nativeCanvas)
}
}
} else if (number != null && number > 0 && number < 100) {
Text(
NumberFormat.getInstance(Locale.current.platformLocale).format(number),
color = MaterialTheme.colorScheme.onSecondary,
style = MaterialTheme.typography.labelSmall.copy(
fontSize = with(LocalDensity.current) {
size.toSp() * 0.6f
}
),
)
}
}
}
}

66
app/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt
View File

@@ -241,68 +241,12 @@ fun ShapedLauncherIcon(
}
val _badge = badge()
if (_badge != null) {
Surface(
tonalElevation = 1.dp,
Badge(
badge = _badge,
modifier = Modifier
.size(size * 0.33f)
.align(Alignment.BottomEnd),
color = MaterialTheme.colorScheme.tertiary,
shape = CircleShape
) {
Box(
contentAlignment = Alignment.Center
) {
_badge.progress?.let {
val progress by animateFloatAsState(it)
CircularProgressIndicator(
modifier = Modifier.fillMaxSize(0.8f),
progress = { progress },
strokeWidth = size / 48,
color = MaterialTheme.colorScheme.onTertiary
)
}
val badgeIcon = _badge.icon
val number = _badge.number
if (badgeIcon is BadgeIcon.Vector) {
Icon(
modifier = Modifier
.fillMaxSize()
.padding(size / 24),
painter = painterResource(badgeIcon.iconRes),
contentDescription = null,
tint = MaterialTheme.colorScheme.onTertiary,
)
} else if (badgeIcon is BadgeIcon.Drawable) {
Canvas(
modifier = Modifier
.fillMaxSize()
.padding(size / 48)
) {
badgeIcon.drawable.setBounds(
0,
0,
this.size.width.roundToInt(),
this.size.height.roundToInt()
)
drawIntoCanvas {
badgeIcon.drawable.draw(it.nativeCanvas)
}
}
} else if (number != null && number > 0 && number < 100) {
Text(
NumberFormat.getInstance(Locale.current.platformLocale).format(number),
color = MaterialTheme.colorScheme.secondaryContainer,
style = MaterialTheme.typography.labelSmall.copy(
fontSize = with(LocalDensity.current) {
size.toSp() * 0.2f
}
),
)
}
}
}
.align(Alignment.BottomEnd) ,
size = size * 0.33f
)
}
}
}

4
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt
View File

@@ -55,6 +55,7 @@ import de.mm20.launcher2.crashreporter.CrashReporter
import de.mm20.launcher2.ktx.sendWithBackgroundPermission
import de.mm20.launcher2.search.Application
import de.mm20.launcher2.ui.R
import de.mm20.launcher2.ui.component.Badge
import de.mm20.launcher2.ui.component.DefaultToolbarAction
import de.mm20.launcher2.ui.component.ShapedLauncherIcon
import de.mm20.launcher2.ui.component.SubmenuToolbarAction
@@ -525,6 +526,9 @@ fun AppItem(
this@AnimatedContent,
),
)
if (!LocalGridSettings.current.showListIcons && badge != null) {
Badge(badge = badge!!, size = 16.dp, modifier = Modifier.padding(start = 8.dp))
}
}
}
}