Merge pull request #431 from CNinnovation/428-accountpage-userinformation

Added user-information to the account-page

Author: christiannagel

src/clients/xaml/CodeBreaker.WinUI/CodeBreaker.WinUI.csproj

@@ -63,13 +63,14 @@
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="2.0.0-beta1.12" />
+    <!--<PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="2.0.0-beta1.12" />-->
+    <PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="2.0.1-beta.1.21" />
     <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.49.1" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.50.0" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230217.4" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageReference Include="WinUIEx" Version="2.1.0" />

src/clients/xaml/CodeBreaker.WinUI/Converters/FirstOrDefaultConverter.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using Microsoft.UI.Xaml.Data;
+
+namespace CodeBreaker.WinUI.Converters;
+
+internal class FirstOrDefaultConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object parameter, string language)
+    {
+        if (value is not IEnumerable enumerable)
+            throw new ArgumentException("The value has to be an enumerable");
+
+        foreach (var item in enumerable)
+            return item;
+
+        return null;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, string language) =>
+        throw new NotImplementedException();
+}

src/clients/xaml/CodeBreaker.WinUI/Views/Pages/AccountPage.xaml

@@ -8,8 +8,10 @@
     xmlns:toolkitControls="using:CommunityToolkit.WinUI.UI.Controls"
     xmlns:cme="using:CodeBreaker.WinUI.CustomMarkupExtensions"
     xmlns:ca="using:CodeBreaker.WinUI.CustomAttachedProperties"
+    xmlns:c="using:CodeBreaker.WinUI.Converters"
     mc:Ignorable="d">
     <Page.Resources>
+        <c:FirstOrDefaultConverter x:Key="FirstOrDefaultConverter" />
         <Style TargetType="toolkitControls:HeaderedContentControl">
             <Setter Property="Margin" Value="0,0,0,25" />
             <Setter Property="HeaderTemplate">
@@ -24,9 +26,9 @@
 
     <Grid>
         <StackPanel>
-            <toolkitControls:HeaderedContentControl Header="{cme:ResourceString Name=AccountPage_NameHeader}" Content="Sebastian Szvetecz" />
-            <toolkitControls:HeaderedContentControl Header="{cme:ResourceString Name=AccountPage_MailHeader}" Content="sebastian@szvetecz.at" />
-            <toolkitControls:HeaderedContentControl Header="{cme:ResourceString Name=AccountPage_GamerNameHeader}" Content="szv_gamer" />
+            <toolkitControls:HeaderedContentControl Header="{cme:ResourceString Name=AccountPage_NameHeader}" Content="{x:Bind ViewModel.UserInformation.FullName}" />
+            <toolkitControls:HeaderedContentControl Header="{cme:ResourceString Name=AccountPage_MailHeader}" Content="{x:Bind ViewModel.UserInformation.EmailAddresses, Converter={StaticResource FirstOrDefaultConverter}}" />
+            <toolkitControls:HeaderedContentControl Header="{cme:ResourceString Name=AccountPage_GamerNameHeader}" Content="{x:Bind ViewModel.UserInformation.GamerName}" />
             <Button
                 Style="{StaticResource AccentButtonStyle}"
                 ca:Confirm.Enabled="True"