Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Appl 8194 renaming main activity #9

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public static void OnPostprocessBuild(BuildTarget buildTarget, string path) {
changed = (androidManifest.AddMicrophone() || changed);
#endif
#if UNITY_5_6_0 || UNITY_5_6_1
changed = (androidManifest.SetActivityName("net.gree.unitywebview.CUnityPlayerActivity") || changed);
changed = (androidManifest.SetActivityName("com.slatescience.matific.CUnityPlayerActivity") || changed);
#endif
if (changed) {
androidManifest.Save();
Expand Down
4 changes: 2 additions & 2 deletions dist/package-nofragment/Assets/Plugins/WebViewObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ private static extern void _CWebViewPlugin_Reload(
public static bool IsWebViewAvailable()
{
#if !UNITY_EDITOR && UNITY_ANDROID
return (new AndroidJavaObject("net.gree.unitywebview.CWebViewPlugin")).CallStatic<bool>("IsWebViewAvailable");
return (new AndroidJavaObject("com.slatescience.matific.CWebViewPlugin")).CallStatic<bool>("IsWebViewAvailable");
#else
return true;
#endif
Expand Down Expand Up @@ -499,7 +499,7 @@ public void Init(
#elif UNITY_IPHONE
webView = _CWebViewPlugin_Init(name, transparent, zoom, ua, enableWKWebView, wkContentMode, wkAllowsLinkPreview, wkAllowsBackForwardNavigationGestures, radius);
#elif UNITY_ANDROID
webView = new AndroidJavaObject("net.gree.unitywebview.CWebViewPlugin");
webView = new AndroidJavaObject("com.slatescience.matific.CWebViewPlugin");
webView.Call("Init", name, transparent, zoom, androidForceDarkMode, ua, radius);

using(AndroidJavaClass UnityClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer"))
Expand Down
Binary file modified dist/package/Assets/Plugins/Android/WebViewPlugin.aar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public static void OnPostprocessBuild(BuildTarget buildTarget, string path) {
changed = (androidManifest.AddMicrophone() || changed);
#endif
#if UNITY_5_6_0 || UNITY_5_6_1
changed = (androidManifest.SetActivityName("net.gree.unitywebview.CUnityPlayerActivity") || changed);
changed = (androidManifest.SetActivityName("com.slatescience.matific.CUnityPlayerActivity") || changed);
#endif
if (changed) {
androidManifest.Save();
Expand Down
4 changes: 2 additions & 2 deletions dist/package/Assets/Plugins/WebViewObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ private static extern void _CWebViewPlugin_Reload(
public static bool IsWebViewAvailable()
{
#if !UNITY_EDITOR && UNITY_ANDROID
return (new AndroidJavaObject("net.gree.unitywebview.CWebViewPlugin")).CallStatic<bool>("IsWebViewAvailable");
return (new AndroidJavaObject("com.slatescience.matific.CWebViewPlugin")).CallStatic<bool>("IsWebViewAvailable");
#else
return true;
#endif
Expand Down Expand Up @@ -498,7 +498,7 @@ public void Init(
#elif UNITY_IPHONE
webView = _CWebViewPlugin_Init(name, transparent, zoom, ua, enableWKWebView, wkContentMode, wkAllowsLinkPreview, wkAllowsBackForwardNavigationGestures, radius);
#elif UNITY_ANDROID
webView = new AndroidJavaObject("net.gree.unitywebview.CWebViewPlugin");
webView = new AndroidJavaObject("com.slatescience.matific.CWebViewPlugin");
webView.Call("Init", name, transparent, zoom, androidForceDarkMode, ua, radius);

using(AndroidJavaClass UnityClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer"))
Expand Down
2 changes: 1 addition & 1 deletion plugins/Android/webview-nofragment/consumer-rules.pro
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-keep class net.gree.unitywebview.** {
-keep class com.slatescience.matific.** {
*;
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.gree.unitywebview"
package="com.slatescience.matific"
android:versionCode="1"
android:versionName="1.0">
</manifest>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.gree.unitywebview;
package com.slatescience.matific;

import com.unity3d.player.*;
import android.content.ContextWrapper;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.gree.unitywebview;
package com.slatescience.matific;

import com.unity3d.player.*;
import android.os.Bundle;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* 3. This notice may not be removed or altered from any source distribution.
*/

package net.gree.unitywebview;
package com.slatescience.matific;

import android.app.Activity;
import android.content.ActivityNotFoundException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.gree.unitywebview;
package com.slatescience.matific;

import android.content.Context;
import android.graphics.Canvas;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package net.gree.unitywebview;
package com.slatescience.matific;

public final class BuildConfig {
public static final boolean DEBUG = false;
public static final String LIBRARY_PACKAGE_NAME = "net.gree.unitywebview";
public static final String LIBRARY_PACKAGE_NAME = "com.slatescience.matific";
public static final String BUILD_TYPE = "release";
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified plugins/Android/webview/build/outputs/aar/webview-release.aar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
-- Merging decision tree log ---
manifest
ADDED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
ADDED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml:2:1-6:12
package
ADDED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml:3:7-38
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
ADDED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml:3:7-41
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
android:versionName
ADDED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml:5:7-32
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
ADDED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml:5:7-32
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
xmlns:android
ADDED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml:2:11-69
ADDED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml:2:11-69
android:versionCode
ADDED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml:4:7-30
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
ADDED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml:4:7-30
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
uses-sdk
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
android:targetSdkVersion
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
ADDED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
ADDED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
android:minSdkVersion
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
ADDED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/nir/unity-webview-GREE/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
ADDED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
INJECTED from /Users/lavikabel/Dev/Slateunity-webview/plugins/Android/webview/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,41 +1,46 @@
net/gree/unitywebview/CWebViewPlugin.java
net.gree.unitywebview.CWebViewPlugin
net.gree.unitywebview.CWebViewPlugin$1
net.gree.unitywebview.CWebViewPlugin$10
net.gree.unitywebview.CWebViewPlugin$11
net.gree.unitywebview.CWebViewPlugin$12
net.gree.unitywebview.CWebViewPlugin$13
net.gree.unitywebview.CWebViewPlugin$14
net.gree.unitywebview.CWebViewPlugin$15
net.gree.unitywebview.CWebViewPlugin$16
net.gree.unitywebview.CWebViewPlugin$17
net.gree.unitywebview.CWebViewPlugin$18
net.gree.unitywebview.CWebViewPlugin$19
net.gree.unitywebview.CWebViewPlugin$2
net.gree.unitywebview.CWebViewPlugin$20
net.gree.unitywebview.CWebViewPlugin$21
net.gree.unitywebview.CWebViewPlugin$22
net.gree.unitywebview.CWebViewPlugin$23
net.gree.unitywebview.CWebViewPlugin$24
net.gree.unitywebview.CWebViewPlugin$25
net.gree.unitywebview.CWebViewPlugin$3
net.gree.unitywebview.CWebViewPlugin$3$1
net.gree.unitywebview.CWebViewPlugin$4
net.gree.unitywebview.CWebViewPlugin$4$1
net.gree.unitywebview.CWebViewPlugin$4$2
net.gree.unitywebview.CWebViewPlugin$4$2$1
net.gree.unitywebview.CWebViewPlugin$4$3
net.gree.unitywebview.CWebViewPlugin$5
net.gree.unitywebview.CWebViewPlugin$6
net.gree.unitywebview.CWebViewPlugin$7
net.gree.unitywebview.CWebViewPlugin$8
net.gree.unitywebview.CWebViewPlugin$9
net.gree.unitywebview.CWebViewPluginInterface
net.gree.unitywebview.CWebViewPluginInterface$1
net.gree.unitywebview.CWebViewPluginInterface$2
net/gree/unitywebview/BuildConfig.java
net.gree.unitywebview.BuildConfig
net/gree/unitywebview/CUnityPlayerActivity.java
net.gree.unitywebview.CUnityPlayerActivity
net/gree/unitywebview/CUnityPlayer.java
net.gree.unitywebview.CUnityPlayer
com/slatescience/matific/RoundedWebView.java
com.slatescience.matific.RoundedWebView
com/slatescience/matific/BuildConfig.java
com.slatescience.matific.BuildConfig
com/slatescience/matific/CUnityPlayerActivity.java
com.slatescience.matific.CUnityPlayerActivity
com/slatescience/matific/CUnityPlayer.java
com.slatescience.matific.CUnityPlayer
com/slatescience/matific/CWebViewPlugin.java
com.slatescience.matific.CWebViewPlugin
com.slatescience.matific.CWebViewPlugin$1
com.slatescience.matific.CWebViewPlugin$10
com.slatescience.matific.CWebViewPlugin$11
com.slatescience.matific.CWebViewPlugin$12
com.slatescience.matific.CWebViewPlugin$13
com.slatescience.matific.CWebViewPlugin$14
com.slatescience.matific.CWebViewPlugin$15
com.slatescience.matific.CWebViewPlugin$16
com.slatescience.matific.CWebViewPlugin$17
com.slatescience.matific.CWebViewPlugin$18
com.slatescience.matific.CWebViewPlugin$19
com.slatescience.matific.CWebViewPlugin$2
com.slatescience.matific.CWebViewPlugin$20
com.slatescience.matific.CWebViewPlugin$21
com.slatescience.matific.CWebViewPlugin$22
com.slatescience.matific.CWebViewPlugin$23
com.slatescience.matific.CWebViewPlugin$24
com.slatescience.matific.CWebViewPlugin$25
com.slatescience.matific.CWebViewPlugin$26
com.slatescience.matific.CWebViewPlugin$27
com.slatescience.matific.CWebViewPlugin$3
com.slatescience.matific.CWebViewPlugin$4
com.slatescience.matific.CWebViewPlugin$4$1
com.slatescience.matific.CWebViewPlugin$5
com.slatescience.matific.CWebViewPlugin$5$1
com.slatescience.matific.CWebViewPlugin$5$2
com.slatescience.matific.CWebViewPlugin$5$2$1
com.slatescience.matific.CWebViewPlugin$5$3
com.slatescience.matific.CWebViewPlugin$6
com.slatescience.matific.CWebViewPlugin$7
com.slatescience.matific.CWebViewPlugin$8
com.slatescience.matific.CWebViewPlugin$9
com.slatescience.matific.CWebViewPluginInterface
com.slatescience.matific.CWebViewPluginInterface$1
com.slatescience.matific.CWebViewPluginInterface$2
com.slatescience.matific.CWebViewPluginInterface$3
2 changes: 1 addition & 1 deletion plugins/Android/webview/consumer-rules.pro
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-keep class net.gree.unitywebview.** {
-keep class com.slatescience.matific.** {
*;
}
Binary file modified plugins/Android/webview/libs/classes.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion plugins/Android/webview/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.gree.unitywebview"
package="com.slatescience.matific"
android:versionCode="1"
android:versionName="1.0">
</manifest>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.gree.unitywebview;
package com.slatescience.matific;

import com.unity3d.player.*;
import android.content.ContextWrapper;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.gree.unitywebview;
package com.slatescience.matific;

import android.app.Activity;
import android.content.Intent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* 3. This notice may not be removed or altered from any source distribution.
*/

package net.gree.unitywebview;
package com.slatescience.matific;

import android.Manifest;
import android.app.Activity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.gree.unitywebview;
package com.slatescience.matific;

import android.content.Context;
import android.graphics.Canvas;
Expand Down
2 changes: 1 addition & 1 deletion plugins/Editor/UnityWebViewPostprocessBuild.cs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public static void OnPostprocessBuild(BuildTarget buildTarget, string path) {
changed = (androidManifest.AddMicrophone() || changed);
#endif
#if UNITY_5_6_0 || UNITY_5_6_1
changed = (androidManifest.SetActivityName("net.gree.unitywebview.CUnityPlayerActivity") || changed);
changed = (androidManifest.SetActivityName("com.slatescience.matific.CUnityPlayerActivity") || changed);
#endif
if (changed) {
androidManifest.Save();
Expand Down
2 changes: 1 addition & 1 deletion plugins/WebViewObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ public void Init(
#elif UNITY_IPHONE
webView = _CWebViewPlugin_Init(name, transparent, zoom, ua, enableWKWebView, wkContentMode, wkAllowsLinkPreview, wkAllowsBackForwardNavigationGestures, radius);
#elif UNITY_ANDROID
webView = new AndroidJavaObject("net.gree.unitywebview.CWebViewPlugin");
webView = new AndroidJavaObject("com.slatescience.matific.CWebViewPlugin");
webView.Call("Init", name, transparent, zoom, androidForceDarkMode, ua, radius);

using(AndroidJavaClass UnityClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer"))
Expand Down