🎨 Android

Author: AigioL

ref/git submodule update --init --recursive.bat

@@ -0,0 +1 @@
+git submodule update --init --recursive

src/Avalonia.WebView2.Sample.Mobile.Android/MainActivity.cs

@@ -22,14 +22,9 @@ namespace Avalonia.WebView2.Sample;
     ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
 sealed class MainActivity : AvaloniaMainActivity<App>
 {
-    /// <summary>
-    /// 获取状态栏的高度
-    /// </summary>
-    /// <param name="ctx"></param>
-    /// <returns></returns>
-    static int GetStatusBarHeight(Context ctx)
+    static int GetDimensionPixelSizeByAndroidDimen(Context ctx, string identifierName)
     {
-        var resId = ctx.Resources!.GetIdentifier("status_bar_height", "dimen", "android");
+        var resId = ctx.Resources!.GetIdentifier(identifierName, "dimen", "android");
         if (resId > 0)
         {
             var h = ctx.Resources.GetDimensionPixelSize(resId);
@@ -38,6 +33,20 @@ static int GetStatusBarHeight(Context ctx)
         return default;
     }
 
+    /// <summary>
+    /// 获取顶部状态栏的高度
+    /// </summary>
+    /// <param name="ctx"></param>
+    /// <returns></returns>
+    static int GetStatusBarHeight(Context ctx) => GetDimensionPixelSizeByAndroidDimen(ctx, "status_bar_height");
+
+    /// <summary>
+    /// 获取底部导航栏的高度
+    /// </summary>
+    /// <param name="ctx"></param>
+    /// <returns></returns>
+    static int GetNavigationBarHeight(Context ctx) => GetDimensionPixelSizeByAndroidDimen(ctx, "navigation_bar_height");
+
     /// <summary>
     /// 获取 DPI 缩放比例
     /// </summary>
@@ -60,6 +69,23 @@ protected override void OnCreate(Bundle? savedInstanceState)
         MainViewModel.SetStatusBarMargin(top: statusBarHeight, scaling: scaling);
 
         base.OnCreate(savedInstanceState);
+
+        Window!.DecorView.ApplyWindowInsets += OnApplyWindowInsets;
+    }
+
+    WindowInsets OnApplyWindowInsets(View v, WindowInsets insets)
+    {
+        var insetsCompat = WindowInsetsCompat.ToWindowInsetsCompat(insets, v)!; // https://developer.android.google.cn/reference/androidx/core/view/WindowInsetsCompat#toWindowInsetsCompat(android.view.WindowInsets,android.view.View)
+        // https://developer.android.google.cn/reference/androidx/core/view/WindowInsetsCompat#getInsetsIgnoringVisibility(int)
+        // https://developer.android.google.cn/reference/androidx/core/view/WindowInsetsCompat.Type
+        var navigationBars = insetsCompat.GetInsetsIgnoringVisibility(WindowInsetsCompat.Type.NavigationBars())!;
+        var statusBars = insetsCompat.GetInsetsIgnoringVisibility(WindowInsetsCompat.Type.StatusBars())!;
+        global::Android.Util.Log.Warn("WebView2",
+$"""
+NavigationBars: l={navigationBars.Left}, r={navigationBars.Right}, t={navigationBars.Top}, b={navigationBars.Bottom}
+StatusBars: l={statusBars.Left}, r={statusBars.Right}, t={statusBars.Top}, b={statusBars.Bottom}
+""");
+        return insets;
     }
 
     protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)

src/Avalonia.WebView2.Sample.Mobile/Views/MainView.axaml.cs

@@ -17,7 +17,7 @@ public MainView()
         UrlTextBox.KeyDown += UrlTextBox_KeyDown;
 
         WV.StorageService = this;
-        WV.Fill = new SolidColorBrush(Colors.Purple);
+        //WV.Fill = new SolidColorBrush(Colors.Purple);
     }
 
     IEnumerable<KeyValuePair<(StorageItemType type, string key), StorageItemValue>>? IStorageService.GetStorages(string requestUri)

src/Avalonia.WebView2.Sample/WebView2Compat.xaml.cs

