diff --git a/Cargo.toml b/Cargo.toml index db45a3f..4b17cbc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,3 +25,4 @@ env_logger = "0.10" serde = "1.0.207" libpt = { version = "0.6.0", features = ["cli"] } clap = { version = "4.5.15", features = ["derive"] } +image = "0.25.2" diff --git a/assets/favicon.ico b/assets/favicon.ico index 61ad031..66e7a88 100755 Binary files a/assets/favicon.ico and b/assets/favicon.ico differ diff --git a/assets/icon-1024.png b/assets/icon-1024.png deleted file mode 100644 index 1b5868a..0000000 Binary files a/assets/icon-1024.png and /dev/null differ diff --git a/assets/icon-256.jpg b/assets/icon-256.jpg new file mode 100644 index 0000000..d1bd12e Binary files /dev/null and b/assets/icon-256.jpg differ diff --git a/assets/icon-256.png b/assets/icon-256.png deleted file mode 100644 index ae72287..0000000 Binary files a/assets/icon-256.png and /dev/null differ diff --git a/assets/icon-512.jpg b/assets/icon-512.jpg new file mode 100644 index 0000000..abd6279 Binary files /dev/null and b/assets/icon-512.jpg differ diff --git a/assets/icon_ios_touch_192.png b/assets/icon_ios_touch_192.png deleted file mode 100644 index 8472802..0000000 Binary files a/assets/icon_ios_touch_192.png and /dev/null differ diff --git a/assets/manifest.json b/assets/manifest.json index 2a137fb..ba9727e 100644 --- a/assets/manifest.json +++ b/assets/manifest.json @@ -1,21 +1,15 @@ { - "name": "egui Template PWA", - "short_name": "egui-template-pwa", + "name": "Rollator PWA", + "short_name": "rollator-pwa", "icons": [ { - "src": "./icon-256.png", + "src": "./icon-256.jpg", "sizes": "256x256", "type": "image/png" }, { - "src": "./maskable_icon_x512.png", + "src": "./icon-512.jpg", "sizes": "512x512", - "type": "image/png", - "purpose": "any maskable" - }, - { - "src": "./icon-1024.png", - "sizes": "1024x1024", "type": "image/png" } ], diff --git a/assets/maskable_icon_x512.png b/assets/maskable_icon_x512.png deleted file mode 100644 index db8df3e..0000000 Binary files a/assets/maskable_icon_x512.png and /dev/null differ diff --git a/src/main.rs b/src/main.rs index 74fd3a8..131dd2b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,22 +1,32 @@ #![warn(clippy::all, rust_2018_idioms)] #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release +use eframe; +use egui; +use image; + mod app; // When compiling natively: #[cfg(not(target_arch = "wasm32"))] fn main() -> eframe::Result { + use egui::IconData; + env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`). + let icon = IconData { + rgba: image::load_from_memory(&include_bytes!("../assets/icon-512.jpg")[..]) + .expect("could not decode the bundled icon") + .to_rgba8() + .into_vec(), + width: 512, + height: 512, + }; let native_options = eframe::NativeOptions { viewport: egui::ViewportBuilder::default() .with_inner_size([400.0, 300.0]) .with_min_inner_size([300.0, 220.0]) - .with_icon( - // NOTE: Adding an icon is optional - eframe::icon_data::from_png_bytes(&include_bytes!("../assets/icon-256.png")[..]) - .expect("Failed to load icon"), - ), + .with_icon(icon), ..Default::default() }; eframe::run_native(