chore: Update libadwaita

Cargo.lock

@@ -2139,10 +2139,11 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libadwaita"
-version = "0.1.1"
+version = "0.2.0-alpha.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ae453d28e3b91f03749f02b1531e8cfe315a1d0762b77a61797d2ab80bb87d"
+checksum = "49ad2318c7abc8629b1d1ed381bd0356c184ae8f4caebc044ef9de1782c86046"
 dependencies = [
+ "futures-channel",
  "gdk-pixbuf",
  "gdk4",
  "gio",
@@ -2156,9 +2157,9 @@ dependencies = [
 
 [[package]]
 name = "libadwaita-sys"
-version = "0.1.0"
+version = "0.2.0-alpha.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f18b6ac4cadd252a89f5cba0a5a4e99836131795d6fad37b859ac79e8cb7d2c8"
+checksum = "e835f99b92f6e7f43ddb2c0ca79d9d21124a170190876505e03484f337f7edc7"
 dependencies = [
  "gdk4-sys",
  "gio-sys",

Cargo.toml

@@ -61,7 +61,8 @@ features = ["v4_6"]
 
 [dependencies.adw]
 package = "libadwaita"
-version = "0.1.0"
+version = "0.2.0-alpha.2"
+features = ["v1_2"]
 
 [dependencies.shumate]
 package = "libshumate"

src/account_switcher/avatar_with_selection.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 use crate::{components::Avatar, session::Avatar as AvatarItem};
 

src/components/action_button.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, glib::closure_local, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::closure_local, prelude::*, CompositeTemplate};
 
 #[derive(Debug, Hash, Eq, PartialEq, Clone, Copy, glib::Enum)]
 #[repr(u32)]

src/components/audio_player.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{gio, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gio, glib, prelude::*, CompositeTemplate};
 
 mod imp {
     use std::cell::{Cell, RefCell};

src/components/auth_dialog.rs

@@ -6,7 +6,6 @@ use gtk::{
     gio::prelude::*,
     glib::{self, clone},
     prelude::*,
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use matrix_sdk::{

src/components/avatar.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 use crate::session::Avatar as AvatarItem;
 

src/components/badge.rs

@@ -1,5 +1,5 @@
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{glib, subclass::prelude::*};
+use gtk::glib;
 
 use crate::session::room::{MemberRole, PowerLevel, POWER_LEVEL_MAX, POWER_LEVEL_MIN};
 

src/components/button_row.rs

@@ -3,7 +3,6 @@ use gtk::{
     glib,
     glib::{clone, closure_local},
     prelude::*,
-    subclass::prelude::*,
     CompositeTemplate,
 };
 

src/components/context_menu_bin.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{gdk, glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gdk, glib, glib::clone, prelude::*, CompositeTemplate};
 use log::debug;
 
 mod imp {

src/components/custom_entry.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, subclass::prelude::*};
+use gtk::glib;
 
 mod imp {
     use super::*;

src/components/editable_avatar.rs

@@ -4,7 +4,6 @@ use gtk::{
     gdk, gio, glib,
     glib::{clone, closure_local},
     prelude::*,
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::error;

src/components/entry_row.rs

@@ -3,7 +3,6 @@ use gtk::{
     gdk, glib,
     glib::{clone, closure_local},
     prelude::*,
-    subclass::prelude::*,
     CompositeTemplate,
 };
 

src/components/in_app_notification.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{gio, glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gio, glib, glib::clone, prelude::*, CompositeTemplate};
 
 use crate::components::Toast;
 

src/components/location_viewer.rs

@@ -1,5 +1,5 @@
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{glib, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, CompositeTemplate};
 use shumate::prelude::*;
 
 use crate::i18n::gettext_f;

src/components/media_content_viewer.rs

@@ -1,6 +1,6 @@
 use adw::{prelude::*, subclass::prelude::*};
 use gettextrs::gettext;
-use gtk::{gdk, gio, glib, glib::clone, subclass::prelude::*, CompositeTemplate};
+use gtk::{gdk, gio, glib, glib::clone, CompositeTemplate};
 use log::warn;
 
 use super::{AudioPlayer, LocationViewer};

src/components/password_entry_row.rs

@@ -3,7 +3,6 @@ use gtk::{
     gdk, glib,
     glib::{clone, closure_local},
     prelude::*,
-    subclass::prelude::*,
     CompositeTemplate,
 };
 

src/components/pill.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 use crate::{
     components::Avatar,

src/components/reaction_chooser.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 
 use crate::session::room::ReactionList;
 

src/components/room_title.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 use html2pango::markup;
 
 mod imp {

src/components/spinner_button.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 mod imp {
     use glib::subclass::InitializingObject;

src/components/video_player.rs

@@ -1,7 +1,7 @@
 use adw::subclass::prelude::*;
 use gst::ClockTime;
 use gst_player::{Player, PlayerGMainContextSignalDispatcher};
-use gtk::{gio, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gio, glib, prelude::*, CompositeTemplate};
 
 use super::VideoPlayerRenderer;
 

src/login/login_advanced_dialog.rs

@@ -1,7 +1,7 @@
 use std::cell::Cell;
 
 use adw::subclass::prelude::*;
-use gtk::{gdk, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gdk, glib, prelude::*, CompositeTemplate};
 
 mod imp {
     use glib::subclass::InitializingObject;

src/session/account_settings/devices_page/mod.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 
 mod device;
 use self::device::Device;

src/session/account_settings/mod.rs

@@ -2,7 +2,6 @@ use adw::{prelude::*, subclass::prelude::*};
 use gtk::{
     glib,
     glib::{clone, FromVariant},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 

src/session/account_settings/user_page/change_password_subpage.rs

@@ -2,7 +2,6 @@ use adw::{prelude::*, subclass::prelude::*};
 use gettextrs::gettext;
 use gtk::{
     glib::{self, clone},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::error;

src/session/account_settings/user_page/deactivate_account_subpage.rs

@@ -2,7 +2,6 @@ use adw::{prelude::*, subclass::prelude::*};
 use gettextrs::gettext;
 use gtk::{
     glib::{self, clone},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::error;

src/session/account_settings/user_page/mod.rs

@@ -5,7 +5,6 @@ use gettextrs::gettext;
 use gtk::{
     gio,
     glib::{self, clone},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::error;

src/session/content/explore/mod.rs

@@ -3,7 +3,7 @@ mod public_room_list;
 mod public_room_row;
 
 use adw::subclass::prelude::*;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 use log::error;
 use ruma::api::client::thirdparty::get_protocols;
 

src/session/content/invite.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 
 use crate::{
     components::{Avatar, LabelWithWidgets, Pill, SpinnerButton},

src/session/content/mod.rs

@@ -6,7 +6,7 @@ mod room_history;
 pub mod verification;
 
 use adw::subclass::prelude::*;
-use gtk::{gio, glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gio, glib, glib::clone, prelude::*, CompositeTemplate};
 
 use self::{
     explore::Explore, invite::Invite, markdown_popover::MarkdownPopover, room_details::RoomDetails,

src/session/content/room_details/invite_subpage/mod.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{gdk, glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gdk, glib, glib::clone, prelude::*, CompositeTemplate};
 
 mod invitee;
 use self::invitee::Invitee;

src/session/content/room_details/member_page/mod.rs

@@ -1,7 +1,6 @@
 use adw::{prelude::*, subclass::prelude::*};
 use gtk::{
     glib::{self, clone, closure},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::warn;

src/session/content/room_details/mod.rs

@@ -6,7 +6,6 @@ use gettextrs::gettext;
 use gtk::{
     gdk,
     glib::{self, clone, closure},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use matrix_sdk::ruma::events::RoomEventType;

src/session/content/room_history/divider_row.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 mod imp {
     use glib::subclass::InitializingObject;

src/session/content/room_history/item_row.rs

@@ -1,6 +1,6 @@
 use adw::{prelude::*, subclass::prelude::*};
 use gettextrs::gettext;
-use gtk::{gio, glib, glib::clone, subclass::prelude::*};
+use gtk::{gio, glib, glib::clone};
 use matrix_sdk::ruma::events::AnySyncRoomEvent;
 
 use crate::{

src/session/content/room_history/message_row/audio.rs

@@ -3,7 +3,6 @@ use gettextrs::gettext;
 use gtk::{
     gio,
     glib::{self, clone},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::warn;

src/session/content/room_history/message_row/file.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 mod imp {
     use std::cell::{Cell, RefCell};

src/session/content/room_history/message_row/location.rs

@@ -1,5 +1,5 @@
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{glib, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, CompositeTemplate};
 
 use crate::components::LocationViewer;
 

src/session/content/room_history/message_row/media.rs

@@ -3,7 +3,6 @@ use gettextrs::gettext;
 use gtk::{
     gdk, gio,
     glib::{self, clone},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::warn;

src/session/content/room_history/message_row/mod.rs

@@ -12,7 +12,6 @@ use gettextrs::gettext;
 use gtk::{
     glib,
     glib::{clone, signal::SignalHandlerId},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::warn;

src/session/content/room_history/message_row/reaction.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 use crate::session::room::ReactionGroup;
 

src/session/content/room_history/message_row/reaction_list.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 use super::reaction::MessageReaction;
 use crate::session::room::ReactionList;

src/session/content/room_history/message_row/reply.rs

@@ -1,5 +1,5 @@
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{glib, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, CompositeTemplate};
 
 use crate::{components::Pill, session::User};
 

src/session/content/room_history/message_row/text.rs

@@ -1,5 +1,5 @@
 use adw::{prelude::BinExt, subclass::prelude::*};
-use gtk::{glib, prelude::*, subclass::prelude::*};
+use gtk::{glib, prelude::*};
 use html2pango::{
     block::{markup_html, HtmlBlock},
     html_escape, markup_links,

src/session/content/room_history/mod.rs

@@ -18,7 +18,6 @@ use gtk::{
     gdk, gio, glib,
     glib::{clone, signal::Inhibit},
     prelude::*,
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::warn;

src/session/content/room_history/state_row/creation.rs

@@ -1,6 +1,6 @@
 use adw::{prelude::*, subclass::prelude::*};
 use gettextrs::gettext;
-use gtk::{glib, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, CompositeTemplate};
 use matrix_sdk::ruma::events::room::create::RoomCreateEventContent;
 
 mod imp {

src/session/content/room_history/state_row/mod.rs

@@ -3,7 +3,7 @@ mod tombstone;
 
 use adw::{prelude::*, subclass::prelude::*};
 use gettextrs::gettext;
-use gtk::{glib, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, CompositeTemplate};
 use log::warn;
 use matrix_sdk::ruma::events::{room::member::MembershipState, AnySyncStateEvent, SyncStateEvent};
 

src/session/content/room_history/state_row/tombstone.rs

@@ -1,5 +1,5 @@
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{glib, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, CompositeTemplate};
 use matrix_sdk::ruma::events::room::tombstone::RoomTombstoneEventContent;
 
 mod imp {

src/session/content/room_history/verification_info_bar.rs

@@ -1,6 +1,6 @@
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 
 use crate::{
     gettext_f,

src/session/content/verification/emoji.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 use matrix_sdk::encryption::verification::Emoji as MatrixEmoji;
 mod imp {
     use glib::subclass::InitializingObject;

src/session/content/verification/identity_verification_widget.rs

@@ -1,6 +1,6 @@
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 use log::warn;
 use matrix_sdk::encryption::verification::QrVerificationData;
 

src/session/content/verification/session_verification.rs

@@ -1,6 +1,6 @@
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 use log::{debug, error};
 
 use super::IdentityVerificationWidget;

src/session/event_source_dialog.rs

@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 use sourceview::prelude::*;
 
 use crate::session::room::Event;

src/session/media_viewer.rs

@@ -1,5 +1,5 @@
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{gdk, gio, glib, glib::clone, subclass::prelude::*, CompositeTemplate};
+use gtk::{gdk, gio, glib, glib::clone, CompositeTemplate};
 use log::warn;
 use matrix_sdk::ruma::events::{room::message::MessageType, AnyMessageLikeEventContent};
 

src/session/room_creation/mod.rs

@@ -1,6 +1,6 @@
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
-use gtk::{gdk, glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gdk, glib, glib::clone, prelude::*, CompositeTemplate};
 use log::error;
 use matrix_sdk::{
     ruma::{

src/session/sidebar/mod.rs

@@ -15,7 +15,6 @@ use adw::{prelude::*, subclass::prelude::*};
 use gtk::{
     gio, glib,
     glib::{clone, closure},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 

src/session/sidebar/row.rs

@@ -1,7 +1,7 @@
 use std::convert::TryFrom;
 
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{gdk, glib, glib::clone, subclass::prelude::*};
+use gtk::{gdk, glib, glib::clone};
 
 use super::EntryType;
 use crate::session::{