From 62e489f583364f0bda1e48774e9576b393f4ba26 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 21 Feb 2025 17:50:10 +0800 Subject: [PATCH] hello: use platform-neutral ux-api instead of graphics-server --- apps/hello/Cargo.toml | 3 ++- apps/hello/src/main.rs | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/hello/Cargo.toml b/apps/hello/Cargo.toml index 99df09b22..4ce1c8614 100644 --- a/apps/hello/Cargo.toml +++ b/apps/hello/Cargo.toml @@ -12,7 +12,8 @@ xous-ipc = "0.10.4" log-server = { package = "xous-api-log", version = "0.1.63" } xous-names = { package = "xous-api-names", version = "0.9.65" } gam = { path = "../../services/gam" } -graphics-server = { path = "../../services/graphics-server" } +ux-api = { path = "../../libs/ux-api" } +blitstr2 = { path = "../../libs/blitstr2" } locales = { path = "../../locales" } tts-frontend = { path = "../../services/tts" } diff --git a/apps/hello/src/main.rs b/apps/hello/src/main.rs index ac78892fa..561246591 100644 --- a/apps/hello/src/main.rs +++ b/apps/hello/src/main.rs @@ -3,12 +3,13 @@ use core::fmt::Write; -use graphics_server::api::GlyphStyle; -use graphics_server::{DrawStyle, Gid, PixelColor, Point, Rectangle, TextBounds, TextView}; +use blitstr2::GlyphStyle; use locales::t; use num_traits::*; #[cfg(feature = "tts")] use tts_frontend::*; +use ux_api::minigfx::*; +use ux_api::service::api::Gid; /// Basic 'Hello World!' application that draws a simple /// TextView to the screen.