diff --git a/dist/package/Assets/Plugins/Android.meta b/dist/package/Assets/Plugins/Android.meta index 36dcc334..3f991607 100644 --- a/dist/package/Assets/Plugins/Android.meta +++ b/dist/package/Assets/Plugins/Android.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c646b4767919243ec8180684697ef5c6 +guid: 65fd0c4198c37413684c8f098736ccc7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/dist/package/Assets/Plugins/Android/WebViewPlugin.jar b/dist/package/Assets/Plugins/Android/WebViewPlugin.jar index 286cbe7a..ce3b3be3 100644 Binary files a/dist/package/Assets/Plugins/Android/WebViewPlugin.jar and b/dist/package/Assets/Plugins/Android/WebViewPlugin.jar differ diff --git a/dist/package/Assets/Plugins/Android/WebViewPlugin.jar.meta b/dist/package/Assets/Plugins/Android/WebViewPlugin.jar.meta index 7649eaca..a56daa7f 100644 --- a/dist/package/Assets/Plugins/Android/WebViewPlugin.jar.meta +++ b/dist/package/Assets/Plugins/Android/WebViewPlugin.jar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 34a289d6e8fd2498ba57566bd28de431 +guid: de99372f4661642ecaf96cd90ec4b500 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/dist/package/Assets/Plugins/Editor.meta b/dist/package/Assets/Plugins/Editor.meta index f1a6896e..fe25ca95 100644 --- a/dist/package/Assets/Plugins/Editor.meta +++ b/dist/package/Assets/Plugins/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9b4a1fb0e548346e78c4ef018d99cb99 +guid: db985e4be2a094bf5898a845ee66e396 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/dist/package/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs b/dist/package/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs index eb16c7dc..cf11a840 100644 --- a/dist/package/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs +++ b/dist/package/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs @@ -23,6 +23,8 @@ public class UnityWebViewPostprocessBuild public void OnPostGenerateGradleAndroidProject(string basePath) { var changed = false; var androidManifest = new AndroidManifest(GetManifestPath(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); @@ -166,6 +168,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/Editor/UnityWebViewPostprocessBuild.cs.meta b/dist/package/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs.meta index 0bfdfdde..bb181d6a 100644 --- a/dist/package/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs.meta +++ b/dist/package/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f628cc70adbbb4e92ba187e2056a5345 +guid: 2abe64a998b3a4bb2a8dce09c028e586 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/dist/package/Assets/Plugins/WebView.bundle/Contents.meta b/dist/package/Assets/Plugins/WebView.bundle/Contents.meta index 57b0c7c5..cbee9f80 100644 --- a/dist/package/Assets/Plugins/WebView.bundle/Contents.meta +++ b/dist/package/Assets/Plugins/WebView.bundle/Contents.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 92cd3cc54bc0e471fb541dec2e8921b3 +guid: f5be682b5c7654a5b945fc36a7a7d853 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/dist/package/Assets/Plugins/WebView.bundle/Contents/Info.plist.meta b/dist/package/Assets/Plugins/WebView.bundle/Contents/Info.plist.meta index 4edae72c..d15a46a1 100644 --- a/dist/package/Assets/Plugins/WebView.bundle/Contents/Info.plist.meta +++ b/dist/package/Assets/Plugins/WebView.bundle/Contents/Info.plist.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d5de8c2dada4e44539ee9c563da6a329 +guid: 484209ba423aa4d4290454fcebcbdd57 DefaultImporter: externalObjects: {} userData: diff --git a/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS.meta b/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS.meta index ece384ad..9a6526cd 100644 --- a/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS.meta +++ b/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8eec1f792ea704bbab3f794cbd0da800 +guid: 07560adab9d6c497a88510ef9187492b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView b/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView index 163b69ac..bee2416b 100755 Binary files a/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView and b/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView differ diff --git a/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView.meta b/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView.meta index ca9ae110..df6114f1 100644 --- a/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView.meta +++ b/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3b4ccd455a51f4f68adcd092fc65ce58 +guid: 9b28b0d54a49845468ba582cabc6c132 DefaultImporter: externalObjects: {} userData: diff --git a/dist/package/Assets/Plugins/WebView.bundle/Contents/Resources.meta b/dist/package/Assets/Plugins/WebView.bundle/Contents/Resources.meta index 7b23a345..0909c79a 100644 --- a/dist/package/Assets/Plugins/WebView.bundle/Contents/Resources.meta +++ b/dist/package/Assets/Plugins/WebView.bundle/Contents/Resources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 63e999cfa579b4cbcbd0068bed79d0ff +guid: f0383464b846b4444863095b34db80c4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/dist/package/Assets/Plugins/WebView.bundle/Contents/Resources/InfoPlist.strings.meta b/dist/package/Assets/Plugins/WebView.bundle/Contents/Resources/InfoPlist.strings.meta index a86da8e4..250546bc 100644 --- a/dist/package/Assets/Plugins/WebView.bundle/Contents/Resources/InfoPlist.strings.meta +++ b/dist/package/Assets/Plugins/WebView.bundle/Contents/Resources/InfoPlist.strings.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 388fbaa501d8e4c5890ba9453a00edae +guid: 8838ec0c87e0e496dae1187a3ccb10a6 DefaultImporter: externalObjects: {} userData: diff --git a/dist/package/Assets/Plugins/WebView.bundle/Contents/_CodeSignature.meta b/dist/package/Assets/Plugins/WebView.bundle/Contents/_CodeSignature.meta index bfc91b06..304c44b9 100644 --- a/dist/package/Assets/Plugins/WebView.bundle/Contents/_CodeSignature.meta +++ b/dist/package/Assets/Plugins/WebView.bundle/Contents/_CodeSignature.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8a230f4e0d71747458ed4ea86b216d18 +guid: 0fefe3607d7714aa9866736e5f96bcee folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/dist/package/Assets/Plugins/WebView.bundle/Contents/_CodeSignature/CodeResources.meta b/dist/package/Assets/Plugins/WebView.bundle/Contents/_CodeSignature/CodeResources.meta index 1cc804db..99067127 100644 --- a/dist/package/Assets/Plugins/WebView.bundle/Contents/_CodeSignature/CodeResources.meta +++ b/dist/package/Assets/Plugins/WebView.bundle/Contents/_CodeSignature/CodeResources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a7a54f626f1634ef1a415d25b7c8667c +guid: 2aa43da13d8c84c028f8d085cfdfa817 DefaultImporter: externalObjects: {} userData: diff --git a/dist/package/Assets/Plugins/WebViewObject.cs.meta b/dist/package/Assets/Plugins/WebViewObject.cs.meta index 6dead330..26281a4d 100644 --- a/dist/package/Assets/Plugins/WebViewObject.cs.meta +++ b/dist/package/Assets/Plugins/WebViewObject.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 01c71e8709c974c25ae629fee5e26c33 +guid: 81261608168004da8a6925395534b48b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/dist/package/Assets/Plugins/iOS.meta b/dist/package/Assets/Plugins/iOS.meta index 95d91a2e..e4416bf1 100644 --- a/dist/package/Assets/Plugins/iOS.meta +++ b/dist/package/Assets/Plugins/iOS.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0c06711de45b1422a9cc479ed83832b7 +guid: 64067a6a2484d4bcf9d19253f81b0149 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/dist/package/Assets/Plugins/iOS/WebView.mm b/dist/package/Assets/Plugins/iOS/WebView.mm index e01751dc..f147b7ad 100644 --- a/dist/package/Assets/Plugins/iOS/WebView.mm +++ b/dist/package/Assets/Plugins/iOS/WebView.mm @@ -160,7 +160,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/WebView.mm.meta b/dist/package/Assets/Plugins/iOS/WebView.mm.meta index b1729188..b5b7430e 100644 --- a/dist/package/Assets/Plugins/iOS/WebView.mm.meta +++ b/dist/package/Assets/Plugins/iOS/WebView.mm.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 79790c08f727740ad8f107b60157668c +guid: 87195762082ae47dca2d2f5cc08b1a07 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/dist/package/Assets/Plugins/iOS/WebViewWithUIWebView.mm b/dist/package/Assets/Plugins/iOS/WebViewWithUIWebView.mm index de44fa16..6556d624 100644 --- a/dist/package/Assets/Plugins/iOS/WebViewWithUIWebView.mm +++ b/dist/package/Assets/Plugins/iOS/WebViewWithUIWebView.mm @@ -207,7 +207,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.meta b/dist/package/Assets/Plugins/iOS/WebViewWithUIWebView.mm.meta index f281d9d9..53d08762 100644 --- a/dist/package/Assets/Plugins/iOS/WebViewWithUIWebView.mm.meta +++ b/dist/package/Assets/Plugins/iOS/WebViewWithUIWebView.mm.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 78ff4741d079d485bac1bfc65794cc04 +guid: 4bc993956d6fd4e6b83f57a9d41624c8 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/dist/package/Assets/Plugins/unity-webview-webgl-plugin.jslib.meta b/dist/package/Assets/Plugins/unity-webview-webgl-plugin.jslib.meta index f5f1bc2c..57769719 100644 --- a/dist/package/Assets/Plugins/unity-webview-webgl-plugin.jslib.meta +++ b/dist/package/Assets/Plugins/unity-webview-webgl-plugin.jslib.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aff96cf29f24e40f88d1c90be440f883 +guid: 197976cc3178847009f077f8d8ba3a15 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/dist/package/Assets/WebGLTemplates/unity-webview.meta b/dist/package/Assets/WebGLTemplates/unity-webview.meta index a9c34fb9..8f51569c 100644 --- a/dist/package/Assets/WebGLTemplates/unity-webview.meta +++ b/dist/package/Assets/WebGLTemplates/unity-webview.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 41913ecc19a1b4a2bbe18c19e2a5b47d +guid: 93318d2f6520440c2822bea20611e778 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/dist/package/Assets/WebGLTemplates/unity-webview/index.html.meta b/dist/package/Assets/WebGLTemplates/unity-webview/index.html.meta index 1715e83b..4fb69599 100644 --- a/dist/package/Assets/WebGLTemplates/unity-webview/index.html.meta +++ b/dist/package/Assets/WebGLTemplates/unity-webview/index.html.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8b91dae64ee7043ab976bdc6b0a2afeb +guid: 7f57424fe3d64473ab6dab1e9ff50e98 DefaultImporter: externalObjects: {} userData: diff --git a/dist/package/Assets/WebGLTemplates/unity-webview/unity-webview.js.meta b/dist/package/Assets/WebGLTemplates/unity-webview/unity-webview.js.meta index 34d86764..554e97fe 100644 --- a/dist/package/Assets/WebGLTemplates/unity-webview/unity-webview.js.meta +++ b/dist/package/Assets/WebGLTemplates/unity-webview/unity-webview.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7ee0a2024e7af43cc91c28bd2c162508 +guid: 168f9b70536fe4a88828dcfbfed3a688 DefaultImporter: externalObjects: {} userData: diff --git a/dist/package/Assets/WebPlayerTemplates/unity-webview.meta b/dist/package/Assets/WebPlayerTemplates/unity-webview.meta index ffb6605a..94d93512 100644 --- a/dist/package/Assets/WebPlayerTemplates/unity-webview.meta +++ b/dist/package/Assets/WebPlayerTemplates/unity-webview.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5a36b4f574f4145c5bba1c03772fcbcd +guid: 6b4369bbb3c284909a0e3459252174cd folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/dist/package/Assets/WebPlayerTemplates/unity-webview/index.html.meta b/dist/package/Assets/WebPlayerTemplates/unity-webview/index.html.meta index ae54a6ab..649e1af8 100644 --- a/dist/package/Assets/WebPlayerTemplates/unity-webview/index.html.meta +++ b/dist/package/Assets/WebPlayerTemplates/unity-webview/index.html.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b5e6983b379804204ad2a7ef2cc1cdc7 +guid: 4cfc475b8cd494bc99b8e4537b1dfa87 DefaultImporter: externalObjects: {} userData: diff --git a/dist/package/Assets/WebPlayerTemplates/unity-webview/thumbnail.png.meta b/dist/package/Assets/WebPlayerTemplates/unity-webview/thumbnail.png.meta index 6267cd55..fb3a62ed 100644 --- a/dist/package/Assets/WebPlayerTemplates/unity-webview/thumbnail.png.meta +++ b/dist/package/Assets/WebPlayerTemplates/unity-webview/thumbnail.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6eaa323c4707043869925a1eda0e6ce7 +guid: 15d4051a0aa9449689c6a48d7db5581f DefaultImporter: externalObjects: {} userData: diff --git a/dist/package/Assets/WebPlayerTemplates/unity-webview/unity-webview.js.meta b/dist/package/Assets/WebPlayerTemplates/unity-webview/unity-webview.js.meta index 62a99f23..2f3ac578 100644 --- a/dist/package/Assets/WebPlayerTemplates/unity-webview/unity-webview.js.meta +++ b/dist/package/Assets/WebPlayerTemplates/unity-webview/unity-webview.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 81cd8028e449c4a00a2fb7eca0b11715 +guid: 4b6dcadcc82f546b0b12ce0985a61682 DefaultImporter: externalObjects: {} userData: diff --git a/dist/unity-webview-nofragment.unitypackage b/dist/unity-webview-nofragment.unitypackage index 74763c25..0ec82c81 100644 Binary files a/dist/unity-webview-nofragment.unitypackage and b/dist/unity-webview-nofragment.unitypackage differ diff --git a/dist/unity-webview-nofragment.zip b/dist/unity-webview-nofragment.zip index f62a3f1f..9140bb20 100644 Binary files a/dist/unity-webview-nofragment.zip and b/dist/unity-webview-nofragment.zip differ diff --git a/dist/unity-webview.unitypackage b/dist/unity-webview.unitypackage index 1b0b86dd..3d6812c4 100644 Binary files a/dist/unity-webview.unitypackage and b/dist/unity-webview.unitypackage differ diff --git a/dist/unity-webview.zip b/dist/unity-webview.zip index 96c10047..2354a648 100644 Binary files a/dist/unity-webview.zip and b/dist/unity-webview.zip differ