@@ -18,7 +18,7 @@ public WebView2Compat()
 #if WINDOWS
         WebView2.IsVisible = false;
         // 设置背景色透明
-        WebView2.Fill = new SolidColorBrush(Colors.Transparent);
+        //WebView2.Fill = new SolidColorBrush(Colors.Transparent);
         if (!IsSupported)
         {
             TextBlock.Text = "Couldn't find a compatible Webview2 Runtime installation to host WebViews.";

src/Avalonia.WebView2/Controls/WebView2.Properties/DefaultBackgroundColor.cs

@@ -43,12 +43,12 @@ public Color DefaultBackgroundColor
             SetDefaultBackgroundColor(this, value);
 #endif
 
-            var avaColor =
-    global::Avalonia.Media.Color.FromArgb(value.A, value.R, value.G, value.B);
-            if ((object?)this is Shape shape)
-            {
-                shape.Fill = new ImmutableSolidColorBrush(avaColor);
-            }
+            //        var avaColor =
+            //global::Avalonia.Media.Color.FromArgb(value.A, value.R, value.G, value.B);
+            //        if ((object?)this is Shape shape)
+            //        {
+            //            shape.Fill = new ImmutableSolidColorBrush(avaColor);
+            //        }
         }
     }
 

src/Avalonia.WebView2/Controls/WebView2.SizeChanged.cs

@@ -1,3 +1,6 @@
+#if !DISABLE_WEBVIEW2_CORE && (WINDOWS || NETFRAMEWORK)
+// 仅 Windows Edge WebView2 处理 OnSizeChanged 事件
+
 #if !DISABLE_WEBVIEW2_CORE && (WINDOWS || NETFRAMEWORK)
 using Avalonia.Controls.Platforms.Windows.Interop;
 #endif
@@ -213,4 +216,5 @@ protected virtual void OnWindowPositionChanged(Rectangle rectangle)
         nwv?.Frame = new CGRect(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height);
 #endif
     }
-}
+}
+#endif

src/Avalonia.WebView2/Controls/WebView2.VisualTree.cs

@@ -74,7 +74,7 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             viewHandler = CreateViewHandler(this);
             var view = viewHandler.CreatePlatformView();
-            SetValue(this);
+            SetInitValue(view);
             Child = viewHandler;
         }
 #elif IOS || MACCATALYST || (MACOS && !USE_DEPRECATED_WEBVIEW)

src/Avalonia.WebView2/Controls/WebView2.cs

@@ -132,7 +132,7 @@ protected virtual void SetValue(IWebView2 webView)
 
 }
 
-partial class WebView2 : global::Avalonia.Controls.Shapes.Rectangle
+partial class WebView2 : global::Avalonia.Controls.Control
 {
     // 使用矩形控件作为占位符，监听布局矩阵坐标传递值给本机控件
     // 处理显示隐藏属性

src/Avalonia.WebView2/Platforms/Droid/Controls/WebView2.cs

@@ -156,7 +156,21 @@ public AWebView? AWebView
         }
     }
 
+    protected virtual void SetInitValue(AWebView webView)
+    {
+        var visibility = IsVisible ? ViewStates.Visible : ViewStates.Gone;
+        if (webView.Visibility != visibility)
+        {
+            webView.Visibility = visibility;
+        }
 
+        if (_source != null)
+        {
+            webView.SetSource(_source);
+        }
+
+        // TODO: other properties
+    }
 
     /// <summary>
     /// 指示应用是否打算使用明文网络流量，如明文 HTTP

src/Avalonia.WebView2/Platforms/EdgeWebView2/Controls/WebView2.CoreWebView2.EventHandlers.cs

@@ -169,7 +169,7 @@ void CoreWebView2_NewWindowRequested(object? sender, CoreWebView2NewWindowReques
                     {
                         Source = new Uri(args.Uri, UriKind.Absolute),
                         //EnabledDevTools = coreWebView2.Settings.AreDevToolsEnabled,
-                        Fill = Fill,
+                        //Fill = Fill,
                         //UserDataFolder = coreWebView2.Environment.UserDataFolder,
                     },
                 };