From 81dca34889f05ea1703fb1daa6b58f38a25c8ab0 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 19 Oct 2022 16:31:58 +0100 Subject: [PATCH] tmp --- .../Properties/launchSettings.json | 8 --- .../ControlCatalog.NetCore.csproj | 2 +- .../Pages/PlatformInfoPage.xaml | 1 + .../MarkupExtensions/OnPlatformExtension.cs | 56 +++++++++++++++---- .../Avalonia.Web/BrowserRuntimePlatform.cs | 4 +- 5 files changed, 48 insertions(+), 23 deletions(-) diff --git a/samples/ControlCatalog.Blazor.Web/Properties/launchSettings.json b/samples/ControlCatalog.Blazor.Web/Properties/launchSettings.json index e4da60f7ca..ad2b1e30f6 100644 --- a/samples/ControlCatalog.Blazor.Web/Properties/launchSettings.json +++ b/samples/ControlCatalog.Blazor.Web/Properties/launchSettings.json @@ -8,14 +8,6 @@ } }, "profiles": { - "ControlCatalog.Web - IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, "ControlCatalog.Web": { "commandName": "Project", "dotnetRunMessages": "true", diff --git a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj index 6c17e9ac43..e4c83dca49 100644 --- a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj +++ b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj @@ -5,7 +5,7 @@ net6.0 true true - 6.0.9 + 6.0.8 diff --git a/samples/ControlCatalog/Pages/PlatformInfoPage.xaml b/samples/ControlCatalog/Pages/PlatformInfoPage.xaml index a8dd24971d..7a7eec3078 100644 --- a/samples/ControlCatalog/Pages/PlatformInfoPage.xaml +++ b/samples/ControlCatalog/Pages/PlatformInfoPage.xaml @@ -7,6 +7,7 @@ d:DesignWidth="400" mc:Ignorable="d"> + diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/OnPlatformExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/OnPlatformExtension.cs index 0dc418a47a..1c984f93e0 100644 --- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/OnPlatformExtension.cs +++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/OnPlatformExtension.cs @@ -19,11 +19,6 @@ public class OnPlatformExtension : IAddChild { private readonly Dictionary _values = new(); - public OnPlatformExtension() - { - - } - public OnPlatformExtension(TReturn defaultValue) { Default = defaultValue; @@ -36,6 +31,10 @@ public class OnPlatformExtension : IAddChild public TReturn? Android { get => _values.TryGetValue(nameof(Android), out var value) ? value : default; set { _values[nameof(Android)] = value; } } public TReturn? iOS { get => _values.TryGetValue(nameof(iOS), out var value) ? value : default; set { _values[nameof(iOS)] = value; } } public TReturn? Browser { get => _values.TryGetValue(nameof(Browser), out var value) ? value : default; set { _values[nameof(Browser)] = value; } } + + public TReturn? Desktop { get => _values.TryGetValue(nameof(Desktop), out var value) ? value : default; set { _values[nameof(Desktop)] = value; } } + public TReturn? Mobile { get => _values.TryGetValue(nameof(Mobile), out var value) ? value : default; set { _values[nameof(Mobile)] = value; } } + public object? ProvideValue() { @@ -48,19 +47,52 @@ public class OnPlatformExtension : IAddChild return !hasValue ? AvaloniaProperty.UnsetValue : value; } + private (TReturn? value, bool hasValue) TryGetFormFactorValues(RuntimePlatformInfo runtimeInfo) + { + if (runtimeInfo.IsDesktop) + { + if (_values.TryGetValue(nameof(Desktop), out var val1)) + { + return (val1, true); + } + } + + if (runtimeInfo.IsMobile) + { + if (_values.TryGetValue(nameof(Mobile), out var val1)) + { + return (val1, true); + } + } + + return default; + } + private (TReturn? value, bool hasValue) TryGetValueForPlatform() { var runtimeInfo = AvaloniaLocator.Current.GetRequiredService().GetRuntimeInfo(); return runtimeInfo.OperatingSystem switch { - OperatingSystemType.WinNT => _values.TryGetValue(nameof(Windows), out var val) ? (val, true) : default, - OperatingSystemType.OSX => _values.TryGetValue(nameof(macOS), out var val) ? (val, true) : default, - OperatingSystemType.Linux => _values.TryGetValue(nameof(Linux), out var val) ? (val, true) : default, - OperatingSystemType.Android => _values.TryGetValue(nameof(Android), out var val) ? (val, true) : default, - OperatingSystemType.iOS => _values.TryGetValue(nameof(iOS), out var val) ? (val, true) : default, - OperatingSystemType.Browser => _values.TryGetValue(nameof(Browser), out var val) ? (val, true) : default, - _ => _values.TryGetValue(nameof(Default), out var val) ? (val, true) : default + OperatingSystemType.WinNT => _values.TryGetValue(nameof(Windows), out var val) ? + (val, true) : + TryGetFormFactorValues(runtimeInfo), + OperatingSystemType.OSX => _values.TryGetValue(nameof(macOS), out var val) ? + (val, true) : + TryGetFormFactorValues(runtimeInfo), + OperatingSystemType.Linux => _values.TryGetValue(nameof(Linux), out var val) ? + (val, true) : + TryGetFormFactorValues(runtimeInfo), + OperatingSystemType.Android => _values.TryGetValue(nameof(Android), out var val) ? + (val, true) : + TryGetFormFactorValues(runtimeInfo), + OperatingSystemType.iOS => _values.TryGetValue(nameof(iOS), out var val) ? + (val, true) : + TryGetFormFactorValues(runtimeInfo), + OperatingSystemType.Browser => _values.TryGetValue(nameof(Browser), out var val) ? + (val, true) : + TryGetFormFactorValues(runtimeInfo), + _ => _values.TryGetValue(nameof(Default), out var val) ? (val, true) : TryGetFormFactorValues(runtimeInfo) }; } diff --git a/src/Web/Avalonia.Web/BrowserRuntimePlatform.cs b/src/Web/Avalonia.Web/BrowserRuntimePlatform.cs index 2d73a86b00..b04b0142e7 100644 --- a/src/Web/Avalonia.Web/BrowserRuntimePlatform.cs +++ b/src/Web/Avalonia.Web/BrowserRuntimePlatform.cs @@ -33,10 +33,10 @@ internal class BrowserRuntimePlatform : StandardRuntimePlatform if (u != null) { - Regex b = new Regex( + var b = new Regex( @"(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino", RegexOptions.IgnoreCase | RegexOptions.Multiline); - Regex v = new Regex( + var v = new Regex( @"1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-", RegexOptions.IgnoreCase | RegexOptions.Multiline); if ((b.IsMatch(u) || v.IsMatch(u.Substring(0, 4))))