feat: add load animation when login

NJUPT-SAST · Oct 17, 2024 · 04f6637 · 04f6637
1 parent 7969141
commit 04f6637
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/src/Controller/AsyncExecutor.hh b/src/Controller/AsyncExecutor.hh
@@ -148,7 +148,10 @@ private:
     AsyncExecutor() {
         _iocThread = std::thread([this] {
             net::signal_set signals{_ioc, SIGINT, SIGTERM};
-            signals.async_wait([&](auto, auto) { _ioc.stop(); });
+            signals.async_wait([&](auto, auto) {
+                _ioc.stop();
+                slint::quit_event_loop();
+            });
             net::executor_work_guard<decltype(_ioc.get_executor())> work{_ioc.get_executor()};
             _ioc.run();
         });

diff --git a/src/Controller/Core/AccountManager.cc b/src/Controller/Core/AccountManager.cc
@@ -165,6 +165,7 @@ void AccountManager::tryLoginDirectly() {
     }
 
     spdlog::info("Try login directly, expired time: {}", _expiredTime.time_since_epoch().count());
+    self->set_loading(true);
 
 #ifdef EVENTO_API_V1
     if (auto token = getKeychainAccessToken()) {
@@ -179,6 +180,7 @@ void AccountManager::tryLoginDirectly() {
     }
 #endif
     else {
+        self->set_loading(false);
         self.bridge.getMessageManager().showMessage("登录过期，请重新登录", MessageType::Info);
     }
 }
@@ -289,6 +291,7 @@ void AccountManager::setKeychainAccessToken(const std::string& accessToken) cons
 
 void AccountManager::setLoginState(bool newState) {
     auto& self = *this;
+    self->set_loading(false);
     if (_loginState != newState) {
         _loginState = newState;
         self->set_is_login(newState);

diff --git a/src/Controller/View/LoginOverlay.cc b/src/Controller/View/LoginOverlay.cc
@@ -26,6 +26,7 @@ void LoginOverlay::onShow() {
 }
 
 void LoginOverlay::onLogin() {
+    auto& self = *this;
     if (bridge.getViewManager().isVisible(ViewName::LoginOverlay)) {
         bridge.getViewManager().priorView();
     }

diff --git a/ui/logic/account_manager.slint b/ui/logic/account_manager.slint
@@ -1,5 +1,6 @@
 export global AccountManagerBridge {
     in-out property <bool> is-login;
+    in-out property <bool> loading: false;
     callback request-login();
     callback request-logout();
 }

diff --git a/ui/views/overlay/login.slint b/ui/views/overlay/login.slint
@@ -2,7 +2,7 @@ import { Token } from "../../global.slint";
 import { Overlay, Empty, StyledText } from "../../components/index.slint";
 import { ViewManager, MessageManager, MessageType, AccountManagerBridge } from "../../logic/index.slint";
 import { SButton } from "../../modules/surrealism-ui/index.slint";
-import { Button, ButtonType } from "../../components/index.slint";
+import { Button, ButtonType, LoadingAnimation } from "../../components/index.slint";
 
 export global LoginOverlayBridge {
     in-out property <string> version:"v0.0.0-00000000";
@@ -72,7 +72,8 @@ export component LoginOverlay inherits Overlay {
                     icon-size: 31px;
                     filled-surface: Token.color.inverse-surface;
                     filled-on-surface: Token.color.inverse-on-surface;
-                    Path {
+                    // disable: AccountManagerBridge.loading;
+                    if !AccountManagerBridge.loading: Path {
                         width: 31px;
                         height: 26px;
                         viewbox-width: 31;
@@ -82,6 +83,9 @@ export component LoginOverlay inherits Overlay {
                         stroke-width: 2px;
                         fill-rule: FillRule.evenodd;
                     }
+                    if AccountManagerBridge.loading: LoadingAnimation {
+                        color: parent.filled-on-surface;
+                    }
 
                     clicked => {
                         LoginOverlayBridge.link-login();