mirror of
https://github.com/storytold/figcraft.git
synced 2026-11-17 07:45:46 +00:00
Reuse shared Android drawable wire primitives
This commit is contained in:
Generated
+9
@@ -1200,6 +1200,14 @@ dependencies = [
|
||||
"zip 9.1.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "craft-vectordrawable"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=d13ac58a15c45d618f25910772502e38c4ce1d4c#d13ac58a15c45d618f25910772502e38c4ce1d4c"
|
||||
dependencies = [
|
||||
"kurbo",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "craft-web-api"
|
||||
version = "0.1.0"
|
||||
@@ -2194,6 +2202,7 @@ dependencies = [
|
||||
name = "figcraft-vectordrawable"
|
||||
version = "0.18.1"
|
||||
dependencies = [
|
||||
"craft-vectordrawable",
|
||||
"figcraft-color",
|
||||
"figcraft-doc",
|
||||
"figcraft-geom",
|
||||
|
||||
@@ -13,6 +13,7 @@ rust-version = "1.95"
|
||||
repository = "https://github.com/storytold/figcraft"
|
||||
|
||||
[workspace.dependencies]
|
||||
craft-vectordrawable = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "d13ac58a15c45d618f25910772502e38c4ce1d4c" }
|
||||
# internal
|
||||
figcraft-geom = { path = "crates/geom" }
|
||||
figcraft-color = { path = "crates/color" }
|
||||
|
||||
@@ -9,6 +9,7 @@ description = "FigCraft Android Vector Drawable export (shapes, strokes, gradien
|
||||
workspace = true
|
||||
|
||||
[dependencies]
|
||||
craft-vectordrawable.workspace = true
|
||||
figcraft-geom = { workspace = true }
|
||||
figcraft-color = { workspace = true }
|
||||
figcraft-doc = { workspace = true }
|
||||
|
||||
@@ -5,48 +5,14 @@
|
||||
use std::fmt::Write as _;
|
||||
|
||||
use figcraft_color::Color;
|
||||
use figcraft_geom::BezPath;
|
||||
use figcraft_geom::kurbo::PathEl;
|
||||
|
||||
use crate::model::{Fill, GradKind, GroupItem, Item, ItemKind, NativeStroke, PathItem};
|
||||
|
||||
const ANDROID: &str = "http://schemas.android.com/apk/res/android";
|
||||
const AAPT: &str = "http://schemas.android.com/aapt";
|
||||
|
||||
/// A number as Android reads it: rounded to 3 decimals, no trailing zeros, `0` for anything
|
||||
/// non-finite (the walk leaves out shapes whose numbers aren't finite).
|
||||
pub(crate) fn num(v: f64) -> String {
|
||||
if !v.is_finite() {
|
||||
return "0".into();
|
||||
}
|
||||
// Android reads these as 32-bit floats, so clamp to that range; this also keeps the scaling
|
||||
// below from overflowing to infinity.
|
||||
let v = v.clamp(-f64::from(f32::MAX), f64::from(f32::MAX));
|
||||
let r = (v * 1000.0).round() / 1000.0;
|
||||
let s = format!("{r}");
|
||||
if s == "-0" { "0".into() } else { s }
|
||||
}
|
||||
|
||||
/// `s` for an attribute value: markup escaped, whitespace that parsers would fold kept as
|
||||
/// character references, and characters XML 1.0 forbids dropped.
|
||||
pub(crate) fn esc(s: &str) -> String {
|
||||
let mut out = String::with_capacity(s.len());
|
||||
for c in s.chars() {
|
||||
match c {
|
||||
'&' => out.push_str("&"),
|
||||
'<' => out.push_str("<"),
|
||||
'>' => out.push_str(">"),
|
||||
'"' => out.push_str("""),
|
||||
'\'' => out.push_str("'"),
|
||||
'\t' => out.push_str("	"),
|
||||
'\n' => out.push_str(" "),
|
||||
'\r' => out.push_str(" "),
|
||||
c if (c as u32) < 0x20 || c == '\u{FFFE}' || c == '\u{FFFF}' => {}
|
||||
c => out.push(c),
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
// Shared wire primitives; app-specific drawable projection and colour policy stay here.
|
||||
pub(crate) use craft_vectordrawable::write::{esc, num, path_data};
|
||||
|
||||
/// `#RRGGBB`, or `#AARRGGBB` when not opaque.
|
||||
pub(crate) fn color(c: Color) -> String {
|
||||
@@ -54,33 +20,6 @@ pub(crate) fn color(c: Color) -> String {
|
||||
if a == 255 { format!("#{r:02X}{g:02X}{b:02X}") } else { format!("#{a:02X}{r:02X}{g:02X}{b:02X}") }
|
||||
}
|
||||
|
||||
/// SVG path syntax, absolute commands.
|
||||
pub(crate) fn path_data(p: &BezPath) -> String {
|
||||
let mut s = String::new();
|
||||
let pt = |x: f64, y: f64| format!("{},{}", num(x), num(y));
|
||||
for el in p.elements() {
|
||||
if !s.is_empty() {
|
||||
s.push(' ');
|
||||
}
|
||||
match *el {
|
||||
PathEl::MoveTo(a) => {
|
||||
let _ = write!(s, "M{}", pt(a.x, a.y));
|
||||
}
|
||||
PathEl::LineTo(a) => {
|
||||
let _ = write!(s, "L{}", pt(a.x, a.y));
|
||||
}
|
||||
PathEl::QuadTo(a, b) => {
|
||||
let _ = write!(s, "Q{} {}", pt(a.x, a.y), pt(b.x, b.y));
|
||||
}
|
||||
PathEl::CurveTo(a, b, c) => {
|
||||
let _ = write!(s, "C{} {} {}", pt(a.x, a.y), pt(b.x, b.y), pt(c.x, c.y));
|
||||
}
|
||||
PathEl::ClosePath => s.push('Z'),
|
||||
}
|
||||
}
|
||||
s
|
||||
}
|
||||
|
||||
struct Out {
|
||||
s: String,
|
||||
}
|
||||
@@ -244,3 +183,29 @@ fn path(o: &mut Out, depth: usize, p: &PathItem) {
|
||||
o.close(depth + 1, "aapt:attr");
|
||||
o.close(depth, "path");
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod shared_wire_tests {
|
||||
use super::*;
|
||||
use figcraft_geom::BezPath;
|
||||
|
||||
#[test]
|
||||
fn shared_attributes_preserve_exact_xml() {
|
||||
assert_eq!(esc("<&>\"'\t\n\r\0\u{ffff}é𝄞	"), "<&>"'	 é𝄞&#9;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shared_numbers_and_paths_preserve_android_syntax() {
|
||||
assert_eq!(num(-0.0001), "0");
|
||||
assert_eq!(num(f64::NAN), "0");
|
||||
assert_eq!(num(f64::INFINITY), "0");
|
||||
assert_eq!(num(1.23456), "1.235");
|
||||
let mut p = BezPath::new();
|
||||
p.move_to((0.0, -0.0));
|
||||
p.line_to((1.23456, 2.0));
|
||||
p.quad_to((3.0, 4.0), (5.0, 6.0));
|
||||
p.curve_to((7.0, 8.0), (9.0, 10.0), (11.0, 12.0));
|
||||
p.close_path();
|
||||
assert_eq!(path_data(&p), "M0,0 L1.235,2 Q3,4 5,6 C7,8 9,10 11,12 Z");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user