ProCraft for Android: An Android native painting app written in Rust
Rust
fix(ui): keypads, menus, alerts and text style sheet
Josh734a8a534d57
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/ActionsPanel.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/ActionsPanel.ktindex 8788b1c..569475e 100644--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/ActionsPanel.kt+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/ActionsPanel.kt@@ -358,7 +358,7 @@ fun ActionsPanel(vm: CanvasViewModel, arrowX: Dp, modifier: Modifier = Modifier)if (rows.any { it is Act && it.label == "Brush scaling" }) MenuPresence(scalingMenu, androidx.compose.ui.graphics.TransformOrigin(0f, 0f)) { look ->ChoiceMenu(look,- listOf("Relative to canvas", "Relative to screen"), if (vm.brushOnScreen) 1 else 0, offsetY = 89.dp,+ listOf("Relative to canvas", "Relative to screen"), if (vm.brushOnScreen) 1 else 0, offsetY = 82.dp,onPick = {vm.changeBrushScaling(it == 1)scalingMenu = false@@ -456,28 +456,39 @@ private fun modelGroups(else -> emptyList()}-/** A small menu beside a row: its choices, the chosen one marked with a blue dot. */+/**+ * A small menu over a row's right end: its choices, each with a round mark, the chosen one ticked;+ * 254 wide, its top 7 above the row.+ */@Composableprivate fun ChoiceMenu(look: Modifier, choices: List<String>, chosen: Int, offsetY: Dp, onPick: (Int) -> Unit, onDismiss: () -> Unit) {val density = androidx.compose.ui.platform.LocalDensity.currentPcPopup(textScale = MATCHED_POPUP_TEXT,alignment = Alignment.TopEnd,- offset = with(density) { androidx.compose.ui.unit.IntOffset(130.dp.roundToPx(), offsetY.roundToPx()) },+ // its left edge 54 in from the row's right end+ offset = with(density) { androidx.compose.ui.unit.IntOffset(200.dp.roundToPx(), offsetY.roundToPx()) },onDismissRequest = onDismiss,properties = androidx.compose.ui.window.PopupProperties(focusable = true),) {- Column(look.width(250.dp).clip(RoundedCornerShape(16.dp)).background(Pc.MenuFill).padding(vertical = 6.dp)) {+ val shape = RoundedCornerShape(26.dp)+ Column(look.width(254.dp).clip(shape).background(Pc.MenuFill).border(1.dp, ChoiceMenuRim, shape).padding(vertical = 8.dp)) {choices.forEachIndexed { i, label ->- Row(Modifier.fillMaxWidth().height(40.dp).clickable { onPick(i) }.padding(horizontal = 18.dp), verticalAlignment = Alignment.CenterVertically) {- Text(label, color = Pc.Text, fontSize = 15.sp, modifier = Modifier.weight(1f))- if (i == chosen) Box(Modifier.size(8.dp).clip(CircleShape).background(Pc.Accent))+ Row(+ Modifier.fillMaxWidth().height(40.dp).clickable { onPick(i) }.padding(start = 20.dp, end = 19.dp),+ verticalAlignment = Alignment.CenterVertically,+ ) {+ Text(label, color = Pc.Text, fontSize = 17.sp, maxLines = 1, modifier = Modifier.weight(1f))+ Radio(i == chosen)}}}}}+/** The choice menu's light rim. */+private val ChoiceMenuRim = Color(0x33FFFFFF)+/*** Advanced cursor settings, a page of the panel: when the brush cursor shows, and how it is drawn.*/diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AlertUi.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AlertUi.ktindex 49d685d..1ee43f7 100644--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AlertUi.kt+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AlertUi.kt@@ -4,9 +4,11 @@ import androidx.compose.animation.core.CubicBezierEasingimport androidx.compose.animation.core.animateFloatAsStateimport androidx.compose.animation.core.tweenimport androidx.compose.foundation.background+import androidx.compose.foundation.borderimport androidx.compose.foundation.clickableimport androidx.compose.foundation.gestures.awaitEachGestureimport androidx.compose.foundation.gestures.awaitFirstDown+import androidx.compose.foundation.gestures.waitForUpOrCancellationimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Column@@ -38,10 +40,10 @@ import androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.spimport androidx.compose.ui.window.PopupProperties-// buttons keep their width and the panel grows with them: 428 across for two, 632 for three+// buttons keep their width and the panel grows with them: 426 across for two, 630 for threeprivate val AlertButtonWidth = 192.dpprivate val AlertButtonGap = 12.dp-private val AlertSide = 16.dp+private val AlertSide = 15.dp// dark glass, or light with the light interfaceprivate val AlertFill get() = if (Pc.light) Color(0xF2E3E3E3) else Color(0xF21E1E1E)private val AlertInk get() = if (Pc.light) Color(0xFF222222) else Color(0xFFC5C5C5)@@ -55,7 +57,8 @@ private const val ALERT_START_SCALE = 1.1f* An alert over everything while [value] is not null: the screen dims to 70% black as a dark glass* panel fades in, settling from a little larger (0.3 s); in it a title (after an [icon]), a* message, and [cancel] beside the action, red when it [destructive]ly destroys; an [extra] choice- * (blue, as the action) can sit between them, the panel widening for it. It goes over 0.35 s.+ * (blue, as the action) can sit between them, the panel widening for it. A tap beside the panel+ * cancels. It goes over 0.35 s.*/@Composablefun <T : Any> Alert(@@ -79,6 +82,7 @@ fun <T : Any> Alert(if (value != null) tween(300, easing = Motion.EaseInOut) else tween(350, easing = CubicBezierEasing(0f, 0f, 0.58f, 1f)),label = "alert",)+ val cancelling = androidx.compose.runtime.rememberUpdatedState(if (value != null) onCancel else null)@Suppress("UNCHECKED_CAST")val kept = last[0] as T? ?: returnif (shown <= 0f) return@@ -90,8 +94,13 @@ fun <T : Any> Alert() {Box(Modifier.fillMaxSize().background(Color.Black.copy(alpha = ALERT_DIM * shown))- // nothing under it is touched while it is up- .pointerInput(Unit) { awaitEachGesture { awaitFirstDown().consume() } },+ // nothing under it is touched while it is up, and a tap beside the panel cancels+ .pointerInput(Unit) {+ awaitEachGesture {+ awaitFirstDown().consume()+ if (waitForUpOrCancellation() != null) cancelling.value?.invoke()+ }+ },contentAlignment = Alignment.Center,) {val buttons = if (extra != null) 3 else 2@@ -101,15 +110,18 @@ fun <T : Any> Alert(val k = ALERT_START_SCALE + (1f - ALERT_START_SCALE) * shownscaleX = kscaleY = k- }.clip(RoundedCornerShape(24.dp)).background(AlertFill).padding(start = AlertSide, end = AlertSide, top = 21.dp, bottom = 15.dp),+ }.clip(RoundedCornerShape(24.dp)).background(AlertFill).border(1.dp, Pc.GlassMenuEdge, RoundedCornerShape(24.dp))+ // a tap on the panel itself is not one beside it+ .pointerInput(Unit) { awaitEachGesture { awaitFirstDown().consume() } }+ .padding(start = AlertSide, end = AlertSide, top = 21.dp, bottom = 16.dp),horizontalAlignment = Alignment.CenterHorizontally,) {- Row(Modifier.height(29.dp), verticalAlignment = Alignment.CenterVertically) {+ Row(Modifier.height(31.dp), verticalAlignment = Alignment.CenterVertically) {icon?.let {Icon(it, contentDescription = null, tint = Pc.Accent, modifier = Modifier.size(24.dp))Spacer(Modifier.width(8.dp))}- Text(title(kept), color = AlertInk, fontSize = 22.sp, fontWeight = FontWeight.Bold, maxLines = 1)+ Text(title(kept), color = AlertInk, fontSize = 26.sp, fontWeight = FontWeight.Bold, maxLines = 1)}Spacer(Modifier.height(13.dp))message(kept).takeIf { it.isNotEmpty() }?.let { Text(it, color = AlertInk, fontSize = 16.sp, lineHeight = 20.sp, textAlign = TextAlign.Center) }diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/ColorPanel.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/ColorPanel.ktindex 68fb3c4..31717ef 100644--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/ColorPanel.kt+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/ColorPanel.kt@@ -1053,7 +1053,7 @@ private fun HexRow(rgb: Int, fill: Color = Pc.HexRow, field: Color = Pc.HexFieldif (editing) {// beside the panel, its middle level with this rowval gap = with(LocalDensity.current) { HexPadGap.roundToPx() }- PcPopup(textScale = MATCHED_POPUP_TEXT, popupPositionProvider = remember(gap) { BesidePanel(gap) }, onDismissRequest = { typed = null }, properties = PopupProperties(focusable = true)) {+ PcPopup(popupPositionProvider = remember(gap) { BesidePanel(gap) }, onDismissRequest = { typed = null }, properties = PopupProperties(focusable = true)) {HexPad(onKey = { c ->// a seventh digit starts a new code@@ -1069,7 +1069,7 @@ private fun HexRow(rgb: Int, fill: Color = Pc.HexRow, field: Color = Pc.HexField}/** From the hex row to the keypad's right edge: the panel's padding, then a small gap. */-private val HexPadGap = 12.5.dp+private val HexPadGap = 12.dp/** Puts a popup to the left of the anchor, its middle level with the anchor's, inside the window. */private class BesidePanel(private val gap: Int) : androidx.compose.ui.window.PopupPositionProvider {@@ -1085,36 +1085,36 @@ private class BesidePanel(private val gap: Int) : androidx.compose.ui.window.Pop}}-/** The hex keypad: D E F, A B C, 7 8 9, 4 5 6, 1 2 3, then a wide 0 and backspace; 259 × 338. */+/** The hex keypad: D E F, A B C, 7 8 9, 4 5 6, 1 2 3, then a wide 0 and backspace; 259 × 340. */@Composableprivate fun HexPad(onKey: (Char) -> Unit, onBack: () -> Unit) {val rows = listOf("DEF", "ABC", "789", "456", "123")Column(- Modifier.size(259.dp, 338.dp).clip(RoundedCornerShape(22.dp)).background(HexPadFill).border(0.5.dp, HexPadEdge, RoundedCornerShape(22.dp))- .padding(horizontal = 10.5.dp, vertical = 9.5.dp),- verticalArrangement = Arrangement.spacedBy(5.dp),+ Modifier.size(259.dp, 340.dp).clip(RoundedCornerShape(30.dp)).background(HexPadFill).border(1.dp, HexPadEdge, RoundedCornerShape(30.dp))+ .padding(10.dp),+ verticalArrangement = Arrangement.spacedBy(4.dp),) {for (row in rows) {- Row(horizontalArrangement = Arrangement.spacedBy(4.5.dp)) {- for (c in row) HexKey(Modifier.width(76.5.dp), { onKey(c) }) { Text("$c", color = HexKeyInk, fontSize = 21.sp) }+ Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {+ for (c in row) HexKey(Modifier.width(77.dp), { onKey(c) }) { Text("$c", color = HexKeyInk, fontSize = 21.sp) }}}- Row(horizontalArrangement = Arrangement.spacedBy(4.5.dp)) {- HexKey(Modifier.width(157.5.dp), { onKey('0') }) { Text("0", color = HexKeyInk, fontSize = 21.sp) }- HexKey(Modifier.width(76.5.dp), onBack) {- Icon(PcIcons.HexBackspace, contentDescription = "Delete", tint = HexBackInk, modifier = Modifier.size(26.dp))+ Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {+ HexKey(Modifier.width(158.dp), { onKey('0') }) { Text("0", color = HexKeyInk, fontSize = 21.sp) }+ HexKey(Modifier.width(77.dp), onBack) {+ Icon(PcIcons.HexBackspace, contentDescription = "Delete", tint = HexBackInk, modifier = Modifier.size(24.dp))}}}}-/** One key of the hex keypad, 49 tall, lighter while held. */+/** One key of the hex keypad, 50 tall, lighter while held. */@Composableprivate fun HexKey(modifier: Modifier, onClick: () -> Unit, label: @Composable () -> Unit) {val press = remember { androidx.compose.foundation.interaction.MutableInteractionSource() }val held by press.collectIsPressedAsState()Box(- modifier.height(49.dp).clip(RoundedCornerShape(18.dp)).background(if (held) HexKeyHeld else HexKeyFill)+ modifier.height(50.dp).clip(RoundedCornerShape(21.dp)).background(if (held) HexKeyHeld else HexKeyFill).clickable(interactionSource = press, indication = null, onClick = onClick),contentAlignment = Alignment.Center,) { label() }@@ -1244,7 +1244,7 @@ private fun ShortBottomMenu(vm: CanvasViewModel, history: Boolean, modifier: Mod/** A round choice mark, 18 across: a grey ring, or filled blue with a white tick when chosen. */@Composable-private fun Radio(chosen: Boolean) {+internal fun Radio(chosen: Boolean) {Box(Modifier.size(18.dp).clip(CircleShape).then(if (chosen) Modifier.background(Pc.Accent) else Modifier.border(1.5.dp, Pc.RadioRing, CircleShape)),contentAlignment = Alignment.Center,diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.ktindex 7f18ca2..2249ed9 100644--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt@@ -192,8 +192,15 @@ object PcIcons {val HexBackspace by lazy {icon("hex-backspace",- // the cross cut out of the tag- Part("M9.2 5.5h10.3a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-10.3l-6.7-6.5zM15.99 9.21L17.19 10.41L15.60 12.00L17.19 13.59L15.99 14.79L14.40 13.20L12.81 14.79L11.61 13.59L13.20 12.00L11.61 10.41L12.81 9.21L14.40 10.80z", 0f, true, evenOdd = true),+ // a 23 x 18 tag pointing left, a round-ended cross cut out of it+ Part(+ "M8.5 3H22a1.5 1.5 0 0 1 1.5 1.5v15a1.5 1.5 0 0 1-1.5 1.5H8.5L1.2 12.7Q0.5 12 1.2 11.3z" ++ "M14.5 10.657L16.828 8.328a0.95 0.95 0 0 1 1.344 1.344L15.843 12L18.172 14.328a0.95 0.95 0 0 1-1.344 1.344" ++ "L14.5 13.343L12.172 15.672a0.95 0.95 0 0 1-1.344-1.344L13.157 12L10.828 9.672a0.95 0.95 0 0 1 1.344-1.344z",+ 0f,+ true,+ evenOdd = true,+ ),)}/** Three overlapping rings: RGB. */@@ -212,8 +219,9 @@ object PcIcons {val Clock by lazy {icon("clock",- Part("M12 3.5a8.5 8.5 0 1 1 0 17a8.5 8.5 0 1 1 0-17z", 1.6f, false),- Part("M12 7.5V12l3 1.8", 1.6f, false),+ // a ring 20 across, the hands at nine o'clock+ Part("M12 3.05a8.95 8.95 0 1 1 0 17.9a8.95 8.95 0 1 1 0-17.9z", 2.1f, false),+ Part("M11 6.5H13V13.5H6.9V11.5H11z", 0f, true),)}@@ -221,8 +229,14 @@ object PcIcons {val Page by lazy {icon("page",- Part("M7 3h6.5l4.5 4.5V20a1 1 0 0 1-1 1H7a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1z", 1.6f, false),- Part("M13.5 3v4.5H18", 1.6f, false),+ // 14 x 18, its folded corner solid+ Part(+ "M7 3H13.25L19 8.75V19a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2z" ++ "M7.5 4.75H12.5V10.75H17.25V18.5a0.75 0.75 0 0 1-0.75 0.75H7.5a0.75 0.75 0 0 1-0.75-0.75V5.5a0.75 0.75 0 0 1 0.75-0.75z",+ 0f,+ true,+ evenOdd = true,+ ),)}diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/TextUi.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/TextUi.ktindex a1de498..1950d6e 100644--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/TextUi.kt+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/TextUi.kt@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.BoxScopeimport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.ColumnScopeimport androidx.compose.foundation.layout.Row+import androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.WindowInsetsimport androidx.compose.foundation.layout.fillMaxSize@@ -75,6 +76,7 @@ private val SheetFill = Color(0xFF535353)private val SheetBar = Color(0xFF4F4F4F)private val SheetCapsule = Color(0xFF3E3E3E)private val CardFill = Color(0xFF373737)+private val CardCorner = 22.dpprivate val ButtonFill = Color(0xFF474747)private val SegmentTrack = Color(0xFF646464)private val CapsuleInk = Color(0xFFC5C5C5)@@ -241,7 +243,12 @@ private fun TextStyleSheet(vm: CanvasViewModel, info: TextInfo) {var page by remember { mutableIntStateOf(0) }val sheetWide = androidx.compose.ui.platform.LocalConfiguration.current.screenWidthDp.dp >= WIDE_SHEETval importFont = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri -> uri?.let(vm::importFont) }- Column(Modifier.fillMaxWidth().height(561.dp).background(SheetFill)) {+ // wide, the cards end 33 above the bottom+ Column(+ Modifier.fillMaxWidth().height(if (sheetWide) 521.dp else 561.dp).background(SheetFill)+ // a touch on the sheet between its controls stays in it: it doesn't end the editing+ .pointerInput(Unit) { awaitEachGesture { awaitFirstDown().consume() } },+ ) {Row(Modifier.fillMaxWidth().height(62.dp).background(SheetBar).padding(horizontal = 8.dp), verticalAlignment = Alignment.CenterVertically) {SheetIcon(PcIcons.Keyboard, "Keyboard", Modifier.size(44.dp).clip(CircleShape).background(KeyboardDisc), 40.dp) { vm.textStyleOpen = false }Spacer(Modifier.width(13.dp))@@ -268,26 +275,27 @@ private fun TextStyleSheet(vm: CanvasViewModel, info: TextInfo) {// wide (landscape), the four cards side by side; narrow, Typeface or Design, switched belowBoxWithConstraints(Modifier.fillMaxWidth().weight(1f)) {val wide = maxWidth >= WIDE_SHEET- Row(Modifier.fillMaxSize().padding(horizontal = if (wide) 9.dp else 3.dp)) {+ Row(Modifier.fillMaxSize().padding(horizontal = 10.dp)) {if (wide) {- FontCard(vm, info, Modifier.weight(264f))+ FontCard(vm, info, Modifier.weight(263.5f))Spacer(Modifier.width(2.dp))- StyleCard(vm, info, Modifier.weight(184f))- Spacer(Modifier.width(8.dp))- DesignCard(vm, info, Modifier.weight(326f))- Spacer(Modifier.width(8.dp))+ StyleCard(vm, info, Modifier.weight(184.5f))+ Spacer(Modifier.width(5.dp))+ DesignCard(vm, info, Modifier.weight(328f))+ Spacer(Modifier.width(5.dp))AttributesCard(vm, info, Modifier.weight(325f), wide = true)} else if (page == 0) {- FontCard(vm, info, Modifier.weight(417f))+ FontCard(vm, info, Modifier.weight(424.5f))Spacer(Modifier.width(2.dp))- StyleCard(vm, info, Modifier.weight(296f))+ StyleCard(vm, info, Modifier.weight(297.5f))} else {- DesignCard(vm, info, Modifier.weight(598f))- Spacer(Modifier.width(10.dp))- AttributesCard(vm, info, Modifier.weight(130f), wide = false)+ DesignCard(vm, info, Modifier.weight(584f))+ Spacer(Modifier.width(5.dp))+ AttributesCard(vm, info, Modifier.weight(135f), wide = false)}}}+ if (sheetWide) Spacer(Modifier.height(33.dp))// Typeface | Design, when the cards don't all fitif (!sheetWide) Box(Modifier.fillMaxWidth().height(81.dp).background(SheetFill)) {Row(@@ -312,8 +320,9 @@ private val WIDE_SHEET = 900.dp@Composableprivate fun FontCard(vm: CanvasViewModel, info: TextInfo, modifier: Modifier) {- Card("Font", modifier) {- LazyColumn(Modifier.padding(horizontal = 7.dp), verticalArrangement = Arrangement.spacedBy(9.dp)) {+ // Font and Style are one card split by a line: square where they meet+ Card("Font", modifier, RoundedCornerShape(topStart = CardCorner, bottomStart = CardCorner)) {+ LazyColumn(Modifier.padding(start = 10.dp, end = 17.dp), contentPadding = PaddingValues(top = 6.dp), verticalArrangement = Arrangement.spacedBy(9.dp)) {items(TextRenderer.families) { f ->Cell(f.name, f.family == info.font, TextRenderer.typeface(f.family, "Regular")) { vm.changeText { it.copy(font = f.family) } }}@@ -323,8 +332,8 @@ private fun FontCard(vm: CanvasViewModel, info: TextInfo, modifier: Modifier) {@Composableprivate fun StyleCard(vm: CanvasViewModel, info: TextInfo, modifier: Modifier) {- Card("Style", modifier) {- LazyColumn(Modifier.padding(horizontal = 7.dp), verticalArrangement = Arrangement.spacedBy(9.dp)) {+ Card("Style", modifier, RoundedCornerShape(topEnd = CardCorner, bottomEnd = CardCorner)) {+ LazyColumn(Modifier.padding(start = 10.dp, end = 17.dp), contentPadding = PaddingValues(top = 6.dp), verticalArrangement = Arrangement.spacedBy(9.dp)) {items(TextRenderer.styles) { st ->Cell(st.name, st.name == info.style, TextRenderer.typeface(info.font, st.name)) { vm.changeText { it.copy(style = st.name) } }}@@ -337,7 +346,7 @@ private fun DesignCard(vm: CanvasViewModel, info: TextInfo, modifier: Modifier)val dpi = vm.canvasDpi()val pt = { px: Float -> px * 72f / dpi }Card("Design", modifier) {- Column(Modifier.padding(horizontal = 5.dp)) {+ Column(Modifier.padding(horizontal = 4.dp)) {DesignRow("Size", sizeToSlider(info.size), "%.1fpt".format(pt(info.size)), fromMiddle = false) { v -> vm.changeText { it.copy(size = sliderToSize(v)) } }DesignRow("Kerning", info.kerning / 2f + 0.5f, "%.1f%%".format(info.kerning * 100f)) { v -> vm.changeText { it.copy(kerning = v * 2f - 1f) } }DesignRow("Tracking", info.tracking / 2f + 0.5f, "%.1f%%".format(info.tracking * 100f)) { v -> vm.changeText { it.copy(tracking = v * 2f - 1f) } }@@ -358,27 +367,33 @@ private fun AttributesCard(vm: CanvasViewModel, info: TextInfo, modifier: ModifiTextAlignment.LEFT to PcIcons.AlignLeft, TextAlignment.CENTER to PcIcons.AlignCenter,TextAlignment.RIGHT to PcIcons.AlignRight, TextAlignment.JUSTIFY to PcIcons.AlignJustify,)+ // the buttons 36 tall, but the alignments 35 when two by two+ val gridTall = if (wide) 36.dp else 35.dpCard("Attributes", modifier) {- Column(Modifier.padding(horizontal = if (wide) 9.dp else 4.dp), verticalArrangement = Arrangement.spacedBy(if (wide) 19.dp else 2.dp)) {+ Column(+ Modifier.padding(start = if (wide) 10.dp else 6.5.dp, end = if (wide) 10.dp else 6.5.dp, top = if (wide) 6.dp else 7.dp),+ verticalArrangement = Arrangement.spacedBy(if (wide) 20.dp else 4.dp),+ ) {for (row in aligns.chunked(if (wide) 4 else 2)) {- Row(horizontalArrangement = Arrangement.spacedBy(3.dp)) {- for ((a, icon) in row) Attribute(icon, a.name, info.align == a, Modifier.weight(1f), 32.dp) { vm.changeText { it.copy(align = a) } }+ Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {+ for ((a, icon) in row) Attribute(icon, a.name, info.align == a, Modifier.weight(1f), 32.dp, gridTall) { vm.changeText { it.copy(align = a) } }}}- if (!wide) Spacer(Modifier.height(14.dp))+ if (!wide) Spacer(Modifier.height(13.dp))val looks: @Composable (Modifier, Modifier, Modifier) -> Unit = { u, o, v ->- Attribute(PcIcons.TextUnderline, "Underline", info.underline, u, 38.dp) { vm.changeText { it.copy(underline = !it.underline) } }- Attribute(PcIcons.TextOutline, "Outline", info.outline, o, 38.dp) { vm.changeText { it.copy(outline = !it.outline) } }- Attribute(PcIcons.TextVertical, "Vertical", info.vertical, v, 41.dp) { vm.changeText { it.copy(vertical = !it.vertical) } }+ Attribute(PcIcons.TextUnderline, "Underline", info.underline, u, 38.dp, 36.dp) { vm.changeText { it.copy(underline = !it.underline) } }+ Attribute(PcIcons.TextOutline, "Outline", info.outline, o, 38.dp, 36.dp) { vm.changeText { it.copy(outline = !it.outline) } }+ Attribute(PcIcons.TextVertical, "Vertical", info.vertical, v, 41.dp, 36.dp) { vm.changeText { it.copy(vertical = !it.vertical) } }}if (wide) {- Row(horizontalArrangement = Arrangement.spacedBy(3.dp)) { looks(Modifier.weight(94f), Modifier.weight(94f), Modifier.weight(111f)) }+ Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) { looks(Modifier.weight(94f), Modifier.weight(94f), Modifier.weight(111f)) }} else {looks(Modifier.fillMaxWidth(), Modifier.fillMaxWidth(), Modifier.fillMaxWidth())Spacer(Modifier.height(16.dp))}- Row(Modifier.clickable { vm.changeText { it.copy(allCaps = !it.allCaps) } }, verticalAlignment = Alignment.CenterVertically) {- Text("TT", color = Color.White, fontSize = 20.sp, fontWeight = FontWeight.Bold, modifier = Modifier.padding(start = 8.dp).width(48.dp))+ Row(Modifier.padding(top = if (wide) 4.dp else 0.dp).clickable { vm.changeText { it.copy(allCaps = !it.allCaps) } }, verticalAlignment = Alignment.CenterVertically) {+ // two serif capitals all but touching+ Text("TT", color = Color.White, fontSize = 26.5.sp, fontFamily = FontFamily.Serif, letterSpacing = (-0.5).sp, modifier = Modifier.padding(start = 10.dp).width(50.5.dp))if (wide) Spacer(Modifier.weight(1f))Switch(info.allCaps, enabled = true)}@@ -395,9 +410,9 @@ private fun SheetIcon(icon: ImageVector, label: String, modifier: Modifier, icon}@Composable-private fun Card(title: String, modifier: Modifier, content: @Composable ColumnScope.() -> Unit) {- Column(modifier.fillMaxHeight().clip(RoundedCornerShape(bottomStart = 12.dp, bottomEnd = 12.dp)).background(CardFill)) {- Text(title, color = Color.White, fontSize = 17.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.padding(start = 17.dp, top = 14.dp, bottom = 9.dp))+private fun Card(title: String, modifier: Modifier, shape: RoundedCornerShape = RoundedCornerShape(CardCorner), content: @Composable ColumnScope.() -> Unit) {+ Column(modifier.fillMaxHeight().clip(shape).background(CardFill)) {+ Text(title, color = Color.White, fontSize = 17.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.padding(start = 20.dp, top = 16.5.dp, bottom = 9.dp))content()}}@@ -416,9 +431,9 @@ private fun Cell(name: String, selected: Boolean, face: android.graphics.Typefac/** An attribute's button: its icon, blue when on. */@Composable-private fun Attribute(icon: ImageVector, label: String, on: Boolean, modifier: Modifier, iconSize: Dp, onClick: () -> Unit) {+private fun Attribute(icon: ImageVector, label: String, on: Boolean, modifier: Modifier, iconSize: Dp, tall: Dp, onClick: () -> Unit) {Box(- modifier.height(37.dp).clip(RoundedCornerShape(8.dp)).background(if (on) Pc.Accent else ButtonFill).clickable(onClick = onClick),+ modifier.height(tall).clip(RoundedCornerShape(8.dp)).background(if (on) Pc.Accent else ButtonFill).clickable(onClick = onClick),contentAlignment = Alignment.Center,) {Icon(icon, contentDescription = label, tint = Color.White, modifier = Modifier.requiredSize(iconSize))@@ -430,7 +445,7 @@ private fun Attribute(icon: ImageVector, label: String, on: Boolean, modifier: Mprivate fun DesignRow(label: String, value: Float, shown: String, fromMiddle: Boolean = true, onChange: (Float) -> Unit) {val change by rememberUpdatedState(onChange)Column(Modifier.fillMaxWidth().height(58.5.dp).padding(horizontal = 16.dp)) {- Row(Modifier.fillMaxWidth().padding(top = 6.dp), verticalAlignment = Alignment.CenterVertically) {+ Row(Modifier.fillMaxWidth().padding(top = 1.5.dp), verticalAlignment = Alignment.CenterVertically) {Text(label, color = Color.White, fontSize = 15.sp, modifier = Modifier.weight(1f))Box(Modifier.height(24.dp).clip(CircleShape).background(ButtonFill).padding(horizontal = 10.dp), contentAlignment = Alignment.Center) {Text(shown, color = Color.White, fontSize = 13.sp)diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Theme.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Theme.ktindex 15c5e35..6e4e76f 100644--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Theme.kt+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Theme.kt@@ -83,8 +83,8 @@ object Pc {val MenuFill: Color get() = pick(0xFF5A5C5B, 0xFFF0F0F0)/** The small frosted menus: over the canvas what is behind shows through, blurred. */val GlassMenu: Color get() = pick(0xCF313135, 0xFAF0F0F0)- /** A small menu over a panel: the panel can't show through blurred, so it is nearly solid. */- val GlassMenuOverPanel: Color get() = pick(0xFA1F232A, 0xFAF0F0F0)+ /** A small menu over a panel: the panel can't show through blurred, so it is nearly solid, grey. */+ val GlassMenuOverPanel: Color get() = pick(0xFA222222, 0xFAF0F0F0)val GlassMenuEdge: Color get() = pick(0x24FFFFFF, 0x14000000)val RadioRing: Color get() = pick(0xFF606060, 0xFFB0B0B0)val MenuDanger: Color get() = pick(0xFFE84F51, 0xFFD93A3D)