Merge branch 'dev' into user-replies-tidy

Satellite-im · Jan 16, 2024 · 47ce0ae · 47ce0ae
2 parents a6411be + 6b68d8e
commit 47ce0ae
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/common/src/warp_runner/manager/commands/constellation_commands.rs b/common/src/warp_runner/manager/commands/constellation_commands.rs
@@ -277,8 +277,8 @@ fn get_items_from_current_directory(
         .filter_map(|item| item.get_file().ok())
         .collect::<Vec<_>>();
 
-    directories.sort_by_key(|b| std::cmp::Reverse(b.modified()));
-    files.sort_by_key(|b| std::cmp::Reverse(b.modified()));
+    directories.sort_by_key(|b| std::cmp::Reverse(b.creation()));
+    files.sort_by_key(|b| std::cmp::Reverse(b.creation()));
 
     let max_size = warp_storage.max_size();
     let current_size = warp_storage.current_size();

diff --git a/icons/src/icons/outline/loader.svg b/icons/src/icons/outline/loader.svg
diff --git a/kit/src/elements/loader/mod.rs b/kit/src/elements/loader/mod.rs
@@ -6,13 +6,22 @@ use dioxus::prelude::*;
 pub struct Props {
     #[props(optional)]
     spinning: Option<bool>,
+    #[props(optional)]
+    large: Option<bool>,
+}
+
+pub fn is_large(cx: &Scope<Props>) -> bool {
+    if let Some(f) = cx.props.large.as_ref() {
+        return *f;
+    }
+    false
 }
 
 #[allow(non_snake_case)]
 pub fn Loader(cx: Scope<Props>) -> Element {
     cx.render(rsx!(
     div {
-        class: "loader",
+        class: if is_large(&cx) { "loader large" } else { "loader" },
         div {
             class: "spin",
             IconElement { icon: Icon::Loader }

diff --git a/kit/src/elements/loader/style.scss b/kit/src/elements/loader/style.scss
@@ -18,6 +18,24 @@
         fill: transparent;
         stroke: var(--text-color);
     }
+
+    &.large {
+      width: 60px;
+      height: 60px;
+
+      .spin {
+        width: 60px;
+        height: 60px;
+        top: 30px;
+        left: 30px;
+      }
+
+      svg {
+        height: 60px;
+        width: 60px;
+        stroke-width: 0.02rem;
+      }
+    }
 }
 
 @keyframes spin {