diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/CefNetApp.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/CefNetApp.cs
index 4873530a6..b647ecb97 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/CefNetApp.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/CefNetApp.cs
@@ -100,7 +100,7 @@ navigator.__proto__ = newProto;
{
Platform.Windows => Path.Combine(AppContext.BaseDirectory, "CEF", "win-" + GetArch()),
Platform.Linux => Path.Combine(AppContext.BaseDirectory, "CEF", "linux-" + GetArch()),
- Platform.Apple => DI.DeviceIdiom == DeviceIdiom.Desktop ? Path.Combine(AppContext.BaseDirectory, "..", "Contents", "Frameworks", "Chromium Embedded Framework.framework") : throw new PlatformNotSupportedException(),
+ Platform.Apple => DI.DeviceIdiom == DeviceIdiom.Desktop ? Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "..", "..", "Contents", "Frameworks", "Chromium Embedded Framework.framework")) : throw new PlatformNotSupportedException(),
_ => throw new ArgumentOutOfRangeException(nameof(DI.Platform), DI.Platform, null),
};
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml
index 2b9fb226b..396e59107 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml
@@ -290,5 +290,9 @@
M369.9 318.2c44.3 54.3 64.7 98.8 54.4 118.7-7.9 15.1-56.7 44.6-92.6 55.9-29.6 9.3-68.4 13.3-100.4 10.2-38.2-3.7-76.9-17.4-110.1-39C93.3 445.8 87 438.3 87 423.4c0-29.9 32.9-82.3 89.2-142.1 32-33.9 76.5-73.7 81.4-72.6 9.4 2.1 84.3 75.1 112.3 109.5zM188.6 143.8c-29.7-26.9-58.1-53.9-86.4-63.4-15.2-5.1-16.3-4.8-28.7 8.1-29.2 30.4-53.5 79.7-60.3 122.4-5.4 34.2-6.1 43.8-4.2 60.5 5.6 50.5 17.3 85.4 40.5 120.9 9.5 14.6 12.1 17.3 9.3 9.9-4.2-11-.3-37.5 9.5-64 14.3-39 53.9-112.9 120.3-194.4zm311.6 63.5C483.3 127.3 432.7 77 425.6 77c-7.3 0-24.2 6.5-36 13.9-23.3 14.5-41 31.4-64.3 52.8C367.7 197 427.5 283.1 448.2 346c6.8 20.7 9.7 41.1 7.4 52.3-1.7 8.5-1.7 8.5 1.4 4.6 6.1-7.7 19.9-31.3 25.4-43.5 7.4-16.2 15-40.2 18.6-58.7 4.3-22.5 3.9-70.8-.8-93.4zM141.3 43C189 40.5 251 77.5 255.6 78.4c.7.1 10.4-4.2 21.6-9.7 63.9-31.1 94-25.8 107.4-25.2-63.9-39.3-152.7-50-233.9-11.7-23.4 11.1-24 11.9-9.4 11.2z
+
+ M15.75 2C16.9926 2 18 3.00736 18 4.25V19.75C18 20.9926 16.9926 22 15.75 22H8.25C7.00736 22 6 20.9926 6 19.75V4.25C6 3.00736 7.00736 2 8.25 2H15.75ZM13.25 18H10.75C10.3358 18 10 18.3358 10 18.75C10 19.1642 10.3358 19.5 10.75 19.5H13.25C13.6642 19.5 14 19.1642 14 18.75C14 18.3358 13.6642 18 13.25 18Z
+
+
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.shared.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.shared.cs
index 50a6d0c3c..f5a7b56f5 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.shared.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.shared.cs
@@ -188,8 +188,10 @@ namespace System.Application.UI.ViewModels
#endif
}
+ [Obsolete]
public ICommand FastLogin { get; }
+ [Obsolete("use Channels")]
public FastLoginChannel[] FastLoginChannels { get; } = new[] {
FastLoginChannel.Steam,
FastLoginChannel.Xbox,
@@ -197,6 +199,17 @@ namespace System.Application.UI.ViewModels
//FastLoginChannel.QQ,
};
+ public string[] Channels { get; } = new[]
+ {
+ nameof(FastLoginChannel.Steam),
+ nameof(FastLoginChannel.Xbox),
+#if DEBUG
+ nameof(FastLoginChannel.Apple),
+ nameof(FastLoginChannel.QQ),
+#endif
+ nameof(PhoneNumber),
+ };
+
protected override void Dispose(bool disposing)
{
if (disposing)
diff --git a/src/ST.Client.Mobile/Converters/ResourceKeyConverter.cs b/src/ST.Client.Mobile/Converters/ResourceKeyConverter.cs
index 64da84cf0..b9c5c3a05 100644
--- a/src/ST.Client.Mobile/Converters/ResourceKeyConverter.cs
+++ b/src/ST.Client.Mobile/Converters/ResourceKeyConverter.cs
@@ -21,6 +21,9 @@ namespace System.Application.Converters
case "Steam":
key = "SteamDrawing";
break;
+ case "PhoneNumber":
+ key = "Phone";
+ break;
}
if (drawingSvg.ContainsKey(key))
{
diff --git a/src/ST.Client.Mobile/UI/Styles/DrawingSvg.xaml b/src/ST.Client.Mobile/UI/Styles/DrawingSvg.xaml
index bc13f1fb6..ba04cb194 100644
--- a/src/ST.Client.Mobile/UI/Styles/DrawingSvg.xaml
+++ b/src/ST.Client.Mobile/UI/Styles/DrawingSvg.xaml
@@ -14,4 +14,7 @@
M511.104 0C242.261333 0 21.802667 207.36 0.938667 470.912l274.432 113.408a144.512 144.512 0 0 1 81.578666-25.173333c2.688 0 5.333333 0.170667 8.021334 0.256l122.069333-176.725334V380.16a193.194667 193.194667 0 0 1 193.024-193.024c106.410667 0 193.024 86.656 193.024 193.152s-86.613333 193.066667-193.024 193.066667h-4.48l-173.909333 124.202666c0 2.218667 0.170667 4.48 0.170666 6.784a144.725333 144.725333 0 0 1-144.64 144.896 145.578667 145.578667 0 0 1-142.122666-116.352L18.602667 651.52C79.445333 866.432 276.736 1024 511.104 1024c282.752 0 511.957333-229.248 511.957333-512S793.813333 0 511.104 0zM321.706667 776.96l-62.848-26.026667c11.178667 23.168 30.464 42.624 56.064 53.333334a108.842667 108.842667 0 0 0 142.378666-141.824 108.672 108.672 0 0 0-138.88-60.288l64.981334 26.88a80.128 80.128 0 0 1-61.653334 147.925333H321.706667z m487.04-396.928a128.810667 128.810667 0 0 0-128.64-128.64 128.64 128.64 0 1 0 128.64 128.64z m-224.981334-0.213333a96.597333 96.597333 0 1 1 193.322667 0 96.725333 96.725333 0 0 1-96.682667 96.64 96.597333 96.597333 0 0 1-96.64-96.64z
+
+ M15.75 2C16.9926 2 18 3.00736 18 4.25V19.75C18 20.9926 16.9926 22 15.75 22H8.25C7.00736 22 6 20.9926 6 19.75V4.25C6 3.00736 7.00736 2 8.25 2H15.75ZM13.25 18H10.75C10.3358 18 10 18.3358 10 18.75C10 19.1642 10.3358 19.5 10.75 19.5H13.25C13.6642 19.5 14 19.1642 14 18.75C14 18.3358 13.6642 18 13.25 18Z
+