Fix settings.

nodew · May 3, 2024 · 6e6cad1 · 6e6cad1
1 parent 411861e
commit 6e6cad1
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 6 deletions.
diff --git a/PocketClient.Desktop/Strings/en-us/Resources.resw b/PocketClient.Desktop/Strings/en-us/Resources.resw
@@ -476,4 +476,10 @@
   <data name="Settings_Theme.Header" xml:space="preserve">
     <value>Theme</value>
   </data>
+  <data name="Settings_Logout_Confirm.Text" xml:space="preserve">
+    <value>Are you sure to continue?</value>
+  </data>
+  <data name="Settings_Logout_ConfirmBtn.Content" xml:space="preserve">
+    <value>Yes</value>
+  </data>
 </root>
diff --git a/PocketClient.Desktop/Strings/zh-Hans-CN/Resources.resw b/PocketClient.Desktop/Strings/zh-Hans-CN/Resources.resw
@@ -389,6 +389,12 @@
   <data name="Settings_LogoutBtn.Content" xml:space="preserve">
     <value>登出</value>
   </data>
+  <data name="Settings_Logout_Confirm.Text" xml:space="preserve">
+    <value>确定要登出当前用户吗？</value>
+  </data>
+  <data name="Settings_Logout_ConfirmBtn.Content" xml:space="preserve">
+    <value>确认</value>
+  </data>
   <data name="Settings_Personalization.Text" xml:space="preserve">
     <value>个性化</value>
   </data>

diff --git a/PocketClient.Desktop/UserControls/ListDetailsView/ListDetailsView.xaml b/PocketClient.Desktop/UserControls/ListDetailsView/ListDetailsView.xaml
@@ -14,8 +14,8 @@
         <converters:ObjectToVisibilityConverter x:Name="ObjectToVisibilityConverter" NullValue="Collapsed" NonNullValue="Visible" />
     </UserControl.Resources>
 
-    <Border Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-            BorderBrush="{ThemeResource ApplicationForegroundThemeBrush}"
+    <Border Background="Transparent"
+            BorderBrush="Transparent"
             BorderThickness="0">
         <SplitView
             x:Name="mainSplitView"

diff --git a/PocketClient.Desktop/ViewModels/SettingsViewModel.cs b/PocketClient.Desktop/ViewModels/SettingsViewModel.cs
@@ -2,6 +2,7 @@
 
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
@@ -14,7 +15,7 @@
 
 namespace PocketClient.Desktop.ViewModels;
 
-public partial class SettingsViewModel : ObservableRecipient
+public partial class SettingsViewModel : ObservableRecipient, IRecipient<SyncedItemsMessage>
 {
     private readonly IThemeSelectorService _themeSelectorService;
     private readonly IPocketDbService _pocketDbService;
@@ -66,6 +67,13 @@ public SettingsViewModel(
         version = GetVersion();
         syncing = _pocketDbService.IsSyncingData();
         dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+
+        IsActive = true;
+    }
+
+    public void Receive(SyncedItemsMessage message)
+    {
+        Syncing = false;
     }
 
     private static string GetVersion()

diff --git a/PocketClient.Desktop/Views/SettingsPage.xaml b/PocketClient.Desktop/Views/SettingsPage.xaml
@@ -84,9 +84,21 @@
 
                 <controls:SettingsCard x:Uid="Settings_SwitchUser"
                                        HeaderIcon="{ui:FontIcon Glyph=&#xE748;}">
-                    <Button x:Uid="Settings_LogoutBtn" 
-                            Style="{StaticResource AccentButtonStyle}"
-                            Command="{x:Bind ViewModel.LogoutCommand}" />
+                    <Button x:Uid="Settings_LogoutBtn"
+                            Style="{StaticResource AccentButtonStyle}" >
+                        <Button.Flyout>
+                            <Flyout>
+                                <StackPanel>
+                                    <TextBlock x:Uid="Settings_Logout_Confirm" 
+                                               Style="{ThemeResource BaseTextBlockStyle}"
+                                               Margin="0,0,0,12" />
+                                    <Button x:Uid="Settings_Logout_ConfirmBtn" 
+                                            Style="{StaticResource AccentButtonStyle}"
+                                            Command="{x:Bind ViewModel.LogoutCommand}" />
+                                </StackPanel>
+                            </Flyout>
+                        </Button.Flyout>
+                    </Button>
                 </controls:SettingsCard>
 
                 <TextBlock x:Uid="Settings_About" Style="{ThemeResource SettingsSectionHeaderTextBlockStyle}" />