diff --git a/Cargo.toml b/Cargo.toml index 780c6af413d..94deb5828bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ opt-level = 3 codegen-units = 1 [workspace.package] -version = "0.2.2" +version = "0.2.1" rust-version = "1.73" [workspace.dependencies] diff --git a/ui/extra/images/AU-flag.png b/ui/extra/images/AU-flag.png deleted file mode 100644 index e5fb8046d84..00000000000 Binary files a/ui/extra/images/AU-flag.png and /dev/null differ diff --git a/ui/extra/images/BL-flag.png b/ui/extra/images/BL-flag.png deleted file mode 100644 index 1c9dbea7e4b..00000000000 Binary files a/ui/extra/images/BL-flag.png and /dev/null differ diff --git a/ui/extra/images/BR-flag.png b/ui/extra/images/BR-flag.png deleted file mode 100644 index 8e44628dd4e..00000000000 Binary files a/ui/extra/images/BR-flag.png and /dev/null differ diff --git a/ui/extra/images/DE-flag.png b/ui/extra/images/DE-flag.png deleted file mode 100644 index 69e8723f534..00000000000 Binary files a/ui/extra/images/DE-flag.png and /dev/null differ diff --git a/ui/extra/images/IN-flag.png b/ui/extra/images/IN-flag.png deleted file mode 100644 index 108f3f7c9e1..00000000000 Binary files a/ui/extra/images/IN-flag.png and /dev/null differ diff --git a/ui/extra/images/IT-flag.png b/ui/extra/images/IT-flag.png deleted file mode 100644 index ae19e96b2a7..00000000000 Binary files a/ui/extra/images/IT-flag.png and /dev/null differ diff --git a/ui/extra/images/JP-flag.png b/ui/extra/images/JP-flag.png deleted file mode 100644 index b79f2333473..00000000000 Binary files a/ui/extra/images/JP-flag.png and /dev/null differ diff --git a/ui/extra/images/MX-flag.png b/ui/extra/images/MX-flag.png deleted file mode 100644 index 1c2bd46fe44..00000000000 Binary files a/ui/extra/images/MX-flag.png and /dev/null differ diff --git a/ui/extra/images/PT-flag.png b/ui/extra/images/PT-flag.png deleted file mode 100644 index 474b73de4b7..00000000000 Binary files a/ui/extra/images/PT-flag.png and /dev/null differ diff --git a/ui/extra/images/UK-flag.png b/ui/extra/images/UK-flag.png deleted file mode 100644 index 426b866cdba..00000000000 Binary files a/ui/extra/images/UK-flag.png and /dev/null differ diff --git a/ui/extra/images/UR-flag.png b/ui/extra/images/UR-flag.png deleted file mode 100644 index a3d2795a325..00000000000 Binary files a/ui/extra/images/UR-flag.png and /dev/null differ diff --git a/ui/extra/images/USA-flag.png b/ui/extra/images/USA-flag.png deleted file mode 100644 index 490f381bf65..00000000000 Binary files a/ui/extra/images/USA-flag.png and /dev/null differ diff --git a/ui/src/components/settings/styles.scss b/ui/src/components/settings/styles.scss index e9448f439ec..1939209008b 100644 --- a/ui/src/components/settings/styles.scss +++ b/ui/src/components/settings/styles.scss @@ -263,10 +263,4 @@ right: 0; border-radius: 0; background: rgba(0, 0, 0, 0.5); -} - -.flags img { - width: 30px; - height: 25px; - margin-right: 5px; -} +} \ No newline at end of file diff --git a/ui/src/components/settings/sub_pages/about.rs b/ui/src/components/settings/sub_pages/about.rs index b9fa9bd0004..ebe97b70271 100644 --- a/ui/src/components/settings/sub_pages/about.rs +++ b/ui/src/components/settings/sub_pages/about.rs @@ -1,6 +1,5 @@ use std::process::Command; -use common::get_images_dir; use common::language::get_local_text; use common::state::{Action, ToastNotification}; use common::{icons::outline::Shape as Icon, state::State}; @@ -9,8 +8,6 @@ use dioxus_desktop::use_window; use futures::StreamExt; use kit::elements::{button::Button, Appearance}; -use tracing::log; - use crate::get_download_modal; use crate::utils::auto_updater::{DownloadProgress, DownloadState, SoftwareDownloadCmd}; use crate::{ @@ -80,27 +77,6 @@ pub fn AboutPage(cx: Scope) -> Element { let stage = download_state.read().stage; let pending_key = format!("btn-pending{}", download_state.read().progress); - let image_path_flag_AU = get_flag_image_path("AU"); - let image_path_flag_USA = get_flag_image_path("USA"); - let image_path_flag_MX = get_flag_image_path("MX"); - let image_path_flag_DE = get_flag_image_path("DE"); - let image_path_flag_PT = get_flag_image_path("PT"); - let image_path_flag_BR = get_flag_image_path("BR"); - let image_path_flag_IT = get_flag_image_path("IT"); - let image_path_flag_UR = get_flag_image_path("UR"); - let image_path_flag_BL = get_flag_image_path("BL"); - let image_path_flag_JP = get_flag_image_path("JP"); - let image_path_flag_IN = get_flag_image_path("IN"); - - fn get_flag_image_path(flag: &str) -> String { - get_images_dir() - .unwrap_or_default() - .join(format!("{}-flag.png", flag)) - .to_str() - .map(|x| x.to_string()) - .unwrap_or_default() - } - let about_button = cx.render(rsx!(match opt { None if stage == DownloadProgress::Idle => { rsx!(Button { @@ -252,50 +228,7 @@ pub fn AboutPage(cx: Scope) -> Element { section_description: get_local_text("settings-about.team"), div { class: "flags", - img { - src: "{image_path_flag_USA}", - alt: "USA Flag", - }, - img { - src: "{image_path_flag_MX}", - alt: "Mexico Flag", - } - img { - src: "{image_path_flag_DE}", - alt: "Germany Flag", - } - img { - src: "{image_path_flag_PT}", - alt: "Portugal Flag", - } - img { - src: "{image_path_flag_BR}", - alt: "Brazil Flag", - } - img { - src: "{image_path_flag_IT}", - alt: "Italy Flag", - } - img { - src: "{image_path_flag_UR}", - alt: "Ukraine Flag", - } - img { - src: "{image_path_flag_BL}", - alt: "Belarus Flag", - } - img { - src: "{image_path_flag_JP}", - alt: "Japan Flag", - } - img { - src: "{image_path_flag_AU}", - alt: "Australia Flag", - } - img { - src: "{image_path_flag_IN}", - alt: "Indonesia Flag", - } + "🇺🇸🇲🇽🇩🇪🇵🇹🇧🇷🇮🇹🇺🇦🇧🇾🇯🇵🇦🇺🇮🇩" } } }