From f2b361819b4436b512ab58a299105db88a44515e Mon Sep 17 00:00:00 2001
From: Lightczx <1686188646@qq.com>
Date: Wed, 20 Mar 2024 10:42:14 +0800
Subject: [PATCH] fix userview

---
 src/Snap.Hutao/Snap.Hutao/App.xaml.cs         |  16 +-
 src/Snap.Hutao/Snap.Hutao/View/UserView.xaml  | 234 +++++++++---------
 .../ViewModel/User/UserViewModel.cs           |  10 +-
 3 files changed, 133 insertions(+), 127 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml.cs b/src/Snap.Hutao/Snap.Hutao/App.xaml.cs
index 3c60727e..d7f33573 100644
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml.cs
@@ -26,15 +26,15 @@ public sealed partial class App : Application
 {
     private const string ConsoleBanner = $"""
         ----------------------------------------------------------------
-          _____                         _    _         _                
-         / ____|                       | |  | |       | |               
-        | (___   _ __    __ _  _ __    | |__| | _   _ | |_  __ _   ___  
-         \___ \ | '_ \  / _` || '_ \   |  __  || | | || __|/ _` | / _ \ 
+          _____                         _    _         _ 
+         / ____|                       | |  | |       | |
+        | (___   _ __    __ _  _ __    | |__| | _   _ | |_  __ _   ___
+         \___ \ | '_ \  / _` || '_ \   |  __  || | | || __|/ _` | / _ \
          ____) || | | || (_| || |_) |_ | |  | || |_| || |_| (_| || (_) |
-        |_____/ |_| |_| \__,_|| .__/(_)|_|  |_| \__,_| \__|\__,_| \___/ 
-                              | |                                       
-                              |_| 
-                              
+        |_____/ |_| |_| \__,_|| .__/(_)|_|  |_| \__,_| \__|\__,_| \___/
+                              | |
+                              |_|
+        
         Snap.Hutao is a open source software developed by DGP Studio.
         Copyright (C) 2022 - 2024 DGP Studio, All Rights Reserved.
         ----------------------------------------------------------------
diff --git a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
index a899b3e9..792b3ba8 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
@@ -14,6 +14,106 @@
     xmlns:shvu="using:Snap.Hutao.ViewModel.User"
     d:DataContext="{d:DesignInstance shvu:UserViewModel}"
     mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <shc:BindingProxy x:Key="ViewModelBindingProxy" DataContext="{Binding}"/>
+
+        <DataTemplate x:Key="UserGameRoleTemplate">
+            <StackPanel Padding="0,6">
+                <TextBlock Text="{Binding Nickname}"/>
+                <TextBlock
+                    Margin="0,2,0,0"
+                    Opacity="0.6"
+                    Style="{StaticResource CaptionTextBlockStyle}"
+                    Text="{Binding Description}"/>
+            </StackPanel>
+        </DataTemplate>
+
+        <DataTemplate x:Key="UserTemplate">
+            <Grid Padding="0,12" Background="Transparent">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition Width="auto"/>
+                </Grid.ColumnDefinitions>
+                <PersonPicture
+                    Height="32"
+                    Margin="2,0"
+                    HorizontalAlignment="Left"
+                    ProfilePicture="{Binding UserInfo.AvatarUrl, Mode=OneWay}"/>
+                <TextBlock
+                    Grid.Column="1"
+                    Margin="12,0,0,0"
+                    VerticalAlignment="Center"
+                    Text="{Binding UserInfo.Nickname}"/>
+                <TextBlock
+                    Grid.Column="2"
+                    VerticalAlignment="Center"
+                    Text="HoYoLAB"
+                    Visibility="{Binding IsOversea}"/>
+                <StackPanel
+                    x:Name="ButtonPanel"
+                    Grid.Column="3"
+                    Orientation="Horizontal"
+                    Visibility="Collapsed">
+                    <Button
+                        Margin="12,0,0,0"
+                        VerticalAlignment="Stretch"
+                        Background="Transparent"
+                        Command="{Binding DataContext.CopyCookieCommand, Source={StaticResource ViewModelBindingProxy}}"
+                        CommandParameter="{Binding}"
+                        Content="{StaticResource FontIconContentCopy}"
+                        FontFamily="{StaticResource SymbolThemeFontFamily}"
+                        Style="{StaticResource ButtonRevealStyle}"
+                        ToolTipService.ToolTip="{shcm:ResourceString Name=ViewUserCopyCookieAction}"/>
+                    <Button
+                        Margin="6,0,0,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Stretch"
+                        Background="Transparent"
+                        Command="{Binding DataContext.RemoveUserCommand, Source={StaticResource ViewModelBindingProxy}}"
+                        CommandParameter="{Binding}"
+                        Content="{StaticResource FontIconContentDelete}"
+                        FontFamily="{StaticResource SymbolThemeFontFamily}"
+                        Style="{StaticResource ButtonRevealStyle}"
+                        ToolTipService.ToolTip="{shcm:ResourceString Name=ViewUserRemoveAction}"/>
+                </StackPanel>
+
+                <Grid.Resources>
+                    <Storyboard x:Name="ButtonPanelVisibleStoryboard">
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0">
+                                <DiscreteObjectKeyFrame.Value>
+                                    <Visibility>Visible</Visibility>
+                                </DiscreteObjectKeyFrame.Value>
+                            </DiscreteObjectKeyFrame>
+                        </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+
+                    <Storyboard x:Name="ButtonPanelCollapsedStoryboard">
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0">
+                                <DiscreteObjectKeyFrame.Value>
+                                    <Visibility>Collapsed</Visibility>
+                                </DiscreteObjectKeyFrame.Value>
+                            </DiscreteObjectKeyFrame>
+                        </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                </Grid.Resources>
+
+                <mxi:Interaction.Behaviors>
+                    <mxic:EventTriggerBehavior EventName="PointerEntered">
+                        <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelVisibleStoryboard}"/>
+                    </mxic:EventTriggerBehavior>
+                    <mxic:EventTriggerBehavior EventName="PointerExited">
+                        <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelCollapsedStoryboard}"/>
+                    </mxic:EventTriggerBehavior>
+                </mxi:Interaction.Behaviors>
+            </Grid>
+        </DataTemplate>
+    </UserControl.Resources>
+
     <mxi:Interaction.Behaviors>
         <shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/>
     </mxi:Interaction.Behaviors>
@@ -57,7 +157,6 @@
                         <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="NavigationViewItemForegroundPressed"/>
                     </ResourceDictionary>
                 </ResourceDictionary.ThemeDictionaries>
-                <shc:BindingProxy x:Key="ViewModelBindingProxy" DataContext="{Binding}"/>
             </ResourceDictionary>
         </StackPanel.Resources>
 
@@ -79,17 +178,9 @@
                         Grid.Column="1"
                         Margin="1,0,0,0"
                         VerticalAlignment="Center"
-                        Text="{Binding SelectedUser.UserInfo.Nickname, Mode=OneWay}"
+                        Text="{Binding SelectedUser.UserInfo.Nickname, Mode=OneWay, FallbackValue={shcm:ResourceString Name=ViewUserNoUserHint}}"
                         TextTrimming="CharacterEllipsis"
                         TextWrapping="NoWrap"/>
-                    <TextBlock
-                        Grid.Column="1"
-                        Margin="1,0,0,0"
-                        VerticalAlignment="Center"
-                        Text="{shcm:ResourceString Name=ViewUserNoUserHint}"
-                        TextTrimming="CharacterEllipsis"
-                        TextWrapping="NoWrap"
-                        Visibility="{Binding Users.Count, Converter={StaticResource Int32ToVisibilityRevertConverter}}"/>
                     <FontIcon
                         Grid.Column="2"
                         Margin="0,0,8,0"
@@ -231,29 +322,20 @@
 
                         <Grid Grid.Column="1" Width="280">
                             <StackPanel Visibility="{Binding Users.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
-                                <TextBlock
-                                    Margin="10,6,0,6"
-                                    Style="{StaticResource BaseTextBlockStyle}"
-                                    Text="{shcm:ResourceString Name=ViewUserRole}"/>
-                                <ListView
-                                    Grid.Row="1"
-                                    Margin="4"
-                                    ItemsSource="{Binding SelectedUser.UserGameRoles}"
-                                    SelectedItem="{Binding SelectedUser.SelectedUserGameRole, Mode=TwoWay}"
-                                    SelectionMode="Single">
-                                    <ListView.ItemTemplate>
-                                        <DataTemplate>
-                                            <StackPanel Padding="0,6">
-                                                <TextBlock Text="{Binding Nickname}"/>
-                                                <TextBlock
-                                                    Margin="0,2,0,0"
-                                                    Opacity="0.6"
-                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                    Text="{Binding Description}"/>
-                                            </StackPanel>
-                                        </DataTemplate>
-                                    </ListView.ItemTemplate>
-                                </ListView>
+                                <StackPanel Visibility="{Binding SelectedUser, Converter={StaticResource EmptyObjectToVisibilityConverter}, Mode=OneWay}">
+                                    <TextBlock
+                                        Margin="10,6,0,6"
+                                        Style="{StaticResource BaseTextBlockStyle}"
+                                        Text="{shcm:ResourceString Name=ViewUserRole}"/>
+                                    <ListView
+                                        Grid.Row="1"
+                                        Margin="4"
+                                        ItemTemplate="{StaticResource UserGameRoleTemplate}"
+                                        ItemsSource="{Binding SelectedUser.UserGameRoles}"
+                                        SelectedItem="{Binding SelectedUser.SelectedUserGameRole, Mode=TwoWay}"
+                                        SelectionMode="Single"/>
+                                </StackPanel>
+
                                 <TextBlock
                                     Margin="10,6,0,6"
                                     Style="{StaticResource BaseTextBlockStyle}"
@@ -263,6 +345,7 @@
                                     Margin="4"
                                     AllowDrop="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolNegationConverter}}"
                                     CanReorderItems="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolNegationConverter}}"
+                                    ItemTemplate="{StaticResource UserTemplate}"
                                     ItemsSource="{Binding Users}"
                                     SelectedItem="{Binding SelectedUser, Mode=TwoWay}"
                                     SelectionMode="Single">
@@ -275,91 +358,6 @@
                                             Severity="Warning"
                                             Visibility="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolToVisibilityConverter}}"/>
                                     </ListView.Header>
-                                    <ListView.ItemTemplate>
-                                        <DataTemplate>
-                                            <Grid Padding="0,12" Background="Transparent">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="auto"/>
-                                                    <ColumnDefinition/>
-                                                    <ColumnDefinition Width="auto"/>
-                                                    <ColumnDefinition Width="auto"/>
-                                                </Grid.ColumnDefinitions>
-                                                <PersonPicture
-                                                    Height="32"
-                                                    Margin="2,0"
-                                                    HorizontalAlignment="Left"
-                                                    ProfilePicture="{Binding UserInfo.AvatarUrl, Mode=OneWay}"/>
-                                                <TextBlock
-                                                    Grid.Column="1"
-                                                    Margin="12,0,0,0"
-                                                    VerticalAlignment="Center"
-                                                    Text="{Binding UserInfo.Nickname}"/>
-                                                <TextBlock
-                                                    Grid.Column="2"
-                                                    VerticalAlignment="Center"
-                                                    Text="HoYoLAB"
-                                                    Visibility="{Binding IsOversea}"/>
-                                                <StackPanel
-                                                    x:Name="ButtonPanel"
-                                                    Grid.Column="3"
-                                                    Orientation="Horizontal"
-                                                    Visibility="Collapsed">
-                                                    <Button
-                                                        Margin="12,0,0,0"
-                                                        VerticalAlignment="Stretch"
-                                                        Background="Transparent"
-                                                        Command="{Binding DataContext.CopyCookieCommand, Source={StaticResource ViewModelBindingProxy}}"
-                                                        CommandParameter="{Binding}"
-                                                        Content="{StaticResource FontIconContentCopy}"
-                                                        FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                                        Style="{StaticResource ButtonRevealStyle}"
-                                                        ToolTipService.ToolTip="{shcm:ResourceString Name=ViewUserCopyCookieAction}"/>
-                                                    <Button
-                                                        Margin="6,0,0,0"
-                                                        HorizontalAlignment="Right"
-                                                        VerticalAlignment="Stretch"
-                                                        Background="Transparent"
-                                                        Command="{Binding DataContext.RemoveUserCommand, Source={StaticResource ViewModelBindingProxy}}"
-                                                        CommandParameter="{Binding}"
-                                                        Content="{StaticResource FontIconContentDelete}"
-                                                        FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                                        Style="{StaticResource ButtonRevealStyle}"
-                                                        ToolTipService.ToolTip="{shcm:ResourceString Name=ViewUserRemoveAction}"/>
-                                                </StackPanel>
-
-                                                <Grid.Resources>
-                                                    <Storyboard x:Name="ButtonPanelVisibleStoryboard">
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                                <DiscreteObjectKeyFrame.Value>
-                                                                    <Visibility>Visible</Visibility>
-                                                                </DiscreteObjectKeyFrame.Value>
-                                                            </DiscreteObjectKeyFrame>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                    </Storyboard>
-
-                                                    <Storyboard x:Name="ButtonPanelCollapsedStoryboard">
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                                <DiscreteObjectKeyFrame.Value>
-                                                                    <Visibility>Collapsed</Visibility>
-                                                                </DiscreteObjectKeyFrame.Value>
-                                                            </DiscreteObjectKeyFrame>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                    </Storyboard>
-                                                </Grid.Resources>
-
-                                                <mxi:Interaction.Behaviors>
-                                                    <mxic:EventTriggerBehavior EventName="PointerEntered">
-                                                        <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelVisibleStoryboard}"/>
-                                                    </mxic:EventTriggerBehavior>
-                                                    <mxic:EventTriggerBehavior EventName="PointerExited">
-                                                        <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelCollapsedStoryboard}"/>
-                                                    </mxic:EventTriggerBehavior>
-                                                </mxi:Interaction.Behaviors>
-                                            </Grid>
-                                        </DataTemplate>
-                                    </ListView.ItemTemplate>
                                 </ListView>
                             </StackPanel>
                             <TextBlock
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs
index 6b853216..34a9a727 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs
@@ -67,10 +67,13 @@ internal sealed partial class UserViewModel : ObservableObject
                 }
             }
 
-            if (SetProperty(ref selectedUser, value))
+            if (!ReferenceEquals(selectedUser, value))
             {
+                selectedUser = value;
                 userService.Current = value;
             }
+
+            OnPropertyChanged(nameof(SelectedUser));
         }
     }
 
@@ -216,6 +219,11 @@ internal sealed partial class UserViewModel : ObservableObject
 
         try
         {
+            if (user.IsSelected)
+            {
+                SelectedUser = default;
+            }
+
             await userService.RemoveUserAsync(user).ConfigureAwait(false);
             infoBarService.Success(SH.FormatViewModelUserRemoved(user.UserInfo?.Nickname));
         }