Merge pull request #286 from stevejackson80/WIP/Add-Logout-Button

Added a logout button so that a "saved profile" can be forgotten.
stayintarkov · May 24, 2024 · 99886d5 · 99886d5
2 parents 4b25190 + 78f14df
commit 99886d5
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 6 deletions.
diff --git a/SIT.Manager/Localization/en-US.axaml b/SIT.Manager/Localization/en-US.axaml
@@ -428,6 +428,7 @@
 	<!-- CharacterSummaryView -->
 	<system:String x:Key="CharacterSummaryViewPlayButtonText">Play</system:String>
 	<system:String x:Key="CharacterSummaryViewLoginButtonText">Login</system:String>
+	<system:String x:Key="CharacterSummaryViewLogoutButtonText">Logout</system:String>
 
 	<!-- CreateServerDialogView -->
 	<system:String x:Key="CreateServerDialogViewAddTitle">Add Server</system:String>

diff --git a/SIT.Manager/Localization/ru-RU.axaml b/SIT.Manager/Localization/ru-RU.axaml
@@ -429,6 +429,7 @@
 	<!-- CharacterSummaryView -->
 	<system:String x:Key="CharacterSummaryViewPlayButtonText">Играть</system:String>
 	<system:String x:Key="CharacterSummaryViewLoginButtonText">Войти</system:String>
+    <system:String x:Key="CharacterSummaryViewLogoutButtonText">Выход</system:String>
 
 	<!-- CreateServerDialogView -->
 	<system:String x:Key="CreateServerDialogViewAddTitle">Добавить сервер</system:String>

diff --git a/SIT.Manager/Localization/uk-UA.axaml b/SIT.Manager/Localization/uk-UA.axaml
@@ -430,6 +430,7 @@
 	<!-- CharacterSummaryView -->
 	<system:String x:Key="CharacterSummaryViewPlayButtonText">Грати</system:String>
 	<system:String x:Key="CharacterSummaryViewLoginButtonText">Ввійти</system:String>
+    <system:String x:Key="CharacterSummaryViewLogoutButtonText">Вихід</system:String>
 
 	<!-- CreateServerDialogView -->
 	<system:String x:Key="CreateServerDialogViewAddTitle">Додати сервер</system:String>

diff --git a/SIT.Manager/Localization/zh-CN.axaml b/SIT.Manager/Localization/zh-CN.axaml
@@ -430,6 +430,7 @@
 	<!-- CharacterSummaryView -->
 	<system:String x:Key="CharacterSummaryViewPlayButtonText">玩</system:String>
 	<system:String x:Key="CharacterSummaryViewLoginButtonText">登录</system:String>
+    <system:String x:Key="CharacterSummaryViewLogoutButtonText">注销</system:String>
 
 	<!-- CreateServerDialogView -->
 	<system:String x:Key="CreateServerDialogViewAddTitle">添加服务器</system:String>

diff --git a/SIT.Manager/Localization/zh-HK.axaml b/SIT.Manager/Localization/zh-HK.axaml
@@ -429,6 +429,7 @@
 	<!-- CharacterSummaryView -->
 	<system:String x:Key="CharacterSummaryViewPlayButtonText">玩</system:String>
 	<system:String x:Key="CharacterSummaryViewLoginButtonText">登錄</system:String>
+    <system:String x:Key="CharacterSummaryViewLogoutButtonText">注销</system:String>
 
 	<!-- CreateServerDialogView -->
 	<system:String x:Key="CreateServerDialogViewAddTitle">添加伺服器</system:String>

diff --git a/SIT.Manager/Localization/zh-TW.axaml b/SIT.Manager/Localization/zh-TW.axaml
@@ -430,6 +430,7 @@
 	<!-- CharacterSummaryView -->
 	<system:String x:Key="CharacterSummaryViewPlayButtonText">玩</system:String>
 	<system:String x:Key="CharacterSummaryViewLoginButtonText">登入</system:String>
+    <system:String x:Key="CharacterSummaryViewLogoutButtonText">注销</system:String>
 
 	<!-- CreateServerDialogView -->
 	<system:String x:Key="CreateServerDialogViewAddTitle">添加伺服器</system:String>

diff --git a/SIT.Manager/ViewModels/Play/CharacterSummaryViewModel.cs b/SIT.Manager/ViewModels/Play/CharacterSummaryViewModel.cs
@@ -9,6 +9,8 @@
 using SIT.Manager.Services.Caching;
 using SIT.Manager.Views.Play;
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -43,6 +45,8 @@ public partial class CharacterSummaryViewModel : ObservableRecipient
 
     public IAsyncRelayCommand PlayCommand { get; }
 
+    public IAsyncRelayCommand LogoutCommand { get; }
+
     public CharacterSummaryViewModel(AkiServer server,
         AkiMiniProfile profile,
         ILocalizationService localizationService,
@@ -86,6 +90,7 @@ public CharacterSummaryViewModel(AkiServer server,
         Task.Run(SetSideImage);
 
         PlayCommand = new AsyncRelayCommand(Play);
+        LogoutCommand = new AsyncRelayCommand(Logout);
     }
 
     private async Task SetSideImage()
@@ -143,11 +148,6 @@ private async Task Play()
             if (success && rememberLogin)
             {
                 _connectedServer.Characters.Add(character);
-                int index = _configService.Config.BookmarkedServers.FindIndex(x => x.Address == _connectedServer.Address);
-                if (index != -1 && !_configService.Config.BookmarkedServers[index].Characters.Any(x => x.Username == character.Username))
-                {
-                    _configService.Config.BookmarkedServers[index].Characters.Add(character);
-                }
                 _configService.UpdateConfig(_configService.Config);
                 RequireLogin = false;
             }
@@ -164,4 +164,14 @@ private async Task Play()
             await errorDialog.ShowAsync();
         }
     }
+
+    private async Task Logout()
+    {
+        if (character != null)
+        {
+            _connectedServer.Characters.Remove(character);
+            _configService.UpdateConfig(_configService.Config);
+            RequireLogin = true;
+        }
+    }
 }
diff --git a/SIT.Manager/Views/Play/CharacterSummaryView.axaml b/SIT.Manager/Views/Play/CharacterSummaryView.axaml
@@ -9,7 +9,7 @@
              x:Class="SIT.Manager.Views.Play.CharacterSummaryView"
 			 x:DataType="vm:CharacterSummaryViewModel">
 	<controls:Card Margin="8">
-		<Grid ColumnDefinitions="Auto, *, Auto">
+		<Grid ColumnDefinitions="Auto, *, Auto, Auto">
 			<StackPanel Grid.Column="0">
 				<Image Grid.Column="0"
 					VerticalAlignment="Center"
@@ -61,6 +61,15 @@
 							   Text="{DynamicResource CharacterSummaryViewLoginButtonText}"/>
 				</Panel>
 			</Button>
+
+			<Button Grid.Column="3"
+					Margin="14,0"
+                    Command="{Binding LogoutCommand}"
+                    IsVisible="{Binding !RequireLogin}">
+                <Panel>
+                    <TextBlock Text="{DynamicResource CharacterSummaryViewLogoutButtonText}"/>
+                </Panel>
+            </Button>
 		</Grid>
 	</controls:Card>
 </UserControl>