Android class name paths updated to correct values (#2276)

* Class name paths updated * Update paths
axmolengine · Dec 15, 2024 · 5507b5d · 5507b5d
1 parent 42f5d4f
commit 5507b5d
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 13 deletions.
diff --git a/core/platform/android/Application-android.cpp b/core/platform/android/Application-android.cpp
@@ -76,7 +76,7 @@ int Application::run()
 
 void Application::setAnimationInterval(float interval)
 {
-    JniHelper::callStaticVoidMethod("org/axmol/lib/AxmolRenderer", "setAnimationInterval", interval);
+    JniHelper::callStaticVoidMethod("dev/axmol/lib/AxmolRenderer", "setAnimationInterval", interval);
 }
 
 //////////////////////////////////////////////////////////////////////////

diff --git a/core/platform/android/ControllerManualAdapter/lint.xml b/core/platform/android/ControllerManualAdapter/lint.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
     <issue id="NewApi">
-        <ignore path="src/org/axmol/lib/GameControllerHelper.java" />
+        <ignore path="src/dev/axmol/lib/GameControllerHelper.java" />
     </issue>
-</lint>
+</lint>
diff --git a/core/platform/android/GLViewImpl-android.cpp b/core/platform/android/GLViewImpl-android.cpp
@@ -141,17 +141,17 @@ Rect GLViewImpl::getSafeAreaRect() const
     float marginX = DEFAULT_MARGIN_ANDROID / _scaleX;
     float marginY = DEFAULT_MARGIN_ANDROID / _scaleY;
 
-    bool isScreenRound   = JniHelper::callStaticBooleanMethod("org/axmol/lib/AxmolEngine", "isScreenRound");
-    bool hasSoftKeys     = JniHelper::callStaticBooleanMethod("org/axmol/lib/AxmolEngine", "hasSoftKeys");
-    bool isCutoutEnabled = JniHelper::callStaticBooleanMethod("org/axmol/lib/AxmolEngine", "isCutoutEnabled");
+    bool isScreenRound   = JniHelper::callStaticBooleanMethod("dev/axmol/lib/AxmolEngine", "isScreenRound");
+    bool hasSoftKeys     = JniHelper::callStaticBooleanMethod("dev/axmol/lib/AxmolEngine", "hasSoftKeys");
+    bool isCutoutEnabled = JniHelper::callStaticBooleanMethod("dev/axmol/lib/AxmolEngine", "isCutoutEnabled");
 
     float insetTop = 0.0f;
     float insetBottom = 0.0f;
     float insetLeft = 0.0f;
     float insetRight = 0.0f;
 
     static axstd::pod_vector<int32_t> cornerRadii =
-            JniHelper::callStaticIntArrayMethod("org/axmol/lib/AxmolEngine", "getDeviceCornerRadii");
+            JniHelper::callStaticIntArrayMethod("dev/axmol/lib/AxmolEngine", "getDeviceCornerRadii");
 
     if (isScreenRound)
     {
@@ -241,7 +241,7 @@ Rect GLViewImpl::getSafeAreaRect() const
     {
         // screen with enabled cutout area (ex. Google Pixel 3 XL, Huawei P20, Asus ZenFone 5, etc)
         static axstd::pod_vector<int32_t> safeInsets =
-                JniHelper::callStaticIntArrayMethod("org/axmol/lib/AxmolEngine", "getSafeInsets");
+                JniHelper::callStaticIntArrayMethod("dev/axmol/lib/AxmolEngine", "getSafeInsets");
 
         if (safeInsets.size() >= 4)
         {

diff --git a/core/platform/android/java/lint.xml b/core/platform/android/java/lint.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
     <issue id="InlinedApi">
-        <ignore path="src/org/axmol/lib/GameControllerHelper.java" />
+        <ignore path="src/dev/axmol/lib/GameControllerHelper.java" />
     </issue>
     <issue id="NewApi">
-        <ignore path="src/org/axmol/lib/AxmolActivity.java" />
-        <ignore path="src/org/axmol/lib/GameControllerHelper.java" />
+        <ignore path="src/dev/axmol/lib/AxmolActivity.java" />
+        <ignore path="src/dev/axmol/lib/GameControllerHelper.java" />
     </issue>
-</lint>
+</lint>
diff --git a/core/platform/android/javaactivity-android.cpp b/core/platform/android/javaactivity-android.cpp
@@ -120,7 +120,7 @@ JNIEXPORT void JNICALL Java_dev_axmol_lib_AxmolRenderer_nativeOnContextLost(JNIE
     director->replaceScene(rootScene);
     director->purgeCachedData();
 
-    JniHelper::callStaticVoidMethod("org/axmol/lib/AxmolEngine", "restartProcess");
+    JniHelper::callStaticVoidMethod("dev/axmol/lib/AxmolEngine", "restartProcess");
 #endif
 }
 

diff --git a/...id/app/src/org/axmol/app/AppActivity.java → ...id/app/src/dev/axmol/app/AppActivity.java b/...id/app/src/org/axmol/app/AppActivity.java → ...id/app/src/dev/axmol/app/AppActivity.java
diff --git a/.../src/org/axmol/cpp_tests/AppActivity.java → .../src/dev/axmol/cpp_tests/AppActivity.java b/.../src/org/axmol/cpp_tests/AppActivity.java → .../src/dev/axmol/cpp_tests/AppActivity.java
diff --git a/.../app/src/org/axmol/cpp_tests/JNITest.java → .../app/src/dev/axmol/cpp_tests/JNITest.java b/.../app/src/org/axmol/cpp_tests/JNITest.java → .../app/src/dev/axmol/cpp_tests/JNITest.java
diff --git a/...org/axmol/fairygui_tests/AppActivity.java → ...dev/axmol/fairygui_tests/AppActivity.java b/...org/axmol/fairygui_tests/AppActivity.java → ...dev/axmol/fairygui_tests/AppActivity.java
diff --git a/...id/app/src/org/axmol/cpp/AppActivity.java → ...id/app/src/dev/axmol/cpp/AppActivity.java b/...id/app/src/org/axmol/cpp/AppActivity.java → ...id/app/src/dev/axmol/cpp/AppActivity.java
diff --git a/.../src/org/axmol/lua_tests/AppActivity.java → .../src/dev/axmol/lua_tests/AppActivity.java b/.../src/org/axmol/lua_tests/AppActivity.java → .../src/dev/axmol/lua_tests/AppActivity.java
diff --git a/.../LuaJavaBridgeTest/LuaJavaBridgeTest.java → .../LuaJavaBridgeTest/LuaJavaBridgeTest.java b/.../LuaJavaBridgeTest/LuaJavaBridgeTest.java → .../LuaJavaBridgeTest/LuaJavaBridgeTest.java
diff --git a/...src/org/axmol/unit_tests/AppActivity.java → ...src/dev/axmol/unit_tests/AppActivity.java b/...src/org/axmol/unit_tests/AppActivity.java → ...src/dev/axmol/unit_tests/AppActivity.java
diff --git a/...app/src/org/axmol/unit_tests/JNITest.java → ...app/src/dev/axmol/unit_tests/JNITest.java b/...app/src/org/axmol/unit_tests/JNITest.java → ...app/src/dev/axmol/unit_tests/JNITest.java