Skip to content

Commit

Permalink
chore: upgrade iced_aw to v0.9.3
Browse files Browse the repository at this point in the history
  • Loading branch information
wangeguo committed May 9, 2024
1 parent 5b1496e commit 333edef
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 22 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion src/views/body.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/views/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/views/sidebar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/lists/character_item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/lists/playbook_item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions src/widgets/switchers/character_switcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
6 changes: 2 additions & 4 deletions src/widgets/switchers/context_switcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 333edef

Please sign in to comment.