WIP: content: Add pinned messages bar and view

melix99 · melix99 · commit 96981cdfb27f · 2023-03-27T19:49:56.000+02:00
diff --git a/data/resources/ui/content-chat-history.ui b/data/resources/ui/content-chat-history.ui
@@ -34,6 +34,12 @@
             </child>
           </object>
         </child>
+        <child>
+          <object class="PinnedMessagesBar" id="pinned_messages_bar"/>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
         <child>
           <object class="MessageListView" id="message_list_view">
             <property name="vexpand">True</property>
diff --git a/data/resources/ui/content.blp b/data/resources/ui/content.blp
@@ -31,9 +31,13 @@ template Content : Adw.Bin {
       }
     }
 
-    .ContentChatHistory chat_history {
-      compact: bind Content.compact;
-      chat: bind Content.chat;
+    Adw.Leaflet chat_leaflet {
+      can-unfold: false;
+
+      .ContentChatHistory chat_history {
+        compact: bind Content.compact;
+        chat: bind Content.chat;
+      }
     }
   }
 }
diff --git a/src/components/message_list_view/mod.rs b/src/components/message_list_view/mod.rs
@@ -22,6 +22,13 @@ use crate::Session;
 
 const MIN_N_ITEMS: u32 = 20;
 
+#[derive(Debug, Default, Clone, Copy)]
+pub(crate) enum MessageListViewType {
+    #[default]
+    ChatHistory,
+    PinnedMessages,
+}
+
 mod imp {
     use super::*;
     use once_cell::unsync::OnceCell;
@@ -146,9 +153,9 @@ glib::wrapper! {
 }
 
 impl MessageListView {
-    pub(crate) fn load_messages(&self, chat: &Chat) {
+    pub(crate) fn load_messages(&self, type_: MessageListViewType, chat: &Chat) {
         let imp = self.imp();
-        let model = MessageListViewModel::new(chat);
+        let model = MessageListViewModel::new(type_, chat);
 
         // Request sponsored message, if needed
         let list_view_model: gio::ListModel = if matches!(chat.type_(), ChatType::Supergroup(supergroup) if supergroup.is_channel())
diff --git a/src/components/message_list_view/model.rs b/src/components/message_list_view/model.rs
@@ -3,9 +3,10 @@ use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::{gio, glib};
 use std::cmp::Ordering;
+use tdlib::enums::SearchMessagesFilter;
 use thiserror::Error;
 
-use super::{MessageListViewItem, MessageListViewItemType};
+use super::{MessageListViewItem, MessageListViewItemType, MessageListViewType};
 use crate::tdlib::{Chat, Message};
 
 #[derive(Error, Debug)]
@@ -25,6 +26,7 @@ mod imp {
 
     #[derive(Debug, Default)]
     pub(crate) struct MessageListViewModel {
+        pub(super) type_: Cell<MessageListViewType>,
         pub(super) chat: WeakRef<Chat>,
         pub(super) is_loading: Cell<bool>,
         pub(super) list: RefCell<VecDeque<MessageListViewItem>>,
@@ -82,9 +84,10 @@ glib::wrapper! {
 }
 
 impl MessageListViewModel {
-    pub(crate) fn new(chat: &Chat) -> Self {
+    pub(crate) fn new(type_: MessageListViewType, chat: &Chat) -> Self {
         let obj: MessageListViewModel = glib::Object::new();
 
+        obj.imp().type_.set(type_);
         obj.imp().chat.set(Some(chat));
 
         chat.connect_new_message(clone!(@weak obj => move |_, message| {
@@ -121,7 +124,21 @@ impl MessageListViewModel {
 
         imp.is_loading.set(true);
 
-        let result = self.chat().get_chat_history(oldest_message_id, limit).await;
+        let result = match imp.type_.get() {
+            MessageListViewType::ChatHistory => {
+                self.chat().get_chat_history(oldest_message_id, limit).await
+            }
+            MessageListViewType::PinnedMessages => {
+                self.chat()
+                    .search_messages(
+                        String::new(),
+                        oldest_message_id,
+                        limit,
+                        Some(SearchMessagesFilter::Pinned),
+                    )
+                    .await
+            }
+        };
 
         imp.is_loading.set(false);
 
diff --git a/src/components/mod.rs b/src/components/mod.rs
@@ -6,6 +6,6 @@ mod sticker;
 
 pub(crate) use self::avatar::Avatar;
 pub(crate) use self::message_entry::MessageEntry;
-pub(crate) use self::message_list_view::MessageListView;
+pub(crate) use self::message_list_view::{MessageListView, MessageListViewType};
 pub(crate) use self::snow::Snow;
 pub(crate) use self::sticker::Sticker;
diff --git a/src/session/content/chat_history.rs b/src/session/content/chat_history.rs
@@ -5,8 +5,8 @@ use gtk::{glib, CompositeTemplate};
 use tdlib::enums::ChatMemberStatus;
 use tdlib::functions;
 
-use super::{ChatActionBar, ChatInfoWindow};
-use crate::components::MessageListView;
+use super::{ChatActionBar, ChatInfoWindow, PinnedMessagesBar};
+use crate::components::{MessageListView, MessageListViewType};
 use crate::expressions;
 use crate::tdlib::{Chat, ChatType};
 
@@ -24,6 +24,8 @@ mod imp {
         #[template_child]
         pub(super) window_title: TemplateChild<adw::WindowTitle>,
         #[template_child]
+        pub(super) pinned_messages_bar: TemplateChild<PinnedMessagesBar>,
+        #[template_child]
         pub(super) message_list_view: TemplateChild<MessageListView>,
         #[template_child]
         pub(super) chat_action_bar: TemplateChild<ChatActionBar>,
@@ -202,7 +204,8 @@ impl ChatHistory {
                 },
             );
 
-            imp.message_list_view.load_messages(chat);
+            imp.message_list_view
+                .load_messages(MessageListViewType::ChatHistory, chat);
         }
 
         imp.chat.replace(chat);
diff --git a/src/session/content/mod.rs b/src/session/content/mod.rs
@@ -1,11 +1,15 @@
 mod chat_action_bar;
 mod chat_history;
 mod chat_info_window;
+mod pinned_messages_bar;
+mod pinned_messages_view;
 mod send_photo_dialog;
 
 use self::chat_action_bar::ChatActionBar;
 use self::chat_history::ChatHistory;
 use self::chat_info_window::ChatInfoWindow;
+use self::pinned_messages_bar::PinnedMessagesBar;
+use self::pinned_messages_view::PinnedMessagesView;
 use self::send_photo_dialog::SendPhotoDialog;
 
 use gtk::glib;
@@ -31,6 +35,8 @@ mod imp {
         #[template_child]
         pub(super) unselected_chat: TemplateChild<gtk::Box>,
         #[template_child]
+        pub(super) chat_leaflet: TemplateChild<adw::Leaflet>,
+        #[template_child]
         pub(super) chat_history: TemplateChild<ChatHistory>,
     }
 
@@ -41,8 +47,11 @@ mod imp {
         type ParentType = adw::Bin;
 
         fn class_init(klass: &mut Self::Class) {
-            ChatHistory::static_type();
             klass.bind_template();
+
+            klass.install_action("content.show-pinned-messages", None, move |widget, _, _| {
+                widget.show_pinned_messages();
+            });
         }
 
         fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
@@ -114,6 +123,16 @@ impl Content {
         self.imp().chat_history.handle_paste_action();
     }
 
+    fn show_pinned_messages(&self) {
+        if let Some(chat) = self.chat() {
+            let imp = self.imp();
+            let pinned_messages = PinnedMessagesView::new(&chat);
+
+            imp.chat_leaflet.append(&pinned_messages);
+            imp.chat_leaflet.navigate(adw::NavigationDirection::Forward);
+        }
+    }
+
     pub(crate) fn chat(&self) -> Option<Chat> {
         self.imp().chat.borrow().clone()
     }
@@ -125,7 +144,16 @@ impl Content {
 
         let imp = self.imp();
         if chat.is_some() {
-            imp.stack.set_visible_child(&imp.chat_history.get());
+            // Remove every leaflet page except the first one (the first chat history)
+            imp.chat_leaflet
+                .pages()
+                .iter::<adw::LeafletPage>()
+                .map(|p| p.unwrap())
+                .enumerate()
+                .filter(|(i, _)| i > &0)
+                .for_each(|(_, p)| imp.chat_leaflet.remove(&p.child()));
+
+            imp.stack.set_visible_child(&imp.chat_leaflet.get());
         } else {
             imp.stack.set_visible_child(&imp.unselected_chat.get());
         }
diff --git a/src/session/content/pinned_messages_bar.rs b/src/session/content/pinned_messages_bar.rs
@@ -0,0 +1,67 @@
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use gtk::{glib, CompositeTemplate};
+
+mod imp {
+    use super::*;
+
+    #[derive(Debug, Default, CompositeTemplate)]
+    #[template(string = r#"
+    template PinnedMessagesBar {
+        Box content_box {
+            styles ["toolbar"]
+
+            Box {
+                orientation: vertical;
+                hexpand: true;
+
+                Inscription {
+
+                }
+
+                Inscription {
+
+                }
+            }
+
+            Button {
+                icon-name: "view-list-symbolic";
+                action-name: "content.show-pinned-messages";
+            }
+        }
+    }
+    "#)]
+    pub(crate) struct PinnedMessagesBar {
+        #[template_child]
+        pub(super) content_box: TemplateChild<gtk::Box>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for PinnedMessagesBar {
+        const NAME: &'static str = "PinnedMessagesBar";
+        type Type = super::PinnedMessagesBar;
+        type ParentType = gtk::Widget;
+
+        fn class_init(klass: &mut Self::Class) {
+            klass.bind_template();
+            klass.set_layout_manager_type::<gtk::BinLayout>();
+        }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+            obj.init_template();
+        }
+    }
+
+    impl ObjectImpl for PinnedMessagesBar {
+        fn dispose(&self) {
+            self.dispose_template();
+        }
+    }
+
+    impl WidgetImpl for PinnedMessagesBar {}
+}
+
+glib::wrapper! {
+    pub(crate) struct PinnedMessagesBar(ObjectSubclass<imp::PinnedMessagesBar>)
+        @extends gtk::Widget;
+}
diff --git a/src/session/content/pinned_messages_view.rs b/src/session/content/pinned_messages_view.rs
@@ -0,0 +1,96 @@
+use adw::subclass::prelude::*;
+use gtk::prelude::*;
+use gtk::{glib, CompositeTemplate};
+
+use crate::components::{MessageListView, MessageListViewType};
+use crate::tdlib::Chat;
+
+mod imp {
+    use super::*;
+
+    #[derive(Debug, Default, CompositeTemplate)]
+    #[template(string = r#"
+    using Adw 1;
+
+    template PinnedMessagesView {
+        Box content_box {
+            orientation: vertical;
+
+            HeaderBar {
+                [start]
+                Button {
+                    icon-name: "go-previous-symbolic";
+                    action-name: "content.go-back";
+                }
+            }
+
+            .MessageListView message_list_view {
+                vexpand: true;
+            }
+
+            Separator {}
+
+            Box {
+                styles ["toolbar"]
+
+                Button {
+                    label: _("Unpin All Messages");
+                    hexpand: true;
+
+                    styles [
+                        "flat",
+                        "accent",
+                    ]
+                }
+            }
+        }
+    }
+    "#)]
+    pub(crate) struct PinnedMessagesView {
+        #[template_child]
+        pub(super) content_box: TemplateChild<gtk::Box>,
+        #[template_child]
+        pub(super) message_list_view: TemplateChild<MessageListView>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for PinnedMessagesView {
+        const NAME: &'static str = "PinnedMessagesView";
+        type Type = super::PinnedMessagesView;
+        type ParentType = gtk::Widget;
+
+        fn class_init(klass: &mut Self::Class) {
+            klass.bind_template();
+            klass.set_layout_manager_type::<gtk::BinLayout>();
+        }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+            obj.init_template();
+        }
+    }
+
+    impl ObjectImpl for PinnedMessagesView {
+        fn dispose(&self) {
+            self.dispose_template();
+        }
+    }
+
+    impl WidgetImpl for PinnedMessagesView {}
+}
+
+glib::wrapper! {
+    pub(crate) struct PinnedMessagesView(ObjectSubclass<imp::PinnedMessagesView>)
+        @extends gtk::Widget;
+}
+
+impl PinnedMessagesView {
+    pub(crate) fn new(chat: &Chat) -> Self {
+        let obj: Self = glib::Object::new();
+
+        obj.imp()
+            .message_list_view
+            .load_messages(MessageListViewType::PinnedMessages, chat);
+
+        obj
+    }
+}
diff --git a/src/tdlib/chat.rs b/src/tdlib/chat.rs

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,13 @@ template Content : Adw.Bin {`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`- .ContentChatHistory chat_history {`
`35`		`- compact: bind Content.compact;`
`36`		`- chat: bind Content.chat;`
	`34`	`+ Adw.Leaflet chat_leaflet {`
	`35`	`+ can-unfold: false;`
	`36`	`+`
	`37`	`+ .ContentChatHistory chat_history {`
	`38`	`+ compact: bind Content.compact;`
	`39`	`+ chat: bind Content.chat;`
	`40`	`+ }`
`37`	`41`	`}`
`38`	`42`	`}`
`39`	`43`	`}`