Skip to content

Commit 5507b5d

Browse files
rh101rh101
authored
Android class name paths updated to correct values (#2276)
* Class name paths updated * Update paths
1 parent 42f5d4f commit 5507b5d

File tree

14 files changed

+13
-13
lines changed

14 files changed

+13
-13
lines changed

‎core/platform/android/Application-android.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ int Application::run()
7676

7777
void Application::setAnimationInterval(float interval)
7878
{
79-
JniHelper::callStaticVoidMethod("org/axmol/lib/AxmolRenderer", "setAnimationInterval", interval);
79+
JniHelper::callStaticVoidMethod("dev/axmol/lib/AxmolRenderer", "setAnimationInterval", interval);
8080
}
8181

8282
//////////////////////////////////////////////////////////////////////////

‎core/platform/android/ControllerManualAdapter/lint.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<lint>
33
<issue id="NewApi">
4-
<ignore path="src/org/axmol/lib/GameControllerHelper.java" />
4+
<ignore path="src/dev/axmol/lib/GameControllerHelper.java" />
55
</issue>
6-
</lint>
6+
</lint>

‎core/platform/android/GLViewImpl-android.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,17 +141,17 @@ Rect GLViewImpl::getSafeAreaRect() const
141141
float marginX = DEFAULT_MARGIN_ANDROID / _scaleX;
142142
float marginY = DEFAULT_MARGIN_ANDROID / _scaleY;
143143

144-
bool isScreenRound = JniHelper::callStaticBooleanMethod("org/axmol/lib/AxmolEngine", "isScreenRound");
145-
bool hasSoftKeys = JniHelper::callStaticBooleanMethod("org/axmol/lib/AxmolEngine", "hasSoftKeys");
146-
bool isCutoutEnabled = JniHelper::callStaticBooleanMethod("org/axmol/lib/AxmolEngine", "isCutoutEnabled");
144+
bool isScreenRound = JniHelper::callStaticBooleanMethod("dev/axmol/lib/AxmolEngine", "isScreenRound");
145+
bool hasSoftKeys = JniHelper::callStaticBooleanMethod("dev/axmol/lib/AxmolEngine", "hasSoftKeys");
146+
bool isCutoutEnabled = JniHelper::callStaticBooleanMethod("dev/axmol/lib/AxmolEngine", "isCutoutEnabled");
147147

148148
float insetTop = 0.0f;
149149
float insetBottom = 0.0f;
150150
float insetLeft = 0.0f;
151151
float insetRight = 0.0f;
152152

153153
static axstd::pod_vector<int32_t> cornerRadii =
154-
JniHelper::callStaticIntArrayMethod("org/axmol/lib/AxmolEngine", "getDeviceCornerRadii");
154+
JniHelper::callStaticIntArrayMethod("dev/axmol/lib/AxmolEngine", "getDeviceCornerRadii");
155155

156156
if (isScreenRound)
157157
{
@@ -241,7 +241,7 @@ Rect GLViewImpl::getSafeAreaRect() const
241241
{
242242
// screen with enabled cutout area (ex. Google Pixel 3 XL, Huawei P20, Asus ZenFone 5, etc)
243243
static axstd::pod_vector<int32_t> safeInsets =
244-
JniHelper::callStaticIntArrayMethod("org/axmol/lib/AxmolEngine", "getSafeInsets");
244+
JniHelper::callStaticIntArrayMethod("dev/axmol/lib/AxmolEngine", "getSafeInsets");
245245

246246
if (safeInsets.size() >= 4)
247247
{

‎core/platform/android/java/lint.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<lint>
33
<issue id="InlinedApi">
4-
<ignore path="src/org/axmol/lib/GameControllerHelper.java" />
4+
<ignore path="src/dev/axmol/lib/GameControllerHelper.java" />
55
</issue>
66
<issue id="NewApi">
7-
<ignore path="src/org/axmol/lib/AxmolActivity.java" />
8-
<ignore path="src/org/axmol/lib/GameControllerHelper.java" />
7+
<ignore path="src/dev/axmol/lib/AxmolActivity.java" />
8+
<ignore path="src/dev/axmol/lib/GameControllerHelper.java" />
99
</issue>
10-
</lint>
10+
</lint>

‎core/platform/android/javaactivity-android.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ JNIEXPORT void JNICALL Java_dev_axmol_lib_AxmolRenderer_nativeOnContextLost(JNIE
120120
director->replaceScene(rootScene);
121121
director->purgeCachedData();
122122

123-
JniHelper::callStaticVoidMethod("org/axmol/lib/AxmolEngine", "restartProcess");
123+
JniHelper::callStaticVoidMethod("dev/axmol/lib/AxmolEngine", "restartProcess");
124124
#endif
125125
}
126126

‎templates/common/proj.android/app/src/org/axmol/app/AppActivity.java renamed to ‎templates/common/proj.android/app/src/dev/axmol/app/AppActivity.java

File renamed without changes.

‎tests/cpp-tests/proj.android/app/src/org/axmol/cpp_tests/AppActivity.java renamed to ‎tests/cpp-tests/proj.android/app/src/dev/axmol/cpp_tests/AppActivity.java

File renamed without changes.

‎tests/cpp-tests/proj.android/app/src/org/axmol/cpp_tests/JNITest.java renamed to ‎tests/cpp-tests/proj.android/app/src/dev/axmol/cpp_tests/JNITest.java

File renamed without changes.

‎tests/fairygui-tests/proj.android/app/src/org/axmol/fairygui_tests/AppActivity.java renamed to ‎tests/fairygui-tests/proj.android/app/src/dev/axmol/fairygui_tests/AppActivity.java

File renamed without changes.

‎tests/live2d-tests/proj.android/app/src/org/axmol/cpp/AppActivity.java renamed to ‎tests/live2d-tests/proj.android/app/src/dev/axmol/cpp/AppActivity.java

File renamed without changes.

0 commit comments

Comments
 (0)