Merge pull request #61 from sahin-a/60-i-want-to-know-which-steam-acc…

…ount-im-on avatars are now bigger and currently logged in steam account now gets…
sahin-a · Apr 15, 2023 · ed29f7b · ed29f7b
2 parents 0e0c95b + 004f11c
commit ed29f7b
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 25 deletions.
diff --git a/SteamAccountManager.AvaloniaUI/Mappers/AccountMapper.cs b/SteamAccountManager.AvaloniaUI/Mappers/AccountMapper.cs
@@ -1,11 +1,10 @@
-using SteamAccountManager.AvaloniaUI.Common;
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using SteamAccountManager.AvaloniaUI.Common;
 using SteamAccountManager.AvaloniaUI.Common.Utils;
 using SteamAccountManager.AvaloniaUI.Models;
 using SteamAccountManager.AvaloniaUI.Services;
-using System;
-using System.Text;
-using System.Threading.Tasks;
-using Account = SteamAccountManager.AvaloniaUI.Models.Account;
 
 namespace SteamAccountManager.AvaloniaUI.Mappers
 {
@@ -34,6 +33,7 @@ private string GetTimePassedFormatted(long minutesPassed)
                     stringBuilder.Append($"{minutesPassed} minutes");
                     break;
             }
+
             stringBuilder.Append(" ago");
 
             return stringBuilder.ToString();
@@ -46,7 +46,7 @@ public async Task<Account> FromSteamAccount(Domain.Steam.Model.Account steamAcco
             var avatar = await _avatarService.GetAvatarAsync(steamAccount.Id, steamAccount.AvatarUrl);
             var rank = new Rank
             {
-                Level = steamAccount.Level
+                Level = steamAccount.Level,
             };
 
             return new Account
@@ -60,8 +60,9 @@ public async Task<Account> FromSteamAccount(Domain.Steam.Model.Account steamAcco
                 IsVacBanned = steamAccount.IsVacBanned,
                 IsCommunityBanned = steamAccount.IsCommunityBanned,
                 LastLogin = timePassedSinceLastLogin,
-                Rank = rank
+                Rank = rank,
+                IsLoggedIn = steamAccount.IsLoggedIn,
             };
         }
     }
-}
+}
diff --git a/SteamAccountManager.AvaloniaUI/Models/Account.cs b/SteamAccountManager.AvaloniaUI/Models/Account.cs
@@ -14,6 +14,7 @@ public class Account
         public bool IsVacBanned { get; set; }
         public bool IsCommunityBanned { get; set; }
         public string LastLogin { get; set; } = string.Empty;
