Skip to content

ProCraft for Android: An Android native painting app written in Rust

Rust

fix(ui): popup text sizes and screen sweep fixes

Josh88467f6ad11b
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasSurfaceView.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasSurfaceView.kt
index 373972a..16683bc 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasSurfaceView.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasSurfaceView.kt
@@ -333,6 +333,7 @@ class CanvasSurfaceView(context: Context, private val vm: CanvasViewModel) : Sur
else -> half to half
}
s.setGridOrigin(x, y)
+ vm.gridOrigin = Offset(x, y)
}
/**
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt
index c22418e..4e24eb6 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt
@@ -1682,6 +1682,9 @@ class CanvasViewModel(app: Application) : AndroidViewModel(app) {
/** Gesture controls is open. */
var gestureControlsOpen by mutableStateOf(false)
+ /** Where the middle of one of the surround grid's lines falls (window pixels), for screens drawn over the canvas. */
+ var gridOrigin by mutableStateOf<androidx.compose.ui.geometry.Offset?>(null)
+
/** The page Gesture controls was last on: it opens there again. */
var gesturePage by mutableStateOf(GesturePurpose.EYEDROPPER)
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.kt
index 9305aa7..7f636ee 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
@@ -88,6 +88,9 @@ private class Slide(val label: String, val value: String, val fraction: Float, v
private enum class ActionsPage { TABS, PRESSURE, CURSOR }
private val CurveFill = Color(0xFF262626)
+
+/** Advanced cursor's section headings: bold, as large as the rows, lighter than the tabs' names. */
+private val CursorHeading get() = if (Pc.light) Pc.TabIdle else Color(0xFFB5B5B5)
private val CurveEdge = Color(0xFF666666)
private val CurveGrid = Color(0xFF353535)
@@ -457,7 +460,8 @@ private fun modelGroups(
@Composable
private fun ChoiceMenu(look: Modifier, choices: List<String>, chosen: Int, offsetY: Dp, onPick: (Int) -> Unit, onDismiss: () -> Unit) {
val density = androidx.compose.ui.platform.LocalDensity.current
- androidx.compose.ui.window.Popup(
+ PcPopup(
+ textScale = MATCHED_POPUP_TEXT,
alignment = Alignment.TopEnd,
offset = with(density) { androidx.compose.ui.unit.IntOffset(130.dp.roundToPx(), offsetY.roundToPx()) },
onDismissRequest = onDismiss,
@@ -487,11 +491,11 @@ private fun CursorPage(vm: CanvasViewModel, onBack: () -> Unit) {
Text("Advanced cursor", color = Pc.PanelTitle, fontSize = 22.sp, fontWeight = FontWeight.Bold, maxLines = 1)
}
Column(Modifier.padding(start = 12.dp, end = 12.dp, top = 8.dp, bottom = 13.dp)) {
- Text("Brush cursor visibility", color = Pc.TabIdle, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.padding(start = 14.dp, top = 6.dp, bottom = 8.dp))
+ Text("Brush cursor visibility", color = CursorHeading, fontSize = 17.sp, fontWeight = FontWeight.Bold, modifier = Modifier.padding(start = 14.dp, top = 6.dp, bottom = 8.dp))
ChoiceGroup(listOf("Show while hovering", "Show while painting", "Show both"), vm.cursorShows.ordinal) {
vm.changeCursorShows(CanvasViewModel.CursorShows.entries[it])
}
- Text("Brush outline style", color = Pc.TabIdle, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.padding(start = 14.dp, top = 18.dp, bottom = 8.dp))
+ Text("Brush outline style", color = CursorHeading, fontSize = 17.sp, fontWeight = FontWeight.Bold, modifier = Modifier.padding(start = 14.dp, top = 28.dp, bottom = 8.dp))
ChoiceGroup(listOf("High contrast", "Active color", "Per brush"), vm.cursorStyle.ordinal) {
vm.changeCursorStyle(CanvasViewModel.CursorStyle.entries[it])
}
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AdjustmentsUi.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AdjustmentsUi.kt
index b18a335..8b4ec37 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AdjustmentsUi.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AdjustmentsUi.kt
@@ -525,7 +525,8 @@ private fun GradientEditor(vm: CanvasViewModel, index: Int) {
val tip = barAt.y + with(density) { (22.dp - StopSize / 2).toPx() }
// room round it for its shadow to fade out in
val room = with(density) { PopupShadowRoom.toPx() }
- androidx.compose.ui.window.Popup(
+ PcPopup(
+ textScale = MATCHED_POPUP_TEXT,
popupPositionProvider = object : androidx.compose.ui.window.PopupPositionProvider {
override fun calculatePosition(
anchorBounds: androidx.compose.ui.unit.IntRect,
@@ -1017,7 +1018,7 @@ fun NoisePanel(vm: CanvasViewModel, modifier: Modifier = Modifier) {
MoreButton("Channel") {
OptionsGroup {
Row(Modifier.fillMaxWidth().height(44.dp).padding(start = 12.dp, end = 8.dp), verticalAlignment = Alignment.CenterVertically) {
- Text("Additive", color = MenuText, fontSize = 17.sp, maxLines = 1, modifier = Modifier.weight(1f))
+ Text("Additive", color = MenuText, fontSize = 15.sp, maxLines = 1, modifier = Modifier.weight(1f))
Box(Modifier.tap { vm.toggleNoiseAdded() }) { Switch(vm.noiseAdded, enabled = true) }
}
}
@@ -1109,14 +1110,14 @@ private fun MoreButton(title: String, content: @Composable androidx.compose.foun
}
if (open) {
val lift = with(androidx.compose.ui.platform.LocalDensity.current) { (40.dp + 16.dp).roundToPx() }
- androidx.compose.ui.window.Popup(
+ PcPopup(
alignment = Alignment.BottomCenter,
offset = androidx.compose.ui.unit.IntOffset(0, -lift),
onDismissRequest = { open = false },
properties = androidx.compose.ui.window.PopupProperties(focusable = true),
) {
Column(Modifier.width(260.dp).clip(RoundedCornerShape(26.dp)).background(OptionsMenuFill).padding(start = 10.dp, end = 10.dp, bottom = 10.dp)) {
- Text(title, color = MenuText, fontSize = 22.sp, fontWeight = FontWeight.Bold, maxLines = 1, modifier = Modifier.padding(start = 12.dp, top = 16.dp, bottom = 16.dp))
+ Text(title, color = MenuText, fontSize = 23.sp, fontWeight = FontWeight.Bold, maxLines = 1, modifier = Modifier.padding(start = 12.dp, top = 16.dp, bottom = 16.dp))
content { open = false }
}
}
@@ -1138,7 +1139,7 @@ private fun OptionsChoice(label: String, chosen: Boolean, height: Dp, first: Boo
Modifier.fillMaxWidth().height(height).background(if (chosen) Pc.Accent else Color.Transparent).tap(onClick = onChoose).padding(start = 12.dp, end = 14.dp),
verticalAlignment = Alignment.CenterVertically,
) {
- Text(label, color = if (chosen) Color.White else MenuText, fontSize = 17.sp, maxLines = 1, modifier = Modifier.weight(1f))
+ Text(label, color = if (chosen) Color.White else MenuText, fontSize = 15.sp, maxLines = 1, modifier = Modifier.weight(1f))
if (chosen) Icon(PcIcons.Tick, contentDescription = null, tint = Color.White, modifier = Modifier.size(20.dp))
}
}
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.kt
index feeae07..49d685d 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
@@ -36,7 +36,6 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Popup
import androidx.compose.ui.window.PopupProperties
// buttons keep their width and the panel grows with them: 428 across for two, 632 for three
@@ -83,7 +82,8 @@ fun <T : Any> Alert(
@Suppress("UNCHECKED_CAST")
val kept = last[0] as T? ?: return
if (shown <= 0f) return
- Popup(
+ PcPopup(
+ textScale = MATCHED_POPUP_TEXT,
alignment = Alignment.Center,
onDismissRequest = { if (value != null) onCancel() },
properties = PopupProperties(focusable = value != null, clippingEnabled = false),
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/BrushLibrary.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/BrushLibrary.kt
index d655918..68667d1 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/BrushLibrary.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/BrushLibrary.kt
@@ -80,7 +80,6 @@ import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Popup
import androidx.compose.ui.window.PopupPositionProvider
import androidx.compose.ui.window.PopupProperties
import io.github.artcraftandroid.procraft.canvas.CanvasViewModel
@@ -376,7 +375,8 @@ fun BrushLibrary(vm: CanvasViewModel, arrowX: Dp, modifier: Modifier = Modifier)
val below = with(density) { MenuTop.roundToPx() }
// the icons to choose from, beside the menu on its left
MenuPresence(setMenu == i && iconPicker, androidx.compose.ui.graphics.TransformOrigin(1f, 0.5f)) { look ->
- Popup(
+ PcPopup(
+ textScale = MATCHED_POPUP_TEXT,
popupPositionProvider = MenuPlace(below) { a, size -> IntOffset(a.left - left - size.width + with(density) { 6.dp.roundToPx() }, a.center.y - size.height / 2 + with(density) { 40.dp.roundToPx() }) },
onDismissRequest = { iconPicker = false },
) {
@@ -612,7 +612,7 @@ internal fun LibraryMenu(
content: @Composable ColumnScope.() -> Unit,
) {
MenuPresence(open, origin) { look ->
- Popup(popupPositionProvider = place, onDismissRequest = onDismiss, properties = PopupProperties(focusable = true)) {
+ PcPopup(textScale = MATCHED_POPUP_TEXT, popupPositionProvider = place, onDismissRequest = onDismiss, properties = PopupProperties(focusable = true)) {
val shape = RoundedCornerShape(16.dp)
// frosted over the canvas; over the library itself, nearly solid
val glass = if (overPanel) Modifier.background(Pc.GlassMenuOverPanel) else rememberFrost(16.dp).background(Pc.GlassMenu)
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/BrushStudio.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/BrushStudio.kt
index b6b6506..783340a 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/BrushStudio.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/BrushStudio.kt
@@ -405,7 +405,7 @@ private fun BlendModeList(modes: List<io.github.artcraftandroid.procraft.core.Bl
}
}
}
- androidx.compose.ui.window.Popup(popupPositionProvider = place, onDismissRequest = { onDone(null) }, properties = androidx.compose.ui.window.PopupProperties(focusable = true)) {
+ PcPopup(textScale = MATCHED_POPUP_TEXT, popupPositionProvider = place, onDismissRequest = { onDone(null) }, properties = androidx.compose.ui.window.PopupProperties(focusable = true)) {
androidx.compose.foundation.lazy.LazyColumn(
Modifier.size(ModeListWidth, height).shadow(24.dp, RoundedCornerShape(13.dp)).clip(RoundedCornerShape(13.dp)).background(ModeListFill),
state = list,
@@ -905,14 +905,24 @@ internal fun StudioSlider(label: String, value: Float, shown: Shown, most: Float
val change by rememberUpdatedState(onChange)
val current by rememberUpdatedState(value)
val both = shown == Shown.BOTH || shown == Shown.FOLLOW || shown == Shown.GRADE
+ // a tap on the value types it on a keypad beside it (the pill blue meanwhile)
+ val typed = typedNumber(shown)
+ var typing by remember { mutableStateOf(false) }
+ var pill by remember { mutableStateOf(androidx.compose.ui.geometry.Rect.Zero) }
Column(Modifier.fillMaxWidth().height(55.dp)) {
// the name and value 2 below the top half's middle
Row(Modifier.offset(y = 2.dp).fillMaxWidth().height(28.dp).padding(start = 10.dp, end = 3.5.dp), verticalAlignment = Alignment.CenterVertically) {
FittedLabel(label, Modifier.weight(1f).padding(end = 12.dp))
// as wide as its words need, 13 either side, and never narrower than 73
- Box(Modifier.height(28.dp).widthIn(min = 73.dp).clip(RoundedCornerShape(14.dp)).background(if (enabled) StudioPill else StudioPillOff).padding(horizontal = 13.dp),
- contentAlignment = Alignment.Center) {
- Text(shownValue(value, shown, most), color = if (enabled) StudioLabel else StudioValueOff, fontSize = 16.sp, maxLines = 1, softWrap = false)
+ Box(
+ Modifier.height(28.dp).widthIn(min = 73.dp).onGloballyPositioned { pill = it.boundsInWindow() }.clip(RoundedCornerShape(14.dp))
+ .background(if (typing) Pc.Accent else if (enabled) StudioPill else StudioPillOff)
+ .then(if (enabled && typed != null) Modifier.tap { typing = true } else Modifier)
+ .padding(horizontal = 13.dp),
+ contentAlignment = Alignment.Center,
+ ) {
+ Text(shownValue(value, shown, most), color = if (typing) Color.White else if (enabled) StudioLabel else StudioValueOff, fontSize = 16.sp, maxLines = 1, softWrap = false)
+ if (typing && typed != null) SliderKeypad(label, pill, typed.first, typed.second, { change(it) }) { typing = false }
}
}
Box(
@@ -953,6 +963,76 @@ internal fun StudioSlider(label: String, value: Float, shown: Shown, most: Float
}
}
+/**
+ * How a slider's value can be typed: the largest number and what a number makes of the value (a
+ * percent of the slider, or of its doubled scale); none for the others.
+ */
+private fun typedNumber(shown: Shown): Pair<Int, (Int) -> Float>? = when (shown) {
+ Shown.PERCENT, Shown.ZERO, Shown.TIP, Shown.MOVEMENT, Shown.ZOOM, Shown.CHARGE -> 100 to { n -> n / 100f }
+ Shown.DOUBLE, Shown.TWICE -> 200 to { n -> n / 200f }
+ else -> null
+}
+
+private val KeypadFill = Color(0xFFD5D5D5)
+private val KeypadKey = Color(0xFFE6E6E6)
+private val KeypadInk = Color(0xFF1D1D1D)
+private val KeypadWidth = 275.dp
+private val KeypadHeight = 360.dp
+
+/**
+ * A slider's keypad, a light popover to the right of its value ([pill], window pixels), its arrow
+ * at the value: the slider's name, then 7 8 9 / 4 5 6 / 1 2 3 / 0 and backspace (81 x 66 keys).
+ * Each key sets the value at once: the digits typed so far are the number (over [most], [most]);
+ * backspace takes the last one off (none left: nothing).
+ */
+@Composable
+private fun SliderKeypad(title: String, pill: androidx.compose.ui.geometry.Rect, most: Int, toValue: (Int) -> Float, onValue: (Float) -> Unit, onDismiss: () -> Unit) {
+ var text by remember { mutableStateOf("") }
+ fun type(next: String) {
+ val n = next.toIntOrNull()?.coerceAtMost(most) ?: 0
+ text = if (next.isEmpty()) "" else n.toString()
+ onValue(toValue(n))
+ }
+ val density = LocalDensity.current
+ val screen = with(density) { androidx.compose.ui.platform.LocalView.current.rootView.height.toDp() }
+ val (top, arrowAt) = with(density) {
+ val middle = (pill.top + pill.height / 2f).toDp()
+ val top = (middle - KeypadHeight / 2).coerceIn(2.dp, (screen - KeypadHeight - 2.dp).coerceAtLeast(2.dp))
+ top to (middle - top)
+ }
+ // the arrow's tip a little into the pill, the body 3 past its end
+ val offset = with(density) { androidx.compose.ui.unit.IntOffset((pill.width - (Pc.ArrowHeight - 3.dp).toPx()).roundToInt(), (top.toPx() - pill.top).roundToInt()) }
+ PcPopup(
+ offset = offset,
+ onDismissRequest = onDismiss,
+ properties = androidx.compose.ui.window.PopupProperties(focusable = true, clippingEnabled = false),
+ ) {
+ Popover(KeypadWidth, arrowAt, Modifier.height(KeypadHeight), fill = KeypadFill, corner = 22.dp, side = ArrowSide.LEFT) {
+ Text(title, color = KeypadInk, fontSize = 22.sp, fontWeight = FontWeight.Bold, maxLines = 1, modifier = Modifier.padding(start = 25.dp, top = 19.dp).height(51.dp))
+ Column(Modifier.padding(start = 12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
+ for (row in listOf(listOf("7", "8", "9"), listOf("4", "5", "6"), listOf("1", "2", "3"))) {
+ Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) { for (k in row) KeypadKey(k, 81.dp) { type(text + k) } }
+ }
+ Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
+ KeypadKey("0", 166.dp) { type(text + "0") }
+ KeypadKey("⌫", 81.dp) { type(text.dropLast(1)) }
+ }
+ }
+ }
+ }
+}
+
+@Composable
+private fun KeypadKey(label: String, width: Dp, onClick: () -> Unit) {
+ Box(Modifier.size(width, 66.dp).clip(RoundedCornerShape(12.dp)).background(KeypadKey).tap(onClick = onClick), contentAlignment = Alignment.Center) {
+ if (label == "⌫") {
+ Icon(PcIcons.Backspace, contentDescription = "Back space", tint = KeypadInk, modifier = Modifier.size(26.dp))
+ } else {
+ Text(label, color = KeypadInk, fontSize = 29.sp)
+ }
+ }
+}
+
/** A slider's name, 17 sp, made smaller (to 60%) when it would not fit beside the value. */
@Composable
private fun FittedLabel(label: String, modifier: Modifier) {
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.kt
index 421fe5e..c7aab0c 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
@@ -56,7 +56,6 @@ import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.input.pointer.PointerInputScope
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.window.Popup
import androidx.compose.ui.window.PopupProperties
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
@@ -564,7 +563,7 @@ private fun HarmonyKindButton(vm: CanvasViewModel) {
Text(vm.harmonyKind.label, color = Pc.PanelTitle, fontSize = 17.sp)
MenuPresence(open, androidx.compose.ui.graphics.TransformOrigin(1f, 0f)) { look ->
// the menu opens to the left of the panel, its top level with the wheel
- Popup(offset = with(LocalDensity.current) { IntOffset((-204).dp.roundToPx(), 36.dp.roundToPx()) }, properties = PopupProperties(focusable = true), onDismissRequest = { open = false }) {
+ PcPopup(textScale = MATCHED_POPUP_TEXT, offset = with(LocalDensity.current) { IntOffset((-204).dp.roundToPx(), 36.dp.roundToPx()) }, properties = PopupProperties(focusable = true), onDismissRequest = { open = false }) {
Column(look.width(195.dp).clip(RoundedCornerShape(24.dp)).background(Pc.MenuFill).padding(vertical = 9.dp)) {
for (kind in HarmonyKind.entries) {
Row(
@@ -1048,7 +1047,7 @@ private fun HexRow(rgb: Int, fill: Color = Pc.HexRow, field: Color = Pc.HexField
if (editing) {
// beside the panel, its middle level with this row
val gap = with(LocalDensity.current) { HexPadGap.roundToPx() }
- Popup(popupPositionProvider = remember(gap) { BesidePanel(gap) }, onDismissRequest = { typed = null }, properties = PopupProperties(focusable = true)) {
+ PcPopup(textScale = MATCHED_POPUP_TEXT, popupPositionProvider = remember(gap) { BesidePanel(gap) }, onDismissRequest = { typed = null }, properties = PopupProperties(focusable = true)) {
HexPad(
onKey = { c ->
// a seventh digit starts a new code
@@ -1200,7 +1199,7 @@ private fun ShortBottomMenu(vm: CanvasViewModel, history: Boolean, modifier: Mod
) {
MenuPresence(open, androidx.compose.ui.graphics.TransformOrigin(1f, 0f)) { look ->
// its right edge 16 left of the dots, its top 15 below them
- Popup(offset = with(LocalDensity.current) { IntOffset((-246).dp.roundToPx(), 32.dp.roundToPx()) }, properties = PopupProperties(focusable = true), onDismissRequest = { open = false }) {
+ PcPopup(textScale = MATCHED_POPUP_TEXT, offset = with(LocalDensity.current) { IntOffset((-246).dp.roundToPx(), 32.dp.roundToPx()) }, properties = PopupProperties(focusable = true), onDismissRequest = { open = false }) {
Column(
look.width(252.dp).clip(RoundedCornerShape(17.dp)).background(Pc.GlassMenuOverPanel)
.border(1.dp, Pc.GlassMenuEdge, RoundedCornerShape(17.dp)).padding(top = 6.dp, bottom = if (history) 9.5.dp else 7.dp),
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/GalleryScreen.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/GalleryScreen.kt
index f8af25a..41de9ba 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/GalleryScreen.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/GalleryScreen.kt
@@ -876,6 +876,8 @@ private fun StackCell(
@Composable
private fun ArtworkPreview(list: List<Artwork>, version: Int, onClose: () -> Unit) {
var index by remember { mutableIntStateOf(0) }
+ // a tap shows (or hides) the close button and the arrows to the other picked artworks
+ var controls by remember { mutableStateOf(false) }
val a = list.getOrNull(index) ?: return onClose()
BackHandler(onBack = onClose)
Box(
@@ -890,16 +892,59 @@ private fun ArtworkPreview(list: List<Artwork>, version: Int, onClose: () -> Uni
c.consume()
moved += dx
}
- }.pointerInput(Unit) { detectTapGestures { onClose() } },
+ }.pointerInput(Unit) { detectTapGestures { controls = !controls } },
contentAlignment = Alignment.Center,
) {
val image by produceState<ImageBitmap?>(null, a.dir.path, version) {
value = withContext(Dispatchers.IO) { BitmapFactory.decodeFile(a.thumbnail.path)?.asImageBitmap() }
}
image?.let { Image(it, contentDescription = a.name, contentScale = ContentScale.Fit, modifier = Modifier.fillMaxSize()) }
+ androidx.compose.animation.AnimatedVisibility(controls, Modifier.fillMaxSize(), enter = androidx.compose.animation.fadeIn(), exit = androidx.compose.animation.fadeOut()) {
+ Box(Modifier.fillMaxSize()) {
+ // a light disc with a black cross, 41 in from the top right
+ Box(
+ Modifier.align(Alignment.TopEnd).offset(x = (-41).dp + 22.dp, y = 22.dp - 22.dp).size(44.dp).clickable(onClick = onClose),
+ contentAlignment = Alignment.Center,
+ ) {
+ Box(Modifier.size(23.5.dp).clip(CircleShape).background(PreviewClose), contentAlignment = Alignment.Center) {
+ Icon(PcIcons.Cross, contentDescription = "Close", tint = Color.Black, modifier = Modifier.size(15.dp))
+ }
+ }
+ PreviewArrow(left = true, Modifier.align(Alignment.CenterStart)) { if (index > 0) index-- }
+ PreviewArrow(left = false, Modifier.align(Alignment.CenterEnd)) { if (index < list.size - 1) index++ }
+ }
+ }
}
}
+private val PreviewClose = Color(0xFFD7D7D7)
+private val PreviewArrowInk = Color(0xFFB4B4B4)
+
+/** One of Preview's arrows: a 13.5 x 23.5 chevron 40 in from its side, in a 44 wide touch area. */
+@Composable
+private fun PreviewArrow(left: Boolean, modifier: Modifier, onClick: () -> Unit) {
+ Box(
+ modifier.padding(start = if (left) 18.dp else 0.dp, end = if (left) 0.dp else 18.dp).size(44.dp, 60.dp).clickable(onClick = onClick)
+ .drawBehind {
+ // drawn a little larger than the 13.5 x 23.5 it shows (the stroke's edges soften)
+ val w = 14.5.dp.toPx()
+ val h = 25.5.dp.toPx()
+ val stroke = 4.dp.toPx()
+ val cx = size.width / 2f
+ val tip = if (left) cx - w / 2f + stroke / 2f else cx + w / 2f - stroke / 2f
+ val back = if (left) cx + w / 2f - stroke / 2f else cx - w / 2f + stroke / 2f
+ val top = size.height / 2f - h / 2f + stroke / 2f
+ val bottom = size.height / 2f + h / 2f - stroke / 2f
+ val path = androidx.compose.ui.graphics.Path().apply {
+ moveTo(back, top)
+ lineTo(tip, size.height / 2f)
+ lineTo(back, bottom)
+ }
+ drawPath(path, PreviewArrowInk, style = androidx.compose.ui.graphics.drawscope.Stroke(stroke, join = androidx.compose.ui.graphics.StrokeJoin.Miter))
+ },
+ )
+}
+
/**
* An artwork's thumbnail, as large as fits in its cell's box, with a soft shadow; while selecting,
* a circle at its top right ([chosen]: filled blue with a tick).
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/LayersPanel.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/LayersPanel.kt
index bbd55b7..0cc468e 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/LayersPanel.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/LayersPanel.kt
@@ -74,7 +74,6 @@ import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Popup
import androidx.compose.ui.window.PopupPositionProvider
import androidx.compose.ui.window.PopupProperties
import androidx.compose.ui.zIndex
@@ -857,7 +856,7 @@ private fun LayerOptions(open: Boolean, vm: CanvasViewModel, l: LayerInfo, rowY:
OptionsPlace(with(density) { (-183).dp.roundToPx() }, rowY, with(density) { OptionsTop.roundToPx() })
}
MenuPresence(open, androidx.compose.ui.graphics.TransformOrigin(1f, 0.5f)) { look ->
- Popup(popupPositionProvider = place, onDismissRequest = onDone, properties = PopupProperties(focusable = true)) {
+ PcPopup(textScale = MATCHED_POPUP_TEXT, popupPositionProvider = place, onDismissRequest = onDone, properties = PopupProperties(focusable = true)) {
// frosted over the canvas, as the library's menus are
Column(look.width(194.dp).clip(RoundedCornerShape(24.dp)).then(rememberFrost(24.dp)).background(Pc.GlassMenu).padding(vertical = 7.dp)) {
val then = { f: () -> Unit -> { f(); onDone() } }
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/SourceEditorUi.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/SourceEditorUi.kt
index ce600ff..53003a9 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/SourceEditorUi.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/SourceEditorUi.kt
@@ -55,7 +55,6 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Popup
import androidx.compose.ui.window.PopupProperties
import io.github.artcraftandroid.procraft.canvas.CanvasViewModel
import kotlin.math.roundToInt
@@ -208,7 +207,8 @@ private fun CapsuleButton(label: String, width: Int, on: Boolean = false, onClic
private fun ImportMenu(open: Boolean, onDismiss: () -> Unit, onPick: (Int) -> Unit) {
val density = androidx.compose.ui.platform.LocalDensity.current
MenuPresence(open, androidx.compose.ui.graphics.TransformOrigin(0.5f, 0f)) { look ->
- Popup(
+ PcPopup(
+ textScale = MATCHED_POPUP_TEXT,
alignment = Alignment.TopCenter,
offset = with(density) { androidx.compose.ui.unit.IntOffset(0, 48.dp.roundToPx()) },
onDismissRequest = onDismiss,
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/TimeLapseUi.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/TimeLapseUi.kt
index 3e6b0f8..22465f3 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/TimeLapseUi.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/TimeLapseUi.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import io.github.artcraftandroid.procraft.canvas.CanvasViewModel
@@ -33,6 +34,28 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.withContext
private val ReplayFill = Color(0xFF252525)
+private val GridLine = Color(0xFF2E2E2E)
+
+/**
+ * The surround's grid drawn as the canvas draws it (1 1/3 pt lines every 16, fixed to the glass
+ * from [origin], none under the top bar), for screens shown in the canvas's place.
+ */
+internal fun androidx.compose.ui.graphics.drawscope.DrawScope.surroundGrid(origin: androidx.compose.ui.geometry.Offset?) {
+ val step = 16.dp.toPx()
+ val width = (4f / 3f).dp.toPx()
+ val top = 44.dp.toPx()
+ val o = origin ?: androidx.compose.ui.geometry.Offset(0.5.dp.toPx(), 0.5.dp.toPx())
+ var x = o.x - kotlin.math.floor(o.x / step) * step
+ while (x < size.width) {
+ drawRect(GridLine, androidx.compose.ui.geometry.Offset(x - width / 2f, top), androidx.compose.ui.geometry.Size(width, size.height - top))
+ x += step
+ }
+ var y = o.y - kotlin.math.floor((o.y - top) / step) * step
+ while (y < size.height) {
+ if (y - width / 2f >= top) drawRect(GridLine, androidx.compose.ui.geometry.Offset(0f, y - width / 2f), androidx.compose.ui.geometry.Size(size.width, width))
+ y += step
+ }
+}
/**
* The time-lapse replayed over everything at its frame rate; dragging across the screen scrubs
@@ -58,7 +81,7 @@ fun TimeLapseReplay(vm: CanvasViewModel) {
if (image != null) shown = image
}
Box(
- Modifier.fillMaxSize().background(ReplayFill).pointerInput(count) {
+ Modifier.fillMaxSize().background(ReplayFill).drawBehind { surroundGrid(vm.gridOrigin) }.pointerInput(count) {
var start = 0f
var from = 0
detectHorizontalDragGestures(
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Type.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Type.kt
index 1271ecb..12cbbce 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Type.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Type.kt
@@ -77,3 +77,45 @@ fun ProCraftTheme(content: @Composable () -> Unit) {
)
}
}
+
+/**
+ * The text scale the popups made before [PcPopup] were matched to the reference at: they ran at
+ * the Legion's system font scale (0.85) then, so their sizes are set for it. Kept for them, now
+ * on any device.
+ */
+const val MATCHED_POPUP_TEXT = 0.85f
+
+/**
+ * A popup whose text keeps one size whatever the system font scale. A popup is a window of its
+ * own, composed with the system's font scale, so its text followed it where the rest of the
+ * interface doesn't; this hands it the theme's density, its text scaled by [textScale].
+ */
+@Composable
+fun PcPopup(
+ alignment: androidx.compose.ui.Alignment = androidx.compose.ui.Alignment.TopStart,
+ offset: androidx.compose.ui.unit.IntOffset = androidx.compose.ui.unit.IntOffset(0, 0),
+ onDismissRequest: (() -> Unit)? = null,
+ properties: androidx.compose.ui.window.PopupProperties = androidx.compose.ui.window.PopupProperties(),
+ textScale: Float = 1f,
+ content: @Composable () -> Unit,
+) {
+ val density = Density(LocalDensity.current.density, textScale)
+ androidx.compose.ui.window.Popup(alignment, offset, onDismissRequest, properties) {
+ CompositionLocalProvider(LocalDensity provides density, content = content)
+ }
+}
+
+/** [PcPopup] placed by a [popupPositionProvider]. */
+@Composable
+fun PcPopup(
+ popupPositionProvider: androidx.compose.ui.window.PopupPositionProvider,
+ onDismissRequest: (() -> Unit)? = null,
+ properties: androidx.compose.ui.window.PopupProperties = androidx.compose.ui.window.PopupProperties(),
+ textScale: Float = 1f,
+ content: @Composable () -> Unit,
+) {
+ val density = Density(LocalDensity.current.density, textScale)
+ androidx.compose.ui.window.Popup(popupPositionProvider, onDismissRequest, properties) {
+ CompositionLocalProvider(LocalDensity provides density, content = content)
+ }
+}