diff --git a/src/ST.Client.Desktop.Avalonia/Application/Converters/IconIsVisibleValueConverter.cs b/src/ST.Client.Desktop.Avalonia/Application/Converters/StringEqualsConverter.cs similarity index 90% rename from src/ST.Client.Desktop.Avalonia/Application/Converters/IconIsVisibleValueConverter.cs rename to src/ST.Client.Desktop.Avalonia/Application/Converters/StringEqualsConverter.cs index a8cf5c4ce..81061102b 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/Converters/IconIsVisibleValueConverter.cs +++ b/src/ST.Client.Desktop.Avalonia/Application/Converters/StringEqualsConverter.cs @@ -3,7 +3,7 @@ using System.Globalization; namespace System.Application.Converters { - public class IconIsVisibleValueConverter : IValueConverter + public class StringEqualsConverter : IValueConverter { static string ToString(object? obj) => obj?.ToString() ?? string.Empty; diff --git a/src/ST.Client.Desktop.Avalonia/Application/Converters/StringFormatConverter.cs b/src/ST.Client.Desktop.Avalonia/Application/Converters/StringFormatConverter.cs index 4b9163467..ee1496f1e 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/Converters/StringFormatConverter.cs +++ b/src/ST.Client.Desktop.Avalonia/Application/Converters/StringFormatConverter.cs @@ -7,7 +7,7 @@ namespace System.Application.Converters { public class StringFormatConverter : IValueConverter, IMultiValueConverter { - public object? Convert(object value, Type targetType, object parameter, CultureInfo culture) + public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) { if (value is not string str) str = value?.ToString() ?? string.Empty; if (parameter is not string para) para = parameter?.ToString() ?? string.Empty; @@ -18,7 +18,7 @@ namespace System.Application.Converters return str; } - public object? Convert(IList values, Type targetType, object parameter, CultureInfo culture) + public object? Convert(IList values, Type targetType, object? parameter, CultureInfo culture) { var stringValues = values.Select(x => (x is not string str) ? x?.ToString() ?? string.Empty : str); var format = stringValues.FirstOrDefault() ?? string.Empty; @@ -26,7 +26,7 @@ namespace System.Application.Converters return format.Format(args); } - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) { throw new NotImplementedException(); } diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/BindPhoneNumberWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/BindPhoneNumberWindow.axaml index 8686833e1..bc8c9748b 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/BindPhoneNumberWindow.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/BindPhoneNumberWindow.axaml @@ -31,7 +31,7 @@ diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml index 745c81583..a56376b35 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml @@ -27,7 +27,7 @@ x:CompileBindings="True" Title="{Binding Title}"> - + @@ -149,11 +149,11 @@ + IsVisible="{Binding,Mode=OneWay,Converter={StaticResource StringEqualsConverter},ConverterParameter=QQ}" /> + IsVisible="{Binding,Mode=OneWay,Converter={StaticResource StringEqualsConverter},ConverterParameter=Microsoft}" /> + IsVisible="{Binding,Mode=OneWay,Converter={StaticResource StringEqualsConverter},ConverterParameter=Apple}" /> diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml index b8898dcc8..7b282f29c 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml @@ -4,10 +4,9 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:sys="using:System" mc:Ignorable="d" - d:DesignWidth="450" d:DesignHeight="700" - Width="450" Height="700" - MinWidth="450" MinHeight="700" - MaxWidth="450" MaxHeight="700" + d:DesignWidth="450" d:DesignHeight="600" + Width="450" Height="600" + MinWidth="450" MinHeight="600" x:Class="System.Application.UI.Views.Windows.UserProfileWindow" xmlns:controls="clr-namespace:System.Application.UI.Views.Controls" xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop" @@ -31,6 +30,13 @@ + @@ -58,84 +64,88 @@ - + - - - - -