Skip to content

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

Rust

fix: the justification constants lint asks for, and a plain box where no constraints are read

Josh8d95aadbf7c2
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/TextRenderer.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/TextRenderer.kt
index 78aab2b..ddfd0a9 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/TextRenderer.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/TextRenderer.kt
@@ -116,7 +116,7 @@ object TextRenderer {
.setAlignment(align)
.setLineSpacing(t.leading * t.size, 1f)
.setIncludePad(false)
- .setJustificationMode(if (t.align == TextAlignment.JUSTIFY) Layout.JUSTIFICATION_MODE_INTER_WORD else Layout.JUSTIFICATION_MODE_NONE)
+ .setJustificationMode(if (t.align == TextAlignment.JUSTIFY) android.graphics.text.LineBreaker.JUSTIFICATION_MODE_INTER_WORD else android.graphics.text.LineBreaker.JUSTIFICATION_MODE_NONE)
.build()
}
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 d7ce7ed..de4a7a3 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
@@ -118,7 +118,7 @@ fun SourceEditor(vm: CanvasViewModel) {
// landscape: a page sliding over the studio from the right, its pages' card still showing
val landscape = LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE
Box(Modifier.fillMaxSize().pointerInput(Unit) { awaitEachGesture { awaitFirstDown().consume() } }) {
- BoxWithConstraints(
+ Box(
Modifier.fillMaxSize()
.then(if (landscape) Modifier.padding(start = 246.dp).clip(RoundedCornerShape(topStart = 20.dp, bottomStart = 20.dp)) else Modifier)
.background(EditorPage),