diff --git a/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt b/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt index c90ae3262b..bd180835fb 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt @@ -249,7 +249,7 @@ fun CollapsibleRail( TextButton(onClick = link.onClick, modifier = Modifier.padding(start = 4.dp)) { Icon(link.icon, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(15.dp)) Spacer(Modifier.width(6.dp)) - Text(link.label, fontSize = 11.sp) + Text(link.label, fontSize = 12.sp) } } } @@ -269,7 +269,7 @@ fun CollapsibleRail( Text( section.header, color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f), - fontSize = 9.sp, + fontSize = 11.sp, fontWeight = FontWeight.Bold, letterSpacing = 0.6.sp, modifier = Modifier.padding(start = 14.dp, top = 10.dp, bottom = 2.dp), diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt index 6442e656bd..3f2a336674 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -1030,7 +1030,7 @@ fun FileManagerScreen( // when it doesn't fit we drop the /storage/emulated/0 prefix, not the tail. text = elidePathStart(currentDir.absolutePath, 52), color = MaterialTheme.colorScheme.onSurfaceVariant, - fontSize = 11.sp, + fontSize = 12.sp, maxLines = 1, // fill = true: the path takes all remaining width, so the free-space figure // is pinned to the right edge instead of sliding around with the path length. @@ -1040,7 +1040,7 @@ fun FileManagerScreen( Text( "${FileOps.formatBytes(freeSpace)} free", color = MaterialTheme.colorScheme.onSurfaceVariant, - fontSize = 11.sp, + fontSize = 12.sp, maxLines = 1, ) } @@ -1607,7 +1607,7 @@ private fun FileItemRow( append(dateFormat.format(Date(file.lastModified()))) }, color = MaterialTheme.colorScheme.onSurfaceVariant, - fontSize = 11.sp, + fontSize = 12.sp, ) } if (showActions) Box { @@ -1760,7 +1760,7 @@ private fun FavoriteCard( Text( text = loc.driveLabel, color = badgeFg, - fontSize = 9.sp, + fontSize = 11.sp, fontWeight = FontWeight.Bold, modifier = Modifier .clip(RoundedCornerShape(4.dp)) @@ -1775,14 +1775,14 @@ private fun FavoriteCard( FavStorage.OTHER -> "Storage" }, color = MaterialTheme.colorScheme.onSurfaceVariant, - fontSize = 11.sp, + fontSize = 12.sp, ) } Spacer(Modifier.height(2.dp)) Text( text = loc.displayPath, color = MaterialTheme.colorScheme.onSurfaceVariant, - fontSize = 11.sp, + fontSize = 12.sp, fontFamily = FontFamily.Monospace, maxLines = 1, overflow = TextOverflow.Ellipsis, @@ -1896,7 +1896,7 @@ private fun FileGridTile( Text( file.name, color = MaterialTheme.colorScheme.onSurface, - fontSize = 11.sp, + fontSize = 12.sp, minLines = 2, maxLines = 2, textAlign = androidx.compose.ui.text.style.TextAlign.Center, @@ -2075,7 +2075,7 @@ private fun AttributeToggleRow( Text( text = description, color = MaterialTheme.colorScheme.onSurfaceVariant, - fontSize = 11.sp, + fontSize = 12.sp, ) } Spacer(Modifier.width(8.dp)) diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt b/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt index 61fca40f4d..c94b5cf9c1 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt @@ -48,7 +48,7 @@ class ControllerEditorActivity : ComponentActivity() { .background(MaterialTheme.colorScheme.surface.copy(alpha = 0.9f), RoundedCornerShape(50)) .padding(start = 14.dp, end = 5.dp, top = 5.dp, bottom = 5.dp), ) { - Text("Drag to move", fontSize = 11.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(end = 4.dp)) + Text("Drag to move", fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(end = 4.dp)) EditorButton("Reset", false) { controls.resetLayout() } EditorButton("Cancel", false) { finish() } EditorButton("Save", true) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DriverPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/DriverPage.kt index aaeb90bbde..df76a1e819 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DriverPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DriverPage.kt @@ -194,12 +194,12 @@ private fun InstalledRow(row: DriverRow, selected: Boolean, onSelect: () -> Unit color = if (selected) pal.signal else colors.onBackground, modifier = Modifier.weight(1f, fill = false), ) if (row.tag.isNotEmpty()) Text( - row.tag, fontSize = 9.5.sp, fontWeight = FontWeight.Bold, letterSpacing = 1.sp, color = colors.onSurfaceVariant, + row.tag, fontSize = 11.5.sp, fontWeight = FontWeight.Bold, letterSpacing = 1.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 8.dp).clip(RoundedCornerShape(5.dp)).background(Color.White.copy(alpha = 0.07f)) .padding(horizontal = 6.dp, vertical = 2.dp), ) } - if (row.detail.isNotEmpty()) Text(row.detail, fontSize = 11.5.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(top = 2.dp)) + if (row.detail.isNotEmpty()) Text(row.detail, fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(top = 2.dp)) } } if (row.removable) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt index 0f9a4f96e6..c11ae3ab92 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt @@ -37,7 +37,8 @@ fun PhantomProcessGatePage( eyebrow = "Steam", lede = if (compact) compactStatus(status) else "${PhantomProcessLimit.title(status)} · checking again every two seconds", onBack = onDismiss, - scrollContent = false, + // Scrolls, so the larger text never pushes the ADB command off a short screen. + scrollContent = true, compactLayout = compact, ) { BoxWithConstraints(Modifier.fillMaxWidth()) { @@ -104,12 +105,12 @@ private fun CompactGateInstructions( ) { Text( "If the setting is missing and Wireless debugging is unavailable, run this from a computer:", - style = MaterialTheme.typography.bodySmall.copy(fontSize = 11.sp), + style = MaterialTheme.typography.bodySmall.copy(fontSize = 12.sp), color = MaterialTheme.colorScheme.onSurfaceVariant, ) Text( PhantomProcessLimit.ADB_COMMAND, - style = MaterialTheme.typography.labelSmall.copy(fontFamily = FontFamily.Monospace, fontSize = 9.sp), + style = MaterialTheme.typography.labelSmall.copy(fontFamily = FontFamily.Monospace, fontSize = 11.sp), color = MaterialTheme.colorScheme.onSurfaceVariant, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ProtonPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ProtonPage.kt index 46b946c490..2b0aaf5f43 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ProtonPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ProtonPage.kt @@ -70,7 +70,7 @@ fun ProtonPage( if (busyId == row.id) Column(modifier = Modifier.fillMaxWidth().padding(start = 12.dp, end = 12.dp, bottom = 10.dp)) { Text( if (stage != null && percent >= 0) "$stage · $percent%" else stage ?: "Starting…", - fontSize = 11.5.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(bottom = 5.dp), + fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(bottom = 5.dp), ) if (percent >= 0) LinearProgressIndicator(progress = { percent / 100f }, modifier = Modifier.fillMaxWidth().height(4.dp)) else LinearProgressIndicator(modifier = Modifier.fillMaxWidth().height(4.dp))