+        public bool IsLoggedIn { get; set; }
 
         public Rank Rank { get; set; } = new()
         {

diff --git a/SteamAccountManager.AvaloniaUI/SteamAccountSwitcherStyles.xaml b/SteamAccountManager.AvaloniaUI/SteamAccountSwitcherStyles.xaml
@@ -48,4 +48,16 @@
     <Style Selector="TextBlock.Title">
         <Setter Property="FontSize" Value="16" />
     </Style>
+
+    <Style Selector="Border.Active">
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="BorderBrush" Value="#23a559" />
+        <Setter Property="CornerRadius" Value="10" />
+        <Setter Property="Padding" Value="2" />
+    </Style>
+
+    <Style Selector="Border.Rounded">
+        <Setter Property="CornerRadius" Value="10" />
+        <Setter Property="ClipToBounds" Value="True" />
+    </Style>
 </Styles>
diff --git a/SteamAccountManager.AvaloniaUI/ViewModels/AccountSwitcherViewModel.cs b/SteamAccountManager.AvaloniaUI/ViewModels/AccountSwitcherViewModel.cs
@@ -34,7 +34,6 @@ public class AccountSwitcherViewModel : RoutableViewModel
         public ICommand RefreshAccountsCommand { get; }
         public ICommand ShowInfoCommand { get; }
         public ICommand AddAccountCommand { get; }
-        public Account? SelectedAccount { get; set; }
         public VisibilityConfig Config { get; private set; } = new();
 
         private bool _isLoading;
@@ -161,7 +160,6 @@ private async void SendNotification(Account account)
         public async void OnAccountSelected(Account selectedAccount)
         {
             await _switchAccountUseCase.Execute(selectedAccount.Name);
-            SelectedAccount = selectedAccount;
             SendNotification(selectedAccount);
         }
 

diff --git a/SteamAccountManager.AvaloniaUI/Views/AccountSwitcherView.axaml b/SteamAccountManager.AvaloniaUI/Views/AccountSwitcherView.axaml
@@ -22,6 +22,7 @@
             </UniformGrid>
         </Grid>
 
+        <!-- Account Selection -->
         <Grid Grid.Column="1">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
@@ -62,14 +63,22 @@
                                     IsVisible="{Binding Path=DataContext.Config.ShowAvatar, 
 									RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
                                     Margin="0,0,12,0">
-                                    <Button.Styles>
-                                        <Style Selector="Border">
-                                            <Setter Property="CornerRadius" Value="10" />
-                                        </Style>
-                                    </Button.Styles>
                                     <Button.Template>
                                         <ControlTemplate>
-                                            <Image Source="{Binding ProfilePicture}" Width="40" Height="40" />
+                                            <Grid Width="48" Height="48">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*" />
+                                                </Grid.ColumnDefinitions>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="*" />
+                                                </Grid.RowDefinitions>
+
+                                                <Border Classes.Active="{Binding IsLoggedIn}">
+                                                    <Border Classes="Rounded">
+                                                        <Image Source="{Binding ProfilePicture}" />
+                                                    </Border>
+                                                </Border>
+                                            </Grid>
                                         </ControlTemplate>
                                     </Button.Template>
                                 </Button>
@@ -79,8 +88,7 @@
                                     <Border VerticalAlignment="Center" Margin="0,0,12,0"
                                             IsVisible="{Binding Path=DataContext.Config.ShowBanStatus, 
 									RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
-                                        <TextBlock IsVisible="{Binding IsVacBanned}" Text="🛡️"
-                                                   FontSize="28" />
+                                        <TextBlock IsVisible="{Binding IsVacBanned}" Text="🛡️" FontSize="28" />
                                     </Border>
 
                                     <StackPanel Orientation="Vertical" VerticalAlignment="Center" Margin="0,0,12,0">

diff --git a/SteamAccountManager.Domain/Steam/Model/Account.cs b/SteamAccountManager.Domain/Steam/Model/Account.cs
@@ -12,5 +12,6 @@ public class Account
         public bool IsLoginValid { get; set; }
         public DateTime LastLogin { get; set; }
         public int Level { get; set; }
+        public bool IsLoggedIn { get; set; }
     }
-}
+}
diff --git a/SteamAccountManager.Domain/Steam/UseCase/GetAccountsWithDetailsUseCase.cs b/SteamAccountManager.Domain/Steam/UseCase/GetAccountsWithDetailsUseCase.cs
@@ -11,7 +11,8 @@ public class GetAccountsWithDetailsUseCase : IGetAccountsWithDetailsUseCase
         private readonly ISteamProfileService _steamProfileService;
         private readonly ILogger _logger;
 
-        public GetAccountsWithDetailsUseCase(ISteamRepository steamRepository, ISteamProfileService steamProfileService, ILogger logger)
+        public GetAccountsWithDetailsUseCase(ISteamRepository steamRepository, ISteamProfileService steamProfileService,
+            ILogger logger)
         {
             _steamRepository = steamRepository;
             _steamProfileService = steamProfileService;
@@ -22,6 +23,7 @@ public async Task<List<Account>> Execute()
         {
             try
             {
+                var currentlySetAutoLoginUserId = (await _steamRepository.GetCurrentAutoLoginUser()).SteamId;
                 var steamLoginUsers = await _steamRepository.GetSteamLoginHistoryUsers();
                 var steamIds = steamLoginUsers.Select(user => user.SteamId);
                 var steamProfiles = await _steamProfileService.GetProfileDetails(steamIds.ToArray());
@@ -30,14 +32,14 @@ public async Task<List<Account>> Execute()
                 {
                     var steamProfile = steamProfiles.FirstOrDefault(
                         profile => profile.Id == steamLoginUser.SteamId,
-                        new Profile()
+                        new Profile
                         {
                             Username = steamLoginUser.Username,
-                            Level = -1
+                            Level = -1,
                         }
                     );
 
-                    return new Account()
+                    return new Account
                     {
                         Id = steamLoginUser.SteamId,
                         Name = steamLoginUser.AccountName,
@@ -48,7 +50,8 @@ public async Task<List<Account>> Execute()
                         IsCommunityBanned = steamProfile.IsCommunityBanned,
                         LastLogin = steamLoginUser.LastLogin,
                         IsLoginValid = steamLoginUser.IsLoginTokenValid,
-                        Level = steamProfile.Level
+                        Level = steamProfile.Level,
+                        IsLoggedIn = steamLoginUser.SteamId == currentlySetAutoLoginUserId,
                     };
                 });
 
@@ -62,4 +65,4 @@ public async Task<List<Account>> Execute()
             return new List<Account>();
         }
     }
-}
+}