clean up and code optimization

Author: Mewel

android/build.gradle

@@ -32,7 +32,7 @@ android {
         applicationId "de.mewel.pixellogic"
         minSdkVersion 24
         targetSdkVersion 33
-        versionCode 31
+        versionCode 32
         versionName "1.2.3"
     }
     buildTypes {

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenLocal()
         mavenCentral()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        jcenter()
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.1'
@@ -32,7 +32,6 @@ allprojects {
     repositories {
         mavenLocal()
         mavenCentral()
-        jcenter()
         google()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven { url "https://oss.sonatype.org/content/repositories/releases/" }
@@ -132,12 +131,12 @@ project(":tests") {
         implementation "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
         implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
 
-        testCompile 'junit:junit:4.+'
-        testCompile "org.mockito:mockito-all:1.9.+"
+        testImplementation 'junit:junit:4.+'
+        testImplementation "org.mockito:mockito-all:1.9.+"
 
-        testCompile "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
-        testCompile "com.badlogicgames.gdx:gdx:$gdxVersion"
-        testCompile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+        testImplementation "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
+        testImplementation "com.badlogicgames.gdx:gdx:$gdxVersion"
+        testImplementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
     }
 }
 

core/src/de/mewel/pixellogic/model/PixelLogicLevel.java

@@ -12,15 +12,16 @@ public class PixelLogicLevel {
 
     private String displayName;
 
-    private int rows, cols;
+    private final int rows;
+    private final int cols;
 
     private Boolean[][] pixels;
 
-    private Boolean[][] levelData;
+    private final Boolean[][] levelData;
 
     private Integer[][] image;
 
-    private Integer[] levelImageOffset;
+    private final Integer[] levelImageOffset;
 
     public PixelLogicLevel(Boolean[][] levelData, boolean preserveSize) {
         this(null, levelData, preserveSize);

core/src/de/mewel/pixellogic/ui/background/PixelLogicUIRotatingBoardBackground.java

@@ -13,15 +13,15 @@
 
 public class PixelLogicUIRotatingBoardBackground extends PixelLogicUIActor {
 
-    private int pixel = 25;
+    private final int pixel = 25;
 
     private float rotate = 0;
 
     private float fadeTicker = 0;
 
-    private Pixel board[][];
+    private final Pixel[][] board;
 
-    private Random random;
+    private final Random random;
 
     public PixelLogicUIRotatingBoardBackground(PixelLogicGlobal global) {
         super(global);
@@ -53,7 +53,7 @@ public void draw(Batch batch, float parentAlpha) {
         ShapeRenderer renderer = this.getAssets().getShapeRenderer();
         renderer.setProjectionMatrix(batch.getProjectionMatrix());
         renderer.setTransformMatrix(batch.getTransformMatrix());
-        renderer.translate((int) (boardWidth / 2), (int) (boardHeight / 2), 0);
+        renderer.translate(boardWidth / 2f, boardHeight / 2f, 0);
         renderer.rotate(0, 0, 1, rotate);
 
         // render board
@@ -134,7 +134,8 @@ public void act(float delta) {
 
     private static class Pixel {
 
-        public int row, col;
+        public final int row;
+        public final int col;
 
         public Color color;
 

core/src/de/mewel/pixellogic/ui/component/PixelLogicUIAchievementBlock.java

@@ -12,7 +12,7 @@ public class PixelLogicUIAchievementBlock extends PixelLogicUIGroup {
 
     private PixelLogicUIColoredSurface background;
 
-    private VerticalGroup container;
+    private final VerticalGroup container;
 
     private Label header, description;
 

core/src/de/mewel/pixellogic/ui/component/PixelLogicUIButton.java

@@ -21,11 +21,11 @@ public abstract class PixelLogicUIButton extends PixelLogicUIGroup {
 
     private String text;
 
-    private PixelLogicUIColoredSurface background;
+    private final PixelLogicUIColoredSurface background;
 
-    private PixelLogicUIButtonListener listener;
+    private final PixelLogicUIButtonListener listener;
 
-    private AtomicBoolean blocked;
+    private final AtomicBoolean blocked;
 
     public PixelLogicUIButton(PixelLogicGlobal global, String text) {
         super(global);

core/src/de/mewel/pixellogic/ui/component/PixelLogicUIContainer.java

@@ -17,7 +17,7 @@
 
 public class PixelLogicUIContainer<T extends WidgetGroup> extends Container<T> implements PixelLogicUIElement {
 
-    private PixelLogicGlobal global;
+    private final PixelLogicGlobal global;
 
     private Texture backgroundTexture;
 

core/src/de/mewel/pixellogic/ui/component/PixelLogicUIMessageModal.java

@@ -10,7 +10,7 @@
 
 public class PixelLogicUIMessageModal extends PixelLogicUIModal {
 
-    private String message;
+    private final String message;
 
     public PixelLogicUIMessageModal(String message, PixelLogicGlobal global, Stage stage) {
         super(global, stage.getRoot());

core/src/de/mewel/pixellogic/ui/component/PixelLogicUIModal.java

@@ -15,11 +15,11 @@
 
 public abstract class PixelLogicUIModal extends PixelLogicUIGroup {
 
-    private Group parent;
+    private final Group parent;
 
-    private PixelLogicUIColoredSurface backdrop;
+    private final PixelLogicUIColoredSurface backdrop;
 
-    private Table content;
+    private final Table content;
 
     private float fadeInDuration;
 

core/src/de/mewel/pixellogic/ui/level/PixelLogicUIBoardGrid.java

@@ -15,7 +15,7 @@ public class PixelLogicUIBoardGrid extends PixelLogicUIActor {
 
     private static final int DISTANCE = 5;
 
-    private PixelLogicLevel level;
+    private final PixelLogicLevel level;
 
     private PixelLogicUILevelResolution resolution;