Skip to content

Commit 5391860

Browse files
KojiNakamaruKojiNakamaru
committed
updated binaries.
1 parent 999b753 commit 5391860

File tree

12 files changed

+46
-4
lines changed

12 files changed

+46
-4
lines changed

‎dist/package-nofragment/Assets/Plugins/Android/WebViewPlugin.aar‎

58 Bytes
Binary file not shown.

‎dist/package-nofragment/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ public void OnPostGenerateGradleAndroidProject(string basePath) {
7575
}
7676
}
7777
}
78+
changed = (androidManifest.SetApplicationTheme("@style/UnityThemeSelector") || changed);
79+
changed = (androidManifest.SetActivityTheme("@style/UnityThemeSelector.Translucent") || changed);
7880
changed = (androidManifest.SetHardwareAccelerated(true) || changed);
7981
#if UNITYWEBVIEW_ANDROID_USES_CLEARTEXT_TRAFFIC
8082
changed = (androidManifest.SetUsesCleartextTraffic(true) || changed);
@@ -302,6 +304,25 @@ internal bool SetUsesCleartextTraffic(bool enabled) {
302304
return changed;
303305
}
304306

307+
internal bool SetApplicationTheme(string theme) {
308+
bool changed = false;
309+
if (ApplicationElement.GetAttribute("theme", AndroidXmlNamespace) != theme) {
310+
ApplicationElement.SetAttribute("theme", AndroidXmlNamespace, theme);
311+
changed = true;
312+
}
313+
return changed;
314+
}
315+
316+
internal bool SetActivityTheme(string theme) {
317+
bool changed = false;
318+
var activity = GetActivityWithLaunchIntent() as XmlElement;
319+
if (activity.GetAttribute("theme", AndroidXmlNamespace) != theme) {
320+
activity.SetAttribute("theme", AndroidXmlNamespace, theme);
321+
changed = true;
322+
}
323+
return changed;
324+
}
325+
305326
internal bool SetHardwareAccelerated(bool enabled) {
306327
bool changed = false;
307328
var activity = GetActivityWithLaunchIntent() as XmlElement;

‎dist/package-nofragment/Assets/Plugins/iOS/WebView.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)tra
260260

261261
[webView addObserver:self forKeyPath: @"loading" options: NSKeyValueObservingOptionNew context:nil];
262262

263-
[view addSubview:webView];
263+
[view.superview insertSubview:webView atIndex:0];
264264

265265
return self;
266266
}

‎dist/package-nofragment/Assets/Plugins/iOS/WebViewWithUIWebView.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)tra
320320

321321
[webView addObserver:self forKeyPath: @"loading" options: NSKeyValueObservingOptionNew context:nil];
322322

323-
[view addSubview:webView];
323+
[view.superview insertSubview:webView atIndex:0];
324324

325325
return self;
326326
}

‎dist/package/Assets/Plugins/Android/WebViewPlugin.aar‎

92 Bytes
Binary file not shown.

‎dist/package/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ public void OnPostGenerateGradleAndroidProject(string basePath) {
7575
}
7676
}
7777
}
78+
changed = (androidManifest.SetApplicationTheme("@style/UnityThemeSelector") || changed);
79+
changed = (androidManifest.SetActivityTheme("@style/UnityThemeSelector.Translucent") || changed);
7880
changed = (androidManifest.SetHardwareAccelerated(true) || changed);
7981
#if UNITYWEBVIEW_ANDROID_USES_CLEARTEXT_TRAFFIC
8082
changed = (androidManifest.SetUsesCleartextTraffic(true) || changed);
@@ -302,6 +304,25 @@ internal bool SetUsesCleartextTraffic(bool enabled) {
302304
return changed;
303305
}
304306

307+
internal bool SetApplicationTheme(string theme) {
308+
bool changed = false;
309+
if (ApplicationElement.GetAttribute("theme", AndroidXmlNamespace) != theme) {
310+
ApplicationElement.SetAttribute("theme", AndroidXmlNamespace, theme);
311+
changed = true;
312+
}
313+
return changed;
314+
}
315+
316+
internal bool SetActivityTheme(string theme) {
317+
bool changed = false;
318+
var activity = GetActivityWithLaunchIntent() as XmlElement;
319+
if (activity.GetAttribute("theme", AndroidXmlNamespace) != theme) {
320+
activity.SetAttribute("theme", AndroidXmlNamespace, theme);
321+
changed = true;
322+
}
323+
return changed;
324+
}
325+
305326
internal bool SetHardwareAccelerated(bool enabled) {
306327
bool changed = false;
307328
var activity = GetActivityWithLaunchIntent() as XmlElement;

‎dist/package/Assets/Plugins/iOS/WebView.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)tra
260260

261261
[webView addObserver:self forKeyPath: @"loading" options: NSKeyValueObservingOptionNew context:nil];
262262

263-
[view addSubview:webView];
263+
[view.superview insertSubview:webView atIndex:0];
264264

265265
return self;
266266
}

‎dist/package/Assets/Plugins/iOS/WebViewWithUIWebView.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)tra
320320

321321
[webView addObserver:self forKeyPath: @"loading" options: NSKeyValueObservingOptionNew context:nil];
322322

323-
[view addSubview:webView];
323+
[view.superview insertSubview:webView atIndex:0];
324324

325325
return self;
326326
}

‎dist/unity-webview-nofragment.unitypackage‎

355 Bytes
Binary file not shown.

‎dist/unity-webview-nofragment.zip‎

166 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)