diff --git a/app/build.gradle b/app/build.gradle index 0402dc0..43578c3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,27 +3,21 @@ plugins { } android { - compileSdk 31 - buildToolsVersion "31.0.0" + compileSdk 33 + buildToolsVersion '33.0.0' defaultConfig { applicationId "com.gt.launcher" - minSdk 16 - targetSdk 31 - versionCode 3 - versionName "0.0.3" + minSdk 19 + targetSdk 33 + versionCode 10 + versionName "0.1.0" multiDexEnabled true ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' } - externalNativeBuild { - ndkBuild { - arguments getProcessesCountArg() - } - } - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -64,8 +58,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) - implementation 'androidx.appcompat:appcompat:1.4.0' - // implementation 'com.google.android.material:material:1.4.0' + implementation 'androidx.appcompat:appcompat:1.4.2' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' @@ -80,16 +73,5 @@ dependencies { implementation 'com.google.android.gms:play-services-drive:17.0.0' implementation 'com.google.android.gms:play-services-ads:20.5.0' implementation 'com.google.firebase:firebase-appindexing:20.0.0' -} - -def getProcessesCountArg() { - def procCount = Runtime.runtime.availableProcessors() - - Gradle gradle = getGradle() - def isClean = gradle.getStartParameter().getTaskNames().find { it ==~ /.*clean.*/ } - if (isClean) { - procCount = 1 - } - - return "-j" + procCount + implementation 'com.tapjoy:tapjoy-android-sdk:12.10.0' } diff --git a/app/libs/tapjoyconnectlibrary.jar b/app/libs/tapjoyconnectlibrary.jar deleted file mode 100644 index 27f05b4..0000000 Binary files a/app/libs/tapjoyconnectlibrary.jar and /dev/null differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c2fce9d..05c36b1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" package="com.gt.launcher"> - + diff --git a/app/src/main/java/com/anzu/sdk/AnzuWebView.java b/app/src/main/java/com/anzu/sdk/AnzuWebView.java index 1b01227..77eca49 100644 --- a/app/src/main/java/com/anzu/sdk/AnzuWebView.java +++ b/app/src/main/java/com/anzu/sdk/AnzuWebView.java @@ -29,8 +29,8 @@ private void init() { } getSettings().setJavaScriptEnabled(true); - getSettings().setAppCachePath(context.getCacheDir().getPath()); - getSettings().setAppCacheEnabled(true); +// getSettings().setAppCachePath(context.getCacheDir().getPath()); +// getSettings().setAppCacheEnabled(true); getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); getSettings().setGeolocationEnabled(false); getSettings().setSaveFormData(false); diff --git a/app/src/main/java/com/android/vending/licensing/AESObfuscator.java b/app/src/main/java/com/google/android/vending/licensing/AESObfuscator.java similarity index 96% rename from app/src/main/java/com/android/vending/licensing/AESObfuscator.java rename to app/src/main/java/com/google/android/vending/licensing/AESObfuscator.java index 6e749e2..ee12c68 100644 --- a/app/src/main/java/com/android/vending/licensing/AESObfuscator.java +++ b/app/src/main/java/com/google/android/vending/licensing/AESObfuscator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.vending.licensing; +package com.google.android.vending.licensing; -import com.android.vending.licensing.util.Base64; -import com.android.vending.licensing.util.Base64DecoderException; +import com.google.android.vending.licensing.util.Base64; +import com.google.android.vending.licensing.util.Base64DecoderException; import java.io.UnsupportedEncodingException; import java.security.GeneralSecurityException; diff --git a/app/src/main/java/com/android/vending/licensing/APKExpansionPolicy.java b/app/src/main/java/com/google/android/vending/licensing/APKExpansionPolicy.java similarity index 98% rename from app/src/main/java/com/android/vending/licensing/APKExpansionPolicy.java rename to app/src/main/java/com/google/android/vending/licensing/APKExpansionPolicy.java index 6f9bb41..17cc7a7 100644 --- a/app/src/main/java/com/android/vending/licensing/APKExpansionPolicy.java +++ b/app/src/main/java/com/google/android/vending/licensing/APKExpansionPolicy.java @@ -1,5 +1,5 @@ -package com.android.vending.licensing; +package com.google.android.vending.licensing; /* * Copyright (C) 2012 The Android Open Source Project @@ -126,7 +126,8 @@ public void resetPolicy() { * @param response the result from validating the server response * @param rawData the raw server response data */ - public void processServerResponse(int response, ResponseData rawData) { + public void processServerResponse(int response, + com.google.android.vending.licensing.ResponseData rawData) { // Update retry counter if (response != Policy.RETRY) { diff --git a/app/src/main/java/com/android/vending/licensing/DeviceLimiter.java b/app/src/main/java/com/google/android/vending/licensing/DeviceLimiter.java similarity index 97% rename from app/src/main/java/com/android/vending/licensing/DeviceLimiter.java rename to app/src/main/java/com/google/android/vending/licensing/DeviceLimiter.java index 1ce7cfe..e5c5e2d 100644 --- a/app/src/main/java/com/android/vending/licensing/DeviceLimiter.java +++ b/app/src/main/java/com/google/android/vending/licensing/DeviceLimiter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.vending.licensing; +package com.google.android.vending.licensing; /** * Allows the developer to limit the number of devices using a single license. diff --git a/app/src/main/java/com/android/vending/licensing/ILicenseResultListener.aidl b/app/src/main/java/com/google/android/vending/licensing/ILicenseResultListener.aidl.bak similarity index 100% rename from app/src/main/java/com/android/vending/licensing/ILicenseResultListener.aidl rename to app/src/main/java/com/google/android/vending/licensing/ILicenseResultListener.aidl.bak diff --git a/app/src/main/java/com/google/android/vending/licensing/ILicenseResultListener.java b/app/src/main/java/com/google/android/vending/licensing/ILicenseResultListener.java new file mode 100644 index 0000000..d90d6ea --- /dev/null +++ b/app/src/main/java/com/google/android/vending/licensing/ILicenseResultListener.java @@ -0,0 +1,99 @@ +/* + * This file is auto-generated. DO NOT MODIFY. + * Original file: aidl/ILicenseResultListener.aidl + */ +package com.google.android.vending.licensing; +import java.lang.String; +import android.os.RemoteException; +import android.os.IBinder; +import android.os.IInterface; +import android.os.Binder; +import android.os.Parcel; +public interface ILicenseResultListener extends android.os.IInterface +{ +/** Local-side IPC implementation stub class. */ +public static abstract class Stub extends android.os.Binder implements com.google.android.vending.licensing.ILicenseResultListener +{ +private static final java.lang.String DESCRIPTOR = "com.android.vending.licensing.ILicenseResultListener"; +/** Construct the stub at attach it to the interface. */ +public Stub() +{ +this.attachInterface(this, DESCRIPTOR); +} +/** + * Cast an IBinder object into an ILicenseResultListener interface, + * generating a proxy if needed. + */ +public static com.google.android.vending.licensing.ILicenseResultListener asInterface(android.os.IBinder obj) +{ +if ((obj==null)) { +return null; +} +android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR); +if (((iin!=null)&&(iin instanceof com.google.android.vending.licensing.ILicenseResultListener))) { +return ((com.google.android.vending.licensing.ILicenseResultListener)iin); +} +return new com.google.android.vending.licensing.ILicenseResultListener.Stub.Proxy(obj); +} +public android.os.IBinder asBinder() +{ +return this; +} +public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException +{ +switch (code) +{ +case INTERFACE_TRANSACTION: +{ +reply.writeString(DESCRIPTOR); +return true; +} +case TRANSACTION_verifyLicense: +{ +data.enforceInterface(DESCRIPTOR); +int _arg0; +_arg0 = data.readInt(); +java.lang.String _arg1; +_arg1 = data.readString(); +java.lang.String _arg2; +_arg2 = data.readString(); +this.verifyLicense(_arg0, _arg1, _arg2); +return true; +} +} +return super.onTransact(code, data, reply, flags); +} +private static class Proxy implements com.google.android.vending.licensing.ILicenseResultListener +{ +private android.os.IBinder mRemote; +Proxy(android.os.IBinder remote) +{ +mRemote = remote; +} +public android.os.IBinder asBinder() +{ +return mRemote; +} +public java.lang.String getInterfaceDescriptor() +{ +return DESCRIPTOR; +} +public void verifyLicense(int responseCode, java.lang.String signedData, java.lang.String signature) throws android.os.RemoteException +{ +android.os.Parcel _data = android.os.Parcel.obtain(); +try { +_data.writeInterfaceToken(DESCRIPTOR); +_data.writeInt(responseCode); +_data.writeString(signedData); +_data.writeString(signature); +mRemote.transact(Stub.TRANSACTION_verifyLicense, _data, null, IBinder.FLAG_ONEWAY); +} +finally { +_data.recycle(); +} +} +} +static final int TRANSACTION_verifyLicense = (IBinder.FIRST_CALL_TRANSACTION + 0); +} +public void verifyLicense(int responseCode, java.lang.String signedData, java.lang.String signature) throws android.os.RemoteException; +} diff --git a/app/src/main/java/com/android/vending/licensing/ILicensingService.aidl b/app/src/main/java/com/google/android/vending/licensing/ILicensingService.aidl.bak similarity index 100% rename from app/src/main/java/com/android/vending/licensing/ILicensingService.aidl rename to app/src/main/java/com/google/android/vending/licensing/ILicensingService.aidl.bak diff --git a/app/src/main/java/com/google/android/vending/licensing/ILicensingService.java b/app/src/main/java/com/google/android/vending/licensing/ILicensingService.java new file mode 100644 index 0000000..9559954 --- /dev/null +++ b/app/src/main/java/com/google/android/vending/licensing/ILicensingService.java @@ -0,0 +1,99 @@ +/* + * This file is auto-generated. DO NOT MODIFY. + * Original file: aidl/ILicensingService.aidl + */ +package com.google.android.vending.licensing; +import java.lang.String; +import android.os.RemoteException; +import android.os.IBinder; +import android.os.IInterface; +import android.os.Binder; +import android.os.Parcel; +public interface ILicensingService extends android.os.IInterface +{ +/** Local-side IPC implementation stub class. */ +public static abstract class Stub extends android.os.Binder implements com.google.android.vending.licensing.ILicensingService +{ +private static final java.lang.String DESCRIPTOR = "com.android.vending.licensing.ILicensingService"; +/** Construct the stub at attach it to the interface. */ +public Stub() +{ +this.attachInterface(this, DESCRIPTOR); +} +/** + * Cast an IBinder object into an ILicensingService interface, + * generating a proxy if needed. + */ +public static com.google.android.vending.licensing.ILicensingService asInterface(android.os.IBinder obj) +{ +if ((obj==null)) { +return null; +} +android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR); +if (((iin!=null)&&(iin instanceof com.google.android.vending.licensing.ILicensingService))) { +return ((com.google.android.vending.licensing.ILicensingService)iin); +} +return new com.google.android.vending.licensing.ILicensingService.Stub.Proxy(obj); +} +public android.os.IBinder asBinder() +{ +return this; +} +public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException +{ +switch (code) +{ +case INTERFACE_TRANSACTION: +{ +reply.writeString(DESCRIPTOR); +return true; +} +case TRANSACTION_checkLicense: +{ +data.enforceInterface(DESCRIPTOR); +long _arg0; +_arg0 = data.readLong(); +java.lang.String _arg1; +_arg1 = data.readString(); +com.google.android.vending.licensing.ILicenseResultListener _arg2; +_arg2 = com.google.android.vending.licensing.ILicenseResultListener.Stub.asInterface(data.readStrongBinder()); +this.checkLicense(_arg0, _arg1, _arg2); +return true; +} +} +return super.onTransact(code, data, reply, flags); +} +private static class Proxy implements com.google.android.vending.licensing.ILicensingService +{ +private android.os.IBinder mRemote; +Proxy(android.os.IBinder remote) +{ +mRemote = remote; +} +public android.os.IBinder asBinder() +{ +return mRemote; +} +public java.lang.String getInterfaceDescriptor() +{ +return DESCRIPTOR; +} +public void checkLicense(long nonce, java.lang.String packageName, com.google.android.vending.licensing.ILicenseResultListener listener) throws android.os.RemoteException +{ +android.os.Parcel _data = android.os.Parcel.obtain(); +try { +_data.writeInterfaceToken(DESCRIPTOR); +_data.writeLong(nonce); +_data.writeString(packageName); +_data.writeStrongBinder((((listener!=null))?(listener.asBinder()):(null))); +mRemote.transact(Stub.TRANSACTION_checkLicense, _data, null, IBinder.FLAG_ONEWAY); +} +finally { +_data.recycle(); +} +} +} +static final int TRANSACTION_checkLicense = (IBinder.FIRST_CALL_TRANSACTION + 0); +} +public void checkLicense(long nonce, java.lang.String packageName, com.google.android.vending.licensing.ILicenseResultListener listener) throws android.os.RemoteException; +} diff --git a/app/src/main/java/com/android/vending/licensing/LicenseChecker.java b/app/src/main/java/com/google/android/vending/licensing/LicenseChecker.java similarity index 98% rename from app/src/main/java/com/android/vending/licensing/LicenseChecker.java rename to app/src/main/java/com/google/android/vending/licensing/LicenseChecker.java index 15de98e..0b1c4b6 100644 --- a/app/src/main/java/com/android/vending/licensing/LicenseChecker.java +++ b/app/src/main/java/com/google/android/vending/licensing/LicenseChecker.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.vending.licensing; +package com.google.android.vending.licensing; -import com.android.vending.licensing.util.Base64; -import com.android.vending.licensing.util.Base64DecoderException; +import com.google.android.vending.licensing.util.Base64; +import com.google.android.vending.licensing.util.Base64DecoderException; import android.content.ComponentName; import android.content.Context; diff --git a/app/src/main/java/com/android/vending/licensing/LicenseCheckerCallback.java b/app/src/main/java/com/google/android/vending/licensing/LicenseCheckerCallback.java similarity index 98% rename from app/src/main/java/com/android/vending/licensing/LicenseCheckerCallback.java rename to app/src/main/java/com/google/android/vending/licensing/LicenseCheckerCallback.java index 88eda9d..b250a71 100644 --- a/app/src/main/java/com/android/vending/licensing/LicenseCheckerCallback.java +++ b/app/src/main/java/com/google/android/vending/licensing/LicenseCheckerCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.vending.licensing; +package com.google.android.vending.licensing; /** * Callback for the license checker library. diff --git a/app/src/main/java/com/android/vending/licensing/LicenseValidator.java b/app/src/main/java/com/google/android/vending/licensing/LicenseValidator.java similarity index 97% rename from app/src/main/java/com/android/vending/licensing/LicenseValidator.java rename to app/src/main/java/com/google/android/vending/licensing/LicenseValidator.java index f32d021..61d3c7e 100644 --- a/app/src/main/java/com/android/vending/licensing/LicenseValidator.java +++ b/app/src/main/java/com/google/android/vending/licensing/LicenseValidator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.vending.licensing; +package com.google.android.vending.licensing; -import com.android.vending.licensing.util.Base64; -import com.android.vending.licensing.util.Base64DecoderException; +import com.google.android.vending.licensing.util.Base64; +import com.google.android.vending.licensing.util.Base64DecoderException; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/android/vending/licensing/NullDeviceLimiter.java b/app/src/main/java/com/google/android/vending/licensing/NullDeviceLimiter.java similarity index 95% rename from app/src/main/java/com/android/vending/licensing/NullDeviceLimiter.java rename to app/src/main/java/com/google/android/vending/licensing/NullDeviceLimiter.java index d100427..d87af31 100644 --- a/app/src/main/java/com/android/vending/licensing/NullDeviceLimiter.java +++ b/app/src/main/java/com/google/android/vending/licensing/NullDeviceLimiter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.vending.licensing; +package com.google.android.vending.licensing; /** * A DeviceLimiter that doesn't limit the number of devices that can use a diff --git a/app/src/main/java/com/android/vending/licensing/Obfuscator.java b/app/src/main/java/com/google/android/vending/licensing/Obfuscator.java similarity index 97% rename from app/src/main/java/com/android/vending/licensing/Obfuscator.java rename to app/src/main/java/com/google/android/vending/licensing/Obfuscator.java index 9d2f65b..b5d510d 100644 --- a/app/src/main/java/com/android/vending/licensing/Obfuscator.java +++ b/app/src/main/java/com/google/android/vending/licensing/Obfuscator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.vending.licensing; +package com.google.android.vending.licensing; /** * Interface used as part of a {@link Policy} to allow application authors to obfuscate diff --git a/app/src/main/java/com/android/vending/licensing/Policy.java b/app/src/main/java/com/google/android/vending/licensing/Policy.java similarity index 97% rename from app/src/main/java/com/android/vending/licensing/Policy.java rename to app/src/main/java/com/google/android/vending/licensing/Policy.java index c5b9b70..fa267fc 100644 --- a/app/src/main/java/com/android/vending/licensing/Policy.java +++ b/app/src/main/java/com/google/android/vending/licensing/Policy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.vending.licensing; +package com.google.android.vending.licensing; /** * Policy used by {@link LicenseChecker} to determine whether a user should have diff --git a/app/src/main/java/com/android/vending/licensing/PreferenceObfuscator.java b/app/src/main/java/com/google/android/vending/licensing/PreferenceObfuscator.java similarity index 98% rename from app/src/main/java/com/android/vending/licensing/PreferenceObfuscator.java rename to app/src/main/java/com/google/android/vending/licensing/PreferenceObfuscator.java index a41450b..7c42bfc 100644 --- a/app/src/main/java/com/android/vending/licensing/PreferenceObfuscator.java +++ b/app/src/main/java/com/google/android/vending/licensing/PreferenceObfuscator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.vending.licensing; +package com.google.android.vending.licensing; import android.content.SharedPreferences; import android.util.Log; diff --git a/app/src/main/java/com/android/vending/licensing/ResponseData.java b/app/src/main/java/com/google/android/vending/licensing/ResponseData.java similarity index 98% rename from app/src/main/java/com/android/vending/licensing/ResponseData.java rename to app/src/main/java/com/google/android/vending/licensing/ResponseData.java index de714eb..2adef37 100644 --- a/app/src/main/java/com/android/vending/licensing/ResponseData.java +++ b/app/src/main/java/com/google/android/vending/licensing/ResponseData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.vending.licensing; +package com.google.android.vending.licensing; import java.util.regex.Pattern; diff --git a/app/src/main/java/com/android/vending/licensing/ServerManagedPolicy.java b/app/src/main/java/com/google/android/vending/licensing/ServerManagedPolicy.java similarity index 99% rename from app/src/main/java/com/android/vending/licensing/ServerManagedPolicy.java rename to app/src/main/java/com/google/android/vending/licensing/ServerManagedPolicy.java index 08bdbdf..fbf8cf6 100644 --- a/app/src/main/java/com/android/vending/licensing/ServerManagedPolicy.java +++ b/app/src/main/java/com/google/android/vending/licensing/ServerManagedPolicy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.vending.licensing; +package com.google.android.vending.licensing; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; diff --git a/app/src/main/java/com/android/vending/licensing/StrictPolicy.java b/app/src/main/java/com/google/android/vending/licensing/StrictPolicy.java similarity index 97% rename from app/src/main/java/com/android/vending/licensing/StrictPolicy.java rename to app/src/main/java/com/google/android/vending/licensing/StrictPolicy.java index 744c60b..d8d83b4 100644 --- a/app/src/main/java/com/android/vending/licensing/StrictPolicy.java +++ b/app/src/main/java/com/google/android/vending/licensing/StrictPolicy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.vending.licensing; +package com.google.android.vending.licensing; /** * Non-caching policy. All requests will be sent to the licensing service, diff --git a/app/src/main/java/com/android/vending/licensing/ValidationException.java b/app/src/main/java/com/google/android/vending/licensing/ValidationException.java similarity index 95% rename from app/src/main/java/com/android/vending/licensing/ValidationException.java rename to app/src/main/java/com/google/android/vending/licensing/ValidationException.java index e4a4507..ee4df47 100644 --- a/app/src/main/java/com/android/vending/licensing/ValidationException.java +++ b/app/src/main/java/com/google/android/vending/licensing/ValidationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.vending.licensing; +package com.google.android.vending.licensing; /** * Indicates that an error occurred while validating the integrity of data managed by an diff --git a/app/src/main/java/com/android/vending/licensing/util/Base64.java b/app/src/main/java/com/google/android/vending/licensing/util/Base64.java similarity index 99% rename from app/src/main/java/com/android/vending/licensing/util/Base64.java rename to app/src/main/java/com/google/android/vending/licensing/util/Base64.java index aff7a7f..a0d2779 100644 --- a/app/src/main/java/com/android/vending/licensing/util/Base64.java +++ b/app/src/main/java/com/google/android/vending/licensing/util/Base64.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.android.vending.licensing.util; +package com.google.android.vending.licensing.util; // This code was converted from code at http://iharder.sourceforge.net/base64/ // Lots of extraneous features were removed. diff --git a/app/src/main/java/com/android/vending/licensing/util/Base64DecoderException.java b/app/src/main/java/com/google/android/vending/licensing/util/Base64DecoderException.java similarity index 94% rename from app/src/main/java/com/android/vending/licensing/util/Base64DecoderException.java rename to app/src/main/java/com/google/android/vending/licensing/util/Base64DecoderException.java index b42bb1e..1aef1b5 100644 --- a/app/src/main/java/com/android/vending/licensing/util/Base64DecoderException.java +++ b/app/src/main/java/com/google/android/vending/licensing/util/Base64DecoderException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.android.vending.licensing.util; +package com.google.android.vending.licensing.util; /** * Exception thrown when encountering an invalid Base64 input character. @@ -29,4 +29,4 @@ public Base64DecoderException(String s) { } private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtsoft/growtopia/SharedActivity.java b/app/src/main/java/com/rtsoft/growtopia/SharedActivity.java index bc97ccf..a25a3f0 100644 --- a/app/src/main/java/com/rtsoft/growtopia/SharedActivity.java +++ b/app/src/main/java/com/rtsoft/growtopia/SharedActivity.java @@ -40,6 +40,7 @@ import android.text.Editable; import android.text.InputFilter; import android.text.TextWatcher; +import android.util.DisplayMetrics; import android.util.Log; import android.view.Gravity; import android.view.KeyEvent; @@ -61,10 +62,10 @@ import com.android.billingclient.api.BillingResult; import com.android.billingclient.api.Purchase; import com.android.billingclient.api.PurchasesUpdatedListener; -import com.android.vending.licensing.AESObfuscator; -import com.android.vending.licensing.LicenseChecker; -import com.android.vending.licensing.LicenseCheckerCallback; -import com.android.vending.licensing.ServerManagedPolicy; +import com.google.android.vending.licensing.AESObfuscator; +import com.google.android.vending.licensing.LicenseChecker; +import com.google.android.vending.licensing.LicenseCheckerCallback; +import com.google.android.vending.licensing.ServerManagedPolicy; import com.anzu.sdk.Anzu; import com.gt.launcher.FloatingService; import com.gt.launcher.R; @@ -1022,7 +1023,14 @@ private void RegisterLayoutChangeCallback() { if (!inFloatingMode && !aleardyAtHome) { Rect rect = new Rect(); getWindow().getDecorView().getWindowVisibleDisplayFrame(rect); - m_KeyBoardHeight = mViewGroup.getRootView().getHeight() - rect.bottom; + // m_KeyBoardHeight = mViewGroup.getRootView().getHeight() - rect.bottom; + + // If the navigation gesture is enabled it will be at the bottom or + // if dpi >= 600 makes the navigation bar (not navigation gesture) down. + // So this fix the text input problem? + DisplayMetrics metrics = getResources().getDisplayMetrics(); + m_KeyBoardHeight = metrics.heightPixels - rect.bottom; + if (m_KeyBoardHeight > 0 && !m_editText.isFocused()) { showEditTextBox(true); } diff --git a/build.gradle b/build.gradle index 116f3d4..a550ce3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.0.3' apply false - id 'com.android.library' version '7.0.3' apply false + id 'com.android.application' version '7.2.1' apply false + id 'com.android.library' version '7.2.1' apply false } task clean(type: Delete) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 51d85da..f4d0b3c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Nov 18 12:52:36 ICT 2021 +#Fri Aug 05 20:51:47 ICT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME \ No newline at end of file +zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index ba5021f..5caf9c6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,6 +10,9 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven { + url "https://sdk.tapjoy.com/" + } } } rootProject.name = "GTLauncherAndroid"