Merge pull request #590 from paper-plane-developers/marhkb/feat/messa…

…ge-document/loading-indicator feat(message-document): Add origami loading indicator
paper-plane-developers · Oct 1, 2023 · 7c78bf6 · 7c78bf6
2 parents dd9463a + a7756b6
commit 7c78bf6
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,6 +16,7 @@ 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 }
 regex = "1"

diff --git a/data/resources/style.css b/data/resources/style.css
@@ -243,6 +243,10 @@ messagebubble.document.outgoing .file > overlay > statusindicator {
   color: #79c271;
 }
 
+statusindicator > loadingindicator {
+  margin: 2px;
+}
+
 messagebubble.document .file:hover > overlay > statusindicator {
   opacity: 0.85;
 }

diff --git a/src/ui/session/content/message_row/document/mod.rs b/src/ui/session/content/message_row/document/mod.rs
@@ -166,38 +166,37 @@ impl MessageDocument {
     ) {
         let imp = self.imp();
         let click = &*imp.click;
-        let indicator = &*imp.status_indicator;
         let file_id = file.id;
 
+        imp.status_indicator.set_status(status);
         let handler_id = match status {
-            FileStatus::Downloading(_progress) | FileStatus::Uploading(_progress) => {
+            FileStatus::Downloading(_) | FileStatus::Uploading(_) => {
                 return;
-                // Show loading indicator
             }
             FileStatus::CanBeDownloaded => {
                 // Download file
-                indicator.set_status(FileStatus::CanBeDownloaded);
                 click.connect_released(clone!(@weak self as obj, @weak session => move |click, _, _, _| {
                     // TODO: Fix bug mentioned here
                     // https://github.com/paper-plane-developers/paper-plane/pull/372#discussion_r968841370
                     session.download_file_with_updates(file_id, clone!(@weak obj, @weak session => move |file| {
                         obj.update_status(file, session);
                     }));
 
-                    obj.imp().status_indicator.set_status(FileStatus::Downloading(0.0));
+                    let imp = obj.imp();
+
+                    imp.status_indicator.set_status(FileStatus::Downloading(0.0));
                     let handler_id = click.connect_released(clone!(@weak session => move |_, _, _, _| {
                         session.cancel_download_file(file_id);
                     }));
-                    if let Some(handler_id) = obj.imp().status_handler_id.replace(Some(handler_id)) {
+                    if let Some(handler_id) = imp.status_handler_id.replace(Some(handler_id)) {
                         click.disconnect(handler_id);
                     }
                 }))
             }
             FileStatus::Downloaded => {
                 // Open file
-                indicator.set_status(FileStatus::Downloaded);
                 if imp.file_thumbnail_picture.file().is_some() {
-                    indicator.set_visible(false);
+                    imp.status_indicator.set_visible(false);
                 }
                 let gio_file = gio::File::for_path(&file.local.path);
                 click.connect_released(move |_, _, _, _| {

diff --git a/src/ui/session/content/message_row/document/status_indicator.blp b/src/ui/session/content/message_row/document/status_indicator.blp
@@ -6,4 +6,6 @@ template $PaplMessageDocumentStatusIndicator {
     overflow: hidden;
 
     Image status_image {}
+
+    $OriLoadingIndicator loading_indicator {}
 }
diff --git a/src/ui/session/content/message_row/document/status_indicator.rs b/src/ui/session/content/message_row/document/status_indicator.rs
@@ -21,6 +21,8 @@ mod imp {
         pub(super) masked: Cell<bool>,
         #[template_child]
         pub(super) status_image: TemplateChild<gtk::Image>,
+        #[template_child]
+        pub(super) loading_indicator: TemplateChild<ori::LoadingIndicator>,
     }
 
     #[glib::object_subclass]
@@ -103,12 +105,18 @@ glib::wrapper! {
 
 impl StatusIndicator {
     pub(crate) fn set_status(&self, status: FileStatus) {
-        let icon_name = match status {
-            FileStatus::Downloading(_) | FileStatus::Uploading(_) => "media-playback-stop-symbolic",
-            FileStatus::CanBeDownloaded => "document-save-symbolic",
-            FileStatus::Downloaded => "folder-documents-symbolic",
+        let (loading_is_visible, progress, icon_name) = match status {
+            FileStatus::Downloading(progress) | FileStatus::Uploading(progress) => {
+                (true, progress, "media-playback-stop-symbolic")
+            }
+            FileStatus::CanBeDownloaded => (false, 0.0, "document-save-symbolic"),
+            FileStatus::Downloaded => (false, 0.0, "folder-documents-symbolic"),
         };
 
-        self.imp().status_image.set_icon_name(Some(icon_name));
+        let imp = self.imp();
+
+        imp.loading_indicator.set_visible(loading_is_visible);
+        imp.loading_indicator.set_progress(progress);
+        imp.status_image.set_icon_name(Some(icon_name));
     }
 }