updated binaries.

gree · Mar 11, 2023 · 8c97267 · 8c97267
1 parent 7022ed4
commit 8c97267
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 4 deletions.
diff --git a/dist/package-nofragment/Assets/Plugins/Android/WebViewPlugin.aar b/dist/package-nofragment/Assets/Plugins/Android/WebViewPlugin.aar
diff --git a/dist/package-nofragment/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs b/dist/package-nofragment/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs
@@ -75,6 +75,8 @@ public void OnPostGenerateGradleAndroidProject(string basePath) {
                 }
             }
         }
+        changed = (androidManifest.SetApplicationTheme("@style/UnityThemeSelector") || changed);
+        changed = (androidManifest.SetActivityTheme("@style/UnityThemeSelector.Translucent") || changed);
         changed = (androidManifest.SetHardwareAccelerated(true) || changed);
 #if UNITYWEBVIEW_ANDROID_USES_CLEARTEXT_TRAFFIC
         changed = (androidManifest.SetUsesCleartextTraffic(true) || changed);
@@ -294,6 +296,25 @@ internal bool SetUsesCleartextTraffic(bool enabled) {
         return changed;
     }
 
+    internal bool SetApplicationTheme(string theme) {
+        bool changed = false;
+        if (ApplicationElement.GetAttribute("theme", AndroidXmlNamespace) != theme) {
+            ApplicationElement.SetAttribute("theme", AndroidXmlNamespace, theme);
+            changed = true;
+        }
+        return changed;
+    }
+
+    internal bool SetActivityTheme(string theme) {
+        bool changed = false;
+        var activity = GetActivityWithLaunchIntent() as XmlElement;
+        if (activity.GetAttribute("theme", AndroidXmlNamespace) != theme) {
+            activity.SetAttribute("theme", AndroidXmlNamespace, theme);
+            changed = true;
+        }
+        return changed;
+    }
+
     internal bool SetHardwareAccelerated(bool enabled) {
         bool changed = false;
         var activity = GetActivityWithLaunchIntent() as XmlElement;

diff --git a/dist/package-nofragment/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView b/dist/package-nofragment/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView
diff --git a/dist/package-nofragment/Assets/Plugins/iOS/WebView.mm b/dist/package-nofragment/Assets/Plugins/iOS/WebView.mm
@@ -217,7 +217,7 @@ - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)tra
 
     [webView addObserver:self forKeyPath: @"loading" options: NSKeyValueObservingOptionNew context:nil];
 
-    [view addSubview:webView];
+    [view.superview insertSubview:webView atIndex:0];
 
     return self;
 }

diff --git a/dist/package-nofragment/Assets/Plugins/iOS/WebViewWithUIWebView.mm b/dist/package-nofragment/Assets/Plugins/iOS/WebViewWithUIWebView.mm
@@ -277,7 +277,7 @@ - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)tra
 
     [webView addObserver:self forKeyPath: @"loading" options: NSKeyValueObservingOptionNew context:nil];
 
-    [view addSubview:webView];
+    [view.superview insertSubview:webView atIndex:0];
 
     return self;
 }

diff --git a/dist/package/Assets/Plugins/Android/WebViewPlugin.aar b/dist/package/Assets/Plugins/Android/WebViewPlugin.aar
diff --git a/dist/package/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs b/dist/package/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs
@@ -75,6 +75,8 @@ public void OnPostGenerateGradleAndroidProject(string basePath) {
                 }
             }
         }
+        changed = (androidManifest.SetApplicationTheme("@style/UnityThemeSelector") || changed);
+        changed = (androidManifest.SetActivityTheme("@style/UnityThemeSelector.Translucent") || changed);
         changed = (androidManifest.SetHardwareAccelerated(true) || changed);
 #if UNITYWEBVIEW_ANDROID_USES_CLEARTEXT_TRAFFIC
         changed = (androidManifest.SetUsesCleartextTraffic(true) || changed);
@@ -294,6 +296,25 @@ internal bool SetUsesCleartextTraffic(bool enabled) {
         return changed;
     }
 
+    internal bool SetApplicationTheme(string theme) {
+        bool changed = false;
+        if (ApplicationElement.GetAttribute("theme", AndroidXmlNamespace) != theme) {
+            ApplicationElement.SetAttribute("theme", AndroidXmlNamespace, theme);
+            changed = true;
+        }
+        return changed;
+    }
+
+    internal bool SetActivityTheme(string theme) {
+        bool changed = false;
+        var activity = GetActivityWithLaunchIntent() as XmlElement;
+        if (activity.GetAttribute("theme", AndroidXmlNamespace) != theme) {
+            activity.SetAttribute("theme", AndroidXmlNamespace, theme);
+            changed = true;
+        }
+        return changed;
+    }
+
     internal bool SetHardwareAccelerated(bool enabled) {
         bool changed = false;
         var activity = GetActivityWithLaunchIntent() as XmlElement;

diff --git a/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView b/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView
diff --git a/dist/package/Assets/Plugins/iOS/WebView.mm b/dist/package/Assets/Plugins/iOS/WebView.mm
@@ -217,7 +217,7 @@ - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)tra
 
     [webView addObserver:self forKeyPath: @"loading" options: NSKeyValueObservingOptionNew context:nil];
 
-    [view addSubview:webView];
+    [view.superview insertSubview:webView atIndex:0];
 
     return self;
 }

diff --git a/dist/package/Assets/Plugins/iOS/WebViewWithUIWebView.mm b/dist/package/Assets/Plugins/iOS/WebViewWithUIWebView.mm
@@ -277,7 +277,7 @@ - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)tra
 
     [webView addObserver:self forKeyPath: @"loading" options: NSKeyValueObservingOptionNew context:nil];
 
-    [view addSubview:webView];
+    [view.superview insertSubview:webView atIndex:0];
 
     return self;
 }

diff --git a/dist/unity-webview-nofragment.unitypackage b/dist/unity-webview-nofragment.unitypackage
diff --git a/dist/unity-webview-nofragment.zip b/dist/unity-webview-nofragment.zip
diff --git a/dist/unity-webview.unitypackage b/dist/unity-webview.unitypackage
diff --git a/dist/unity-webview.zip b/dist/unity-webview.zip