From 333edefb136f0545ad72138849ad091d4f05dceb Mon Sep 17 00:00:00 2001 From: Eguo Wang Date: Thu, 9 May 2024 17:39:16 +0800 Subject: [PATCH] chore: upgrade iced_aw to v0.9.3 --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- src/views/body.rs | 2 +- src/views/cast.rs | 2 +- src/views/sidebar.rs | 10 +++++----- src/widgets/lists/character_item.rs | 2 +- src/widgets/lists/playbook_item.rs | 2 +- src/widgets/switchers/character_switcher.rs | 6 ++---- src/widgets/switchers/context_switcher.rs | 6 ++---- 9 files changed, 18 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 516dcba..458e0d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1713,9 +1713,9 @@ dependencies = [ [[package]] name = "iced_aw" -version = "0.8.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129deba9897243dd59c2038e2267a691e392c94e569680066ee63b1164429490" +checksum = "6e68c330918a95bd73176206d65b84efe9aee6581da0e6dea0390cd146d7214c" dependencies = [ "cfg-if", "chrono", @@ -2394,9 +2394,9 @@ dependencies = [ [[package]] name = "lyon_tessellation" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c67b5bc8123b352b2e7e742b47d1f236a13fe77619433be9568fbd888e9c0" +checksum = "4470bd0b1f29eda66068ab1fd47719facda0a136b829bcca69287ed0ac40a134" dependencies = [ "float_next_after", "lyon_path", diff --git a/Cargo.toml b/Cargo.toml index abf9d43..10fe3da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ amp-client = { git = "https://github.com/amphitheatre-app/amp-client-rust", tag amp-common = { git = "https://github.com/amphitheatre-app/common", tag = "v0.8.3" } futures = "0.3" iced = { version = "0.12.1", features = ["tokio", "debug", "lazy"] } -iced_aw = { version = "0.8.0", features = ["icons"] } +iced_aw = { version = "0.9.3", features = ["icons"] } iced_futures = "0.12.0" ignore = "0.4.22" native-dialog = { version = "0.7.0", features = ["windows_dpi_awareness", "windows_visual_styles"] } diff --git a/src/views/body.rs b/src/views/body.rs index f9e15a7..826b129 100644 --- a/src/views/body.rs +++ b/src/views/body.rs @@ -17,7 +17,7 @@ use std::sync::Arc; use amp_common::resource::{CharacterSpec, PlaybookSpec}; use iced::widget::{horizontal_space, Rule}; use iced::{Alignment, Command, Length, Subscription}; -use iced_aw::{BootstrapIcon as Icon, BOOTSTRAP_FONT as ICON_FONT}; +use iced_aw::{core::icons::bootstrap::Bootstrap as Icon, BOOTSTRAP_FONT as ICON_FONT}; use crate::context::Context; use crate::styles; diff --git a/src/views/cast.rs b/src/views/cast.rs index 97a5d07..ac6bcf7 100644 --- a/src/views/cast.rs +++ b/src/views/cast.rs @@ -17,7 +17,7 @@ use std::sync::Arc; use amp_common::resource::{CharacterSpec, PlaybookSpec}; use iced::widget::{horizontal_space, Rule}; use iced::{Alignment, Command, Length, Subscription}; -use iced_aw::{BootstrapIcon as Icon, BOOTSTRAP_FONT as ICON_FONT}; +use iced_aw::{core::icons::bootstrap::Bootstrap as Icon, BOOTSTRAP_FONT as ICON_FONT}; use crate::context::Context; use crate::styles; diff --git a/src/views/sidebar.rs b/src/views/sidebar.rs index a8a7d2b..e9e9e3b 100644 --- a/src/views/sidebar.rs +++ b/src/views/sidebar.rs @@ -13,16 +13,11 @@ // limitations under the License. use amp_common::resource::PlaybookSpec; -use iced_aw::{BootstrapIcon as Icon, BOOTSTRAP_FONT as ICON_FONT}; use std::sync::Arc; use std::time::Duration; use tracing::{debug, error}; -use iced::alignment::Horizontal; -use iced::widget::Container; -use iced::{Command, Length, Subscription}; - use crate::cmd::config::switch_context; use crate::cmd::playbook::{compose, refresh_playbooks}; use crate::context::Context; @@ -32,6 +27,11 @@ use crate::utils::connection_status::ConnectionStatus; use crate::widgets::lists::PlaybookItem; use crate::widgets::*; +use iced::alignment::Horizontal; +use iced::widget::Container; +use iced::{Command, Length, Subscription}; +use iced_aw::{core::icons::bootstrap::Bootstrap as Icon, BOOTSTRAP_FONT as ICON_FONT}; + use crate::widgets::switchers::ContextSwitcher; use super::compose::{self, Compose}; diff --git a/src/widgets/lists/character_item.rs b/src/widgets/lists/character_item.rs index aa54f7d..434af1a 100644 --- a/src/widgets/lists/character_item.rs +++ b/src/widgets/lists/character_item.rs @@ -13,7 +13,7 @@ use amp_common::resource::CharacterSpec; use iced::widget::Component; use iced::Alignment; use iced::Length; -use iced_aw::{BootstrapIcon as Icon, BOOTSTRAP_FONT as ICON_FONT}; +use iced_aw::{core::icons::bootstrap::Bootstrap as Icon, BOOTSTRAP_FONT as ICON_FONT}; use crate::styles; use crate::styles::constants::ICON_FONT_SIZE_SIDEBAR; diff --git a/src/widgets/lists/playbook_item.rs b/src/widgets/lists/playbook_item.rs index 6b9a4ad..05f59bb 100644 --- a/src/widgets/lists/playbook_item.rs +++ b/src/widgets/lists/playbook_item.rs @@ -13,7 +13,7 @@ use amp_common::resource::PlaybookSpec; use iced::widget::Component; use iced::Alignment; use iced::Length; -use iced_aw::{BootstrapIcon as Icon, BOOTSTRAP_FONT as ICON_FONT}; +use iced_aw::{core::icons::bootstrap::Bootstrap as Icon, BOOTSTRAP_FONT as ICON_FONT}; use crate::styles; use crate::styles::constants::ICON_FONT_SIZE_SIDEBAR; diff --git a/src/widgets/switchers/character_switcher.rs b/src/widgets/switchers/character_switcher.rs index a0fed48..5a2ac12 100644 --- a/src/widgets/switchers/character_switcher.rs +++ b/src/widgets/switchers/character_switcher.rs @@ -15,10 +15,8 @@ use crate::{ }; use amp_common::resource::CharacterSpec; use iced::{widget::Component, Length}; -use iced_aw::{ - menu::{Item, Menu, MenuBar}, - BootstrapIcon as Icon, BOOTSTRAP_FONT as ICON_FONT, -}; +use iced_aw::menu::{Item, Menu, MenuBar}; +use iced_aw::{core::icons::bootstrap::Bootstrap as Icon, BOOTSTRAP_FONT as ICON_FONT}; use tracing::debug; #[derive(Default)] diff --git a/src/widgets/switchers/context_switcher.rs b/src/widgets/switchers/context_switcher.rs index df762e1..77bdbea 100644 --- a/src/widgets/switchers/context_switcher.rs +++ b/src/widgets/switchers/context_switcher.rs @@ -17,10 +17,8 @@ use crate::{ }; use amp_common::config::Cluster; use iced::{widget::Component, Alignment, Length}; -use iced_aw::{ - menu::{Item, Menu, MenuBar}, - BootstrapIcon as Icon, BOOTSTRAP_FONT as ICON_FONT, -}; +use iced_aw::menu::{Item, Menu, MenuBar}; +use iced_aw::{core::icons::bootstrap::Bootstrap as Icon, BOOTSTRAP_FONT as ICON_FONT}; use tracing::debug; use crate::utils::connection_status::ConnectionStatus;