Merge pull request #607 from paper-plane-developers/marhkb/refactor/c…

…leanups

Cleanups + some style fixes

Cargo.toml

@@ -15,7 +15,6 @@ image = { version = "0.24", default-features = false, features = ["jpeg", "png",
 indexmap = "2"
 locale_config = "0.3"
 log = "0.4"
-once_cell = "1"
 ori = { git = "https://github.com/paper-plane-developers/origami.git", package = "origami" }
 pretty_env_logger = "0.5"
 qrcode-generator = { version = "4", default-features = false }

data/resources/style.css

@@ -30,6 +30,7 @@ chatfoldericon .unread-mask {
 chatfoldericon .unread-label {
   border-radius: 9999px;
   background-color: @accent_bg_color;
+  color: @accent_fg_color;
   padding: 0 4px;
   font-size: smaller;
   font-weight: bold;

src/model/chat.rs

@@ -3,12 +3,12 @@ use std::cell::OnceCell;
 use std::cell::RefCell;
 use std::collections::HashMap;
 
+use glib::once_cell::sync::Lazy;
 use glib::subclass::Signal;
 use glib::Properties;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
-use once_cell::sync::Lazy;
 
 use crate::model;
 

src/model/chat_history_item.rs

@@ -1,9 +1,9 @@
 use std::cell::OnceCell;
 
+use glib::once_cell::sync::Lazy;
 use glib::prelude::*;
 use glib::subclass::prelude::*;
 use gtk::glib;
-use once_cell::sync::Lazy;
 
 use crate::model;
 

src/model/chat_history_model.rs

@@ -6,9 +6,9 @@ use std::collections::VecDeque;
 use gio::prelude::*;
 use gio::subclass::prelude::*;
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use gtk::gio;
 use gtk::glib;
-use once_cell::sync::Lazy;
 use thiserror::Error;
 
 use crate::model;

src/model/client_manager.rs

@@ -6,13 +6,13 @@ use std::time::UNIX_EPOCH;
 
 use gio::subclass::prelude::*;
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use glib::subclass::Signal;
 use gtk::gio;
 use gtk::glib;
 use gtk::prelude::*;
 use indexmap::map::Entry;
 use indexmap::IndexMap;
-use once_cell::sync::Lazy;
 
 use crate::model;
 use crate::utils;

src/ui/components/animated_bin.rs

@@ -1,8 +1,8 @@
+use glib::once_cell::sync::Lazy;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 mod imp {
     use super::*;

src/ui/components/avatar.rs

@@ -44,7 +44,7 @@ mod imp {
 
     impl ObjectImpl for Avatar {
         fn properties() -> &'static [glib::ParamSpec] {
-            use once_cell::sync::Lazy;
+            use glib::once_cell::sync::Lazy;
             static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
                 vec![
                     glib::ParamSpecObject::builder::<glib::Object>("item")

src/ui/components/avatar_map_marker.rs

@@ -35,7 +35,7 @@ mod imp {
 
     impl ObjectImpl for AvatarMapMarker {
         fn properties() -> &'static [glib::ParamSpec] {
-            use once_cell::sync::Lazy;
+            use glib::once_cell::sync::Lazy;
             static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
                 vec![glib::ParamSpecObject::builder::<model::User>("user")
                     .construct()

src/ui/components/avatar_with_selection.rs

@@ -1,9 +1,9 @@
 use adw::subclass::prelude::*;
+use glib::once_cell::sync::Lazy;
 use glib::subclass::*;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 use crate::ui;
 

src/ui/components/icon_map_marker.rs

@@ -34,7 +34,7 @@ mod imp {
 
     impl ObjectImpl for AvatarMapMarker {
         fn properties() -> &'static [glib::ParamSpec] {
-            use once_cell::sync::Lazy;
+            use glib::once_cell::sync::Lazy;
             static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
                 vec![glib::ParamSpecString::builder("icon-name")
                     .construct()

src/ui/components/map.rs

@@ -1,8 +1,8 @@
 use adw::prelude::*;
+use glib::once_cell::sync::Lazy;
 use gtk::glib;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 use shumate::prelude::*;
 
 use crate::ui;

src/ui/components/map_marker.rs

@@ -1,7 +1,7 @@
+use glib::once_cell::sync::Lazy;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
-use once_cell::sync::Lazy;
 
 mod imp {
     use super::*;

src/ui/components/message_entry.rs

@@ -1,13 +1,13 @@
 use std::cell::RefCell;
 
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use glib::subclass::Signal;
 use gtk::gdk;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 use crate::model;
 

src/ui/components/phone_number_input.rs

@@ -7,12 +7,12 @@ use std::rc::Rc;
 use adw::prelude::*;
 use gettextrs::gettext;
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use gtk::glib;
 use gtk::glib::subclass::Signal;
 use gtk::pango;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 use crate::model;
 

src/ui/session/contacts_window/mod.rs

@@ -4,12 +4,12 @@ use std::cell::OnceCell;
 
 use adw::subclass::prelude::*;
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use glib::subclass::Signal;
 use gtk::gio;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 pub(crate) use self::row::Row;
 use crate::model;

src/ui/session/content/chat_action_bar.rs

@@ -5,12 +5,12 @@ use std::cell::RefCell;
 use anyhow::anyhow;
 use gettextrs::gettext;
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use gtk::gio;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 use crate::expressions;
 use crate::i18n::gettext_f;

src/ui/session/content/chat_history.rs

@@ -6,10 +6,10 @@ use adw::prelude::*;
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use gtk::gio;
 use gtk::glib;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 use crate::expressions;
 use crate::model;

src/ui/session/content/chat_history_row.rs

@@ -3,8 +3,8 @@ use std::cell::RefCell;
 use adw::prelude::*;
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
+use glib::once_cell::sync::Lazy;
 use gtk::glib;
-use once_cell::sync::Lazy;
 
 use crate::model;
 use crate::strings;

src/ui/session/content/chat_info_window.rs

@@ -5,10 +5,10 @@ use adw::subclass::prelude::*;
 use gettextrs::gettext;
 use glib::clone;
 use glib::closure;
+use glib::once_cell::sync::Lazy;
 use gtk::gdk;
 use gtk::glib;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 use crate::expressions;
 use crate::i18n::ngettext_f;

src/ui/session/content/event_row.rs

@@ -1,8 +1,8 @@
 use adw::subclass::prelude::*;
+use glib::once_cell::sync::Lazy;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 mod imp {
     use super::*;

src/ui/session/content/message_row/bubble.rs

@@ -4,10 +4,10 @@ use std::hash::Hash;
 use std::hash::Hasher;
 
 use adw::prelude::*;
+use glib::once_cell::sync::Lazy;
 use gtk::glib;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 use crate::model;
 use crate::ui;

src/ui/session/content/message_row/document/mod.rs

@@ -5,13 +5,13 @@ use std::cell::RefCell;
 
 use file_status::FileStatus;
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use gtk::gdk;
 use gtk::gio;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 pub(crate) use self::status_indicator::StatusIndicator;
 use crate::model;

src/ui/session/content/message_row/indicators.rs

@@ -2,11 +2,11 @@ use std::cell::OnceCell;
 
 use gettextrs::gettext;
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 use crate::model;
 

src/ui/session/content/message_row/label.rs

@@ -1,11 +1,11 @@
 use std::cell::RefCell;
 
+use glib::once_cell::sync::Lazy;
 use gtk::glib;
 use gtk::pango;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 use crate::ui;
 

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

@@ -2,12 +2,12 @@ use std::cell::RefCell;
 
 use gettextrs::gettext;
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use gtk::gio;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 use ui::MessageBaseExt;
 
 use crate::i18n::gettext_f;

src/ui/session/content/message_row/media_picture.rs

@@ -1,12 +1,12 @@
 use std::cell::Cell;
 
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use gtk::gdk;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 const MAX_HEIGHT: i32 = 350;
 

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

@@ -17,11 +17,11 @@ use std::cell::RefCell;
 use adw::prelude::*;
 use gettextrs::gettext;
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use gtk::gio;
 use gtk::glib;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 pub(crate) use self::base::MessageBase;
 pub(crate) use self::base::MessageBaseExt;

src/ui/session/content/message_row/photo.rs

@@ -2,13 +2,13 @@ use std::cell::RefCell;
 
 use glib::clone;
 use glib::closure;
+use glib::once_cell::sync::Lazy;
 use gtk::gdk;
 use gtk::gio;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 use crate::model;
 use crate::ui;

src/ui/session/content/message_row/sticker.rs

@@ -1,8 +1,8 @@
 use adw::prelude::*;
+use glib::once_cell::sync::Lazy;
 use gtk::glib;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 use crate::model;
 use crate::ui;

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

@@ -2,11 +2,11 @@ use std::cell::RefCell;
 
 use gettextrs::gettext;
 use glib::closure;
+use glib::once_cell::sync::Lazy;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 use crate::model;
 use crate::ui;

src/ui/session/content/message_row/venue.rs

@@ -1,12 +1,12 @@
 use std::cell::RefCell;
 
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use gtk::gio;
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 use ui::MessageBaseExt;
 
 use crate::model;