diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle
index 09de6063..5cf0cc41 100644
--- a/build/android/app/build.gradle
+++ b/build/android/app/build.gradle
@@ -71,7 +71,7 @@ dependencies {
//noinspection GradleDependency
implementation 'commons-io:commons-io:2.5'
implementation 'gun0912.ted:tedpermission-rx2:2.2.3'
- implementation 'net.lingala.zip4j:zip4j:2.6.2'
+ implementation 'net.lingala.zip4j:zip4j:2.6.3'
/* Analytics libraries */
//noinspection GradleDynamicVersion
diff --git a/build/android/app/src/main/AndroidManifest.xml b/build/android/app/src/main/AndroidManifest.xml
index fa006c70..3634883f 100644
--- a/build/android/app/src/main/AndroidManifest.xml
+++ b/build/android/app/src/main/AndroidManifest.xml
@@ -38,15 +38,14 @@
+ android:value="3.0" />
+ android:theme="@style/AppTheme">
@@ -58,10 +57,9 @@
android:configChanges="orientation|keyboard|keyboardHidden|navigation|screenSize|smallestScreenSize"
android:hardwareAccelerated="true"
android:launchMode="singleTask"
- android:maxAspectRatio="3"
+ android:maxAspectRatio="3.0"
android:screenOrientation="sensorLandscape"
- android:theme="@style/AppTheme"
- tools:ignore="LockedOrientationActivity">
+ android:theme="@style/AppTheme">
diff --git a/build/android/app/src/main/java/com/multicraft/game/CustomEditText.java b/build/android/app/src/main/java/com/multicraft/game/CustomEditText.java
index 231d0521..c153f97b 100644
--- a/build/android/app/src/main/java/com/multicraft/game/CustomEditText.java
+++ b/build/android/app/src/main/java/com/multicraft/game/CustomEditText.java
@@ -24,10 +24,9 @@ import android.content.Context;
import android.view.KeyEvent;
import android.view.inputmethod.InputMethodManager;
-import java.util.Objects;
-
-public class CustomEditText extends androidx.appcompat.widget.AppCompatEditText {
+import androidx.appcompat.widget.AppCompatEditText;
+public class CustomEditText extends AppCompatEditText {
public CustomEditText(Context context) {
super(context);
}
@@ -37,7 +36,7 @@ public class CustomEditText extends androidx.appcompat.widget.AppCompatEditText
if (keyCode == KeyEvent.KEYCODE_BACK) {
InputMethodManager mgr = (InputMethodManager)
getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
- Objects.requireNonNull(mgr).hideSoftInputFromWindow(this.getWindowToken(), 0);
+ mgr.hideSoftInputFromWindow(this.getWindowToken(), 0);
}
return false;
}
diff --git a/build/android/app/src/main/java/com/multicraft/game/GameActivity.java b/build/android/app/src/main/java/com/multicraft/game/GameActivity.java
index 09c8280c..96b6e29a 100644
--- a/build/android/app/src/main/java/com/multicraft/game/GameActivity.java
+++ b/build/android/app/src/main/java/com/multicraft/game/GameActivity.java
@@ -24,6 +24,7 @@ import android.app.ActivityManager;
import android.app.NativeActivity;
import android.content.Context;
import android.content.res.Configuration;
+import android.content.res.Resources;
import android.os.Bundle;
import android.text.InputType;
import android.view.KeyEvent;
@@ -36,8 +37,6 @@ import androidx.appcompat.app.AlertDialog;
import com.bugsnag.android.Bugsnag;
import com.multicraft.game.helpers.PreferencesHelper;
-import java.util.Objects;
-
import io.reactivex.Completable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
@@ -62,8 +61,8 @@ public class GameActivity extends NativeActivity {
} catch (IllegalArgumentException i) {
Bugsnag.notify(i);
System.exit(0);
- } catch (Error | Exception error) {
- Bugsnag.notify(error);
+ } catch (Error | Exception e) {
+ Bugsnag.notify(e);
System.exit(0);
}
}
@@ -86,11 +85,12 @@ public class GameActivity extends NativeActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Bundle bundle = getIntent().getExtras();
- height = bundle != null ? bundle.getInt("height", 0) : getResources().getDisplayMetrics().heightPixels;
- width = bundle != null ? bundle.getInt("width", 0) : getResources().getDisplayMetrics().widthPixels;
+ Resources resources = getResources();
+ height = bundle != null ? bundle.getInt("height", 0) : resources.getDisplayMetrics().heightPixels;
+ width = bundle != null ? bundle.getInt("width", 0) : resources.getDisplayMetrics().widthPixels;
consent = bundle == null || bundle.getBoolean("consent", true);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- hasKeyboard = !(getResources().getConfiguration().hardKeyboardHidden == KEYBOARD_QWERTY);
+ hasKeyboard = !(resources.getConfiguration().hardKeyboardHidden == KEYBOARD_QWERTY);
keyboardEvent(hasKeyboard);
pf = getInstance(this);
if (pf.isAdsEnable()) {
@@ -124,6 +124,10 @@ public class GameActivity extends NativeActivity {
adInitSub.dispose();
}
+ public void showDialog(String acceptButton, String hint, String current, int editType) {
+ runOnUiThread(() -> showDialogUI(hint, current, editType));
+ }
+
@Override
protected void onPause() {
super.onPause();
@@ -140,10 +144,6 @@ public class GameActivity extends NativeActivity {
}
}
- public void showDialog(String acceptButton, String hint, String current, int editType) {
- runOnUiThread(() -> showDialogUI(hint, current, editType));
- }
-
private void showDialogUI(String hint, String current, int editType) {
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
EditText editText = new CustomEditText(this);
@@ -153,7 +153,7 @@ public class GameActivity extends NativeActivity {
editText.setHint(hint);
editText.setText(current);
final InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
- Objects.requireNonNull(imm).toggleSoftInput(InputMethodManager.SHOW_FORCED,
+ imm.toggleSoftInput(InputMethodManager.SHOW_FORCED,
InputMethodManager.HIDE_IMPLICIT_ONLY);
if (editType == 1)
editText.setInputType(InputType.TYPE_CLASS_TEXT |
diff --git a/build/android/app/src/main/java/com/multicraft/game/MainActivity.java b/build/android/app/src/main/java/com/multicraft/game/MainActivity.java
index bc90e1fd..d1c4902b 100644
--- a/build/android/app/src/main/java/com/multicraft/game/MainActivity.java
+++ b/build/android/app/src/main/java/com/multicraft/game/MainActivity.java
@@ -71,7 +71,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.concurrent.TimeUnit;
import io.reactivex.Completable;
@@ -399,7 +398,7 @@ public class MainActivity extends AppCompatActivity implements CallBackListener,
.observeOn(AndroidSchedulers.mainThread())
.subscribe(() -> startUnzipService(zips),
throwable -> {
- if (Objects.requireNonNull(throwable.getLocalizedMessage()).contains("ENOSPC"))
+ if (throwable.getLocalizedMessage().contains("ENOSPC"))
showRestartDialog("ENOSPC");
else showRestartDialog("UKNWN");
});
diff --git a/build/android/app/src/main/java/com/multicraft/game/RateMe.java b/build/android/app/src/main/java/com/multicraft/game/RateMe.java
index e79fd212..966d45d3 100644
--- a/build/android/app/src/main/java/com/multicraft/game/RateMe.java
+++ b/build/android/app/src/main/java/com/multicraft/game/RateMe.java
@@ -38,7 +38,6 @@ import com.multicraft.game.helpers.PreferencesHelper;
import java.lang.ref.WeakReference;
import java.util.Date;
-import java.util.Objects;
import static com.multicraft.game.helpers.ApiLevelHelper.isGreaterOrEqualKitkat;
@@ -87,7 +86,7 @@ class RateMe {
final Dialog dialog = new Dialog(activity, R.style.RateMe);
dialog.setCancelable(false);
if (isGreaterOrEqualKitkat())
- Objects.requireNonNull(dialog.getWindow()).getDecorView().setSystemUiVisibility(
+ dialog.getWindow().getDecorView().setSystemUiVisibility(
View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
diff --git a/build/android/app/src/main/java/com/multicraft/game/UnzipService.java b/build/android/app/src/main/java/com/multicraft/game/UnzipService.java
index 5fe317aa..736da42b 100644
--- a/build/android/app/src/main/java/com/multicraft/game/UnzipService.java
+++ b/build/android/app/src/main/java/com/multicraft/game/UnzipService.java
@@ -39,7 +39,6 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.util.Objects;
import static com.multicraft.game.MainActivity.zipLocations;
import static com.multicraft.game.helpers.ApiLevelHelper.isGreaterOrEqualOreo;
@@ -105,7 +104,7 @@ public class UnzipService extends IntentService {
private void unzip(Intent intent) {
String[] zips = intent.getStringArrayExtra(EXTRA_KEY_IN_FILE);
int per = 0;
- int size = getSummarySize(Objects.requireNonNull(zips));
+ int size = getSummarySize(zips);
for (String zip : zips) {
File zipFile = new File(zip);
LocalFileHeader localFileHeader;
diff --git a/build/android/app/src/main/java/com/multicraft/game/helpers/ApiLevelHelper.java b/build/android/app/src/main/java/com/multicraft/game/helpers/ApiLevelHelper.java
index 58a48036..12605559 100644
--- a/build/android/app/src/main/java/com/multicraft/game/helpers/ApiLevelHelper.java
+++ b/build/android/app/src/main/java/com/multicraft/game/helpers/ApiLevelHelper.java
@@ -20,26 +20,30 @@ with this program; if not, write to the Free Software Foundation, Inc.,
package com.multicraft.game.helpers;
-import android.os.Build;
+import static android.os.Build.VERSION.SDK_INT;
+import static android.os.Build.VERSION_CODES.KITKAT;
+import static android.os.Build.VERSION_CODES.LOLLIPOP;
+import static android.os.Build.VERSION_CODES.O;
+import static android.os.Build.VERSION_CODES.Q;
public class ApiLevelHelper {
public static boolean isGreaterOrEqual(int versionCode) {
- return Build.VERSION.SDK_INT >= versionCode;
+ return SDK_INT >= versionCode;
}
public static boolean isGreaterOrEqualKitkat() {
- return isGreaterOrEqual(Build.VERSION_CODES.KITKAT);
+ return isGreaterOrEqual(KITKAT);
}
public static boolean isGreaterOrEqualLollipop() {
- return isGreaterOrEqual(Build.VERSION_CODES.LOLLIPOP);
+ return isGreaterOrEqual(LOLLIPOP);
}
public static boolean isGreaterOrEqualOreo() {
- return isGreaterOrEqual(Build.VERSION_CODES.O);
+ return isGreaterOrEqual(O);
}
public static boolean isGreaterOrEqualQ() {
- return isGreaterOrEqual(Build.VERSION_CODES.Q);
+ return isGreaterOrEqual(Q);
}
}
diff --git a/build/android/app/src/main/java/com/multicraft/game/helpers/Utilities.java b/build/android/app/src/main/java/com/multicraft/game/helpers/Utilities.java
index 3d64558f..048722ce 100644
--- a/build/android/app/src/main/java/com/multicraft/game/helpers/Utilities.java
+++ b/build/android/app/src/main/java/com/multicraft/game/helpers/Utilities.java
@@ -28,7 +28,6 @@ import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
-import android.os.Build;
import android.view.View;
import com.bugsnag.android.Bugsnag;
@@ -45,7 +44,6 @@ import java.net.URL;
import java.util.List;
import static com.multicraft.game.helpers.ApiLevelHelper.isGreaterOrEqualKitkat;
-import static com.multicraft.game.helpers.ApiLevelHelper.isGreaterOrEqualLollipop;
import static com.multicraft.game.helpers.PreferencesHelper.TAG_SHORTCUT_EXIST;
public class Utilities {
diff --git a/build/android/app/src/main/java/com/multicraft/game/helpers/VersionManagerHelper.java b/build/android/app/src/main/java/com/multicraft/game/helpers/VersionManagerHelper.java
index 8dad388f..71104fcb 100644
--- a/build/android/app/src/main/java/com/multicraft/game/helpers/VersionManagerHelper.java
+++ b/build/android/app/src/main/java/com/multicraft/game/helpers/VersionManagerHelper.java
@@ -43,7 +43,6 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Locale;
-import java.util.Objects;
import java.util.concurrent.TimeUnit;
import okhttp3.OkHttpClient;
@@ -136,7 +135,7 @@ public class VersionManagerHelper {
.build();
try {
Response response = client.newCall(request).execute();
- return Objects.requireNonNull(response.body()).string();
+ return response.body().string();
} catch (IOException | NullPointerException e) {
// nothing
}
diff --git a/build/android/app/src/main/res/drawable/custom_progress_bar.xml b/build/android/app/src/main/res/drawable/custom_progress_bar.xml
index 6e7bbaf0..357c4dec 100644
--- a/build/android/app/src/main/res/drawable/custom_progress_bar.xml
+++ b/build/android/app/src/main/res/drawable/custom_progress_bar.xml
@@ -1,6 +1,6 @@
- -
+
-
- -
+
-
diff --git a/build/android/app/src/main/res/drawable/logo.png b/build/android/app/src/main/res/drawable/logo.png
deleted file mode 100644
index 8c249d98..00000000
Binary files a/build/android/app/src/main/res/drawable/logo.png and /dev/null differ
diff --git a/build/android/app/src/main/res/font/retron2000.ttf b/build/android/app/src/main/res/font/retron2000.ttf
new file mode 100644
index 00000000..f30c7e1b
Binary files /dev/null and b/build/android/app/src/main/res/font/retron2000.ttf differ
diff --git a/build/android/app/src/main/res/layout/activity_main.xml b/build/android/app/src/main/res/layout/activity_main.xml
index e825f0a0..f4b3e485 100644
--- a/build/android/app/src/main/res/layout/activity_main.xml
+++ b/build/android/app/src/main/res/layout/activity_main.xml
@@ -1,19 +1,7 @@
-
-
diff --git a/build/android/app/src/main/res/values/styles.xml b/build/android/app/src/main/res/values/styles.xml
index 957365d3..51b76f78 100644
--- a/build/android/app/src/main/res/values/styles.xml
+++ b/build/android/app/src/main/res/values/styles.xml
@@ -7,6 +7,7 @@
- true
- shortEdges
+ - @font/retron2000