diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 74b49821c5..819a6525d6 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -12,8 +12,11 @@ import android.provider.Settings import androidx.core.graphics.drawable.toBitmap import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState +import kotlin.math.roundToInt object HomeApp { + private const val ICON_DP = 72 + data class LaunchableApp( val label: String, val packageName: String, @@ -71,13 +74,14 @@ object HomeApp { fun launchableApps(context: Context): List { val pm = context.packageManager val launch = Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER) + val iconPx = (ICON_DP * context.resources.displayMetrics.density).roundToInt() val apps = pm.queryIntentActivities(launch, 0) .asSequence() .mapNotNull { result -> val activity = result.activityInfo ?: return@mapNotNull null if (!activity.exported || activity.packageName == context.packageName) return@mapNotNull null val label = result.loadLabel(pm)?.toString()?.trim().orEmpty().ifEmpty { activity.packageName } - val icon = runCatching { result.loadIcon(pm).toBitmap(48, 48) }.getOrNull() + val icon = runCatching { result.loadIcon(pm).toBitmap(iconPx, iconPx) }.getOrNull() LaunchableApp(label, activity.packageName, activity.name, icon) } .distinctBy { it.packageName } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 78e6bd49bf..1087240002 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -84,7 +84,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.layout.boundsInParent import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.LayoutCoordinates import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.layout.onPlaced import com.droiddeck.launcher.core.PhantomProcessLimit @@ -99,15 +101,15 @@ internal fun BottomBar( val keys = navigationKeys(s) val bounds = remember { androidx.compose.runtime.mutableStateMapOf() } val tint = androidx.compose.runtime.rememberUpdatedState(LocalPalette.current.signal) - var barAt by remember { mutableStateOf(androidx.compose.ui.geometry.Offset.Zero) } + val content = remember { arrayOfNulls(1) } Row(modifier.fillMaxWidth().background(MaterialTheme.colorScheme.surface), verticalAlignment = Alignment.CenterVertically) { BoxWithConstraints(Modifier.weight(1f)) { val itemWidth = (maxWidth / keys.size).coerceIn(56.dp, 88.dp) - Box(Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).onGloballyPositioned { barAt = it.boundsInRoot().topLeft }) { - if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown]?.translate(-barAt), tint, GlideAxis.Horizontal, corner = 14.dp, fill = 0.14f, outline = 0f) + Box(Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).onPlaced { content[0] = it }) { + if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown], tint, GlideAxis.Horizontal, corner = 14.dp, fill = 0.14f, outline = 0f) Row(Modifier.selectableGroup().padding(vertical = 4.dp), horizontalArrangement = Arrangement.Center) { NavigationItems(s, shown, compact = true, iconOnly = false, height = 56.dp, width = itemWidth, - place = { key -> Modifier.onGloballyPositioned { bounds[key] = it.boundsInRoot(); Hops.railBounds[key] = it.boundsInRoot() } }, + place = { key -> Modifier.onGloballyPositioned { item -> content[0]?.let { bounds[key] = it.localBoundingBoxOf(item) }; Hops.railBounds[key] = item.boundsInRoot() } }, onSelect = onSelect, onFocusSelect = onFocusSelect) } } @@ -143,18 +145,18 @@ internal fun SideRail( val keys = navigationKeys(s) val bounds = remember { androidx.compose.runtime.mutableStateMapOf() } val tint = androidx.compose.runtime.rememberUpdatedState(LocalPalette.current.signal) - var railAt by remember { mutableStateOf(androidx.compose.ui.geometry.Offset.Zero) } - Box(Modifier.fillMaxSize().verticalScroll(rememberScrollState()).onGloballyPositioned { railAt = it.boundsInRoot().topLeft }) { - if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown]?.translate(-railAt), tint, GlideAxis.Vertical, corner = 14.dp, fill = 0.14f, outline = 0f) + val content = remember { arrayOfNulls(1) } + Box(Modifier.fillMaxSize().verticalScroll(rememberScrollState()).onPlaced { content[0] = it }) { + if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown], tint, GlideAxis.Vertical, corner = 14.dp, fill = 0.14f, outline = 0f) Column( horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(4.dp), modifier = Modifier.fillMaxWidth().selectableGroup(), ) { val place: (String) -> Modifier = { key -> - Modifier.onGloballyPositioned { - bounds[key] = it.boundsInRoot() - Hops.railBounds[key] = it.boundsInRoot() + Modifier.onGloballyPositioned { item -> + content[0]?.let { bounds[key] = it.localBoundingBoxOf(item) } + Hops.railBounds[key] = item.boundsInRoot() } } NavigationItems(s, shown, compact, iconOnly, fit, if (iconOnly) 52.dp else 80.dp, place, onSelect, onFocusSelect)