Roboyard Android Version 9.1

- remove white circles in the background of robots - shrink green robot, so it doesn't cover walls anymore - update gradle to 7.0.2 - accept new default of Java 8 Signed-off-by: Ruben Barkow-Kuder <github@r.z11.de>
Eastcoast-Laboratories · Dec 6, 2021 · 8a1ef1a · 8a1ef1a
1 parent 4677f5b
commit 8a1ef1a
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 9 deletions.
diff --git a/.idea/modules/app/Roboyard.app.iml b/.idea/modules/app/Roboyard.app.iml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+### Version 9.1
+
+- remove white circles in the background of robots
+- shrink green robot, so it doesn't cover walls anymore
+
 ### Version 9.0
 
 - Add Impossible Mode with at least 17 moves

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "de.z11.roboyard"
         minSdkVersion 15
         targetSdkVersion 26
-        versionCode 27
-        versionName "9.0"
+        versionCode 28
+        versionName "9.1"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/roboyard/eclabs/GamePiece.java b/app/src/main/java/roboyard/eclabs/GamePiece.java
@@ -133,7 +133,7 @@ public void draw(RenderManager renderManager){
 
         xDraw = (int)(this.xGrid+((this.x+((float)deltaX)/10)+0.5f)*this.widthCell);
         yDraw = (int)(this.yGrid+((this.y+((float)deltaY)/10)+0.5f)*this.heightCell);
-        renderManager.drawCircle(xDraw, yDraw, this.radius);
+        // renderManager.drawCircle(xDraw, yDraw, this.radius);
 
 
         renderManager.drawImage(xDraw-this.radius, yDraw-this.radius, xDraw+this.radius, yDraw+this.radius, this.image);

diff --git a/app/src/main/java/roboyard/eclabs/MapObjects.java b/app/src/main/java/roboyard/eclabs/MapObjects.java
@@ -18,8 +18,9 @@ public MapObjects(){
 
     }
 
-
     /*
+     * Extract the data from the _data string
+     * Returns a list of all extracted elements
      * Extrait les données de la chaine de caratère _data
      * Retourne une liste de tous les éléments extraits
      * @return ArrayList GridElement
@@ -31,14 +32,19 @@ public static ArrayList extractDataFromString(String data)
 
         ArrayList<GridElement> elements = new ArrayList<GridElement>();
 
+        // r=robot (vert, jeune, rouge, bleu)
+        // c=target
+        // m=wall (horizontal, vertival)
         List<String> objectTypes = Arrays.asList("mh", "mv", "rv", "rj", "rr", "rb", "cv", "cj", "cr", "cb", "cm");
 
         //On boucle pour chaque type d'objets
+        //We loop for each type of object
         for(final String objectType: objectTypes) {
 
             List<String> allMatches = new ArrayList<String>();
 
             //On récupère toutes les lignes correspondant au type d'objet recherché
+            //We retrieve all the lines corresponding to the type of object sought
             Matcher m = Pattern.compile(objectType+"\\d+,\\d+;").matcher(data);
             while (m.find()) {
                 allMatches.add(m.group());

diff --git a/app/src/main/res/drawable/rv.png b/app/src/main/res/drawable/rv.png
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:7.0.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/download/Roboyard_v9-0.apk → download/Roboyard_v9-1.apk b/download/Roboyard_v9-0.apk → download/Roboyard_v9-1.apk
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip