feat(message): add success type

NJUPT-SAST · Aug 31, 2024 · 34219a9 · 34219a9
1 parent e2ec28d
commit 34219a9
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 58 deletions.
diff --git a/ui/assets/image/icon/arrow-left.svg b/ui/assets/image/icon/arrow-left.svg
diff --git a/ui/assets/image/icon/check-circle.svg b/ui/assets/image/icon/check-circle.svg
diff --git a/ui/assets/image/image_token.slint b/ui/assets/image/image_token.slint
@@ -31,6 +31,7 @@ struct EventoIconCollection {
     tree-list: image,
     account-box: image,
     pentagon: image,
+    check-circle: image,
 }
 
 struct EventoDisplayCollection {
@@ -88,6 +89,7 @@ export global EventoImageToken {
         tree-list: @image-url("./icon/tree-list.svg"),
         account-box: @image-url("./icon/account-box-outline.svg"),
         pentagon: @image-url("./icon/pentagon.svg"),
+        check-circle: @image-url("./icon/check-circle.svg"),
     };
     // display used as images bigger than icon
     // most display image won't change according to darkmode switch

diff --git a/ui/components/toast.slint b/ui/components/toast.slint
@@ -36,76 +36,55 @@ export component Toast {
         }
 
         _content := HorizontalLayout {
-            padding: 16px;
-            spacing: 12px;
+            padding-left: 16px;
+            padding-right: 16px;
+            spacing: 8px;
             alignment: start;
             if have-icon: _icon := Empty {
                 width: 24px;
+                height: 100%;
                 Image {
                     height: 24px;
                     width: 24px;
                     source: icon;
                     colorize: on-surface;
                 }
             }
-            _text := Text {
-                vertical-alignment: center;
-                horizontal-alignment: left;
-                text: message-data.content;
-                color: on-surface;
-                font-size: font.size;
-                font-weight: font.weight;
+            Empty {
+                height: 100%;
+                _text := Text {
+                    text: message-data.content;
+                    color: on-surface;
+                    font-size: font.size;
+                    font-weight: font.weight;
+                }
             }
+
+            states [
+                have-icon when have-icon: {
+                    padding-left: 12px;
+                }
+            ]
         }
     }
 
-    // TODO: support more type
     states [
-        error when message-data.type == MessageType.Error: {
+        error when message-data.type == MessageType.error: {
             have-icon: true;
             icon: Token.image.icon.error;
             surface: Token.color.error;
             on-surface: Token.color.on-error;
         }
-        warning when message-data.type == MessageType.Warning: {
+        warning when message-data.type == MessageType.warning: {
             have-icon: true;
             icon: Token.image.icon.error;
         }
-        info when message-data.type == MessageType.Info: {
+        success when message-data.type == MessageType.success: {
+            have-icon: true;
+            icon: Token.image.icon.check-circle;
+        }
+        info when message-data.type == MessageType.info: {
             have-icon: false;
         }
     ]
 }
-
-component Test {
-    // HorizontalLayout {
-    //     y: - self.height;
-    //     Button {
-    //         content: "Info";
-    //         clicked => {
-    //             MessageManagerBridge.type = MessageType.Info;
-    //         }
-    //     }
-
-    //     Button {
-    //         content: "Warning";
-    //         clicked => {
-    //             MessageManagerBridge.type = MessageType.Warning;
-    //         }
-    //     }
-
-    //     Button {
-    //         content: "Error";
-    //         clicked => {
-    //             MessageManagerBridge.type = MessageType.Error;
-    //         }
-    //     }
-    // }
-
-    Toast {
-        // width: 20px;
-        init => {
-            debug(self.width)
-        }
-    }
-}
diff --git a/ui/logic/message_manager.slint b/ui/logic/message_manager.slint
@@ -1,7 +1,8 @@
 export enum MessageType{
-    Info,
-    Warning,
-    Error
+    info,
+    success,
+    warning,
+    error
 }
 
 export struct MessageData {

diff --git a/ui/views/overlay/login.slint b/ui/views/overlay/login.slint
@@ -8,7 +8,7 @@ export global LoginOverlayBridge {
     in-out property <string> version:"v0.0.0-00000000";
     callback link-login();
     public function guest-login() {
-        MessageManager.show-message("访客登录尚未完成", MessageType.Info);
+        MessageManager.show-message("访客登录尚未完成", MessageType.info);
         // ViewManager.prior-view();
     }
 }

diff --git a/ui/views/overlay/menu.slint b/ui/views/overlay/menu.slint
@@ -196,7 +196,7 @@ export component MenuOverlay inherits Overlay {
                 label: "纪念卡";
                 clicked => {
                     // NOTE: Unsupport
-                    MessageManager.show-message("功能还在开发中，咕咕咕 😣", MessageType.Info);
+                    MessageManager.show-message("功能还在开发中，咕咕咕 😣", MessageType.info);
                 }
             }
             if AccountManager.is-login:Divider { }

diff --git a/ui/views/page/setting.slint b/ui/views/page/setting.slint
@@ -9,7 +9,6 @@ export global SettingPageBridge {
     in-out property <bool> notice-begin: false;
     in-out property <bool> notice-end: false;
     in-out property <bool> minimal-to-tray: false;
-
     public function change-theme() {
         if (theme-index == 1) {
             Token.set-display-mode(ColorScheme.light);
@@ -19,7 +18,6 @@ export global SettingPageBridge {
             Token.set-display-mode(ColorScheme.unknown);
         }
     }
-
     callback language-changed();
     callback theme-changed();
     callback notice-begin-changed();
@@ -65,7 +63,6 @@ export component SettingPage inherits Page {
             alignment: LayoutAlignment.start;
             padding: 50px;
             spacing: 15px;
-
             Text {
                 text: "设置";
                 font-size: Token.font.display.medium.size;
@@ -129,7 +126,7 @@ export component SettingPage inherits Page {
                     checked <=> SettingPageBridge.minimal-to-tray;
                     toggled => {
                         SettingPageBridge.minimal-to-tray-changed();
-                        MessageManager.show-message("下次启动应用时生效", MessageType.Info);
+                        MessageManager.show-message("下次启动应用时生效", MessageType.info);
                     }
                 }
             }