Skip to content

Commit

Permalink
Roboyard Android Version 9.1
Browse files Browse the repository at this point in the history
- 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 <[email protected]>
  • Loading branch information
rubo77 committed Dec 6, 2021
1 parent 4677f5b commit 8a1ef1a
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .idea/modules/app/Roboyard.app.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/roboyard/eclabs/GamePiece.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 7 additions & 1 deletion app/src/main/java/roboyard/eclabs/MapObjects.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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());
Expand Down
Binary file modified app/src/main/res/drawable/rv.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 8a1ef1a

Please sign in to comment.