diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..c786247 Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..d73d5ac --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.iutlaval.myapplication", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "properties": [], + "versionCode": 1, + "versionName": "1.0", + "enabled": true, + "outputFile": "app-release.apk" + } + ] +} \ No newline at end of file diff --git a/app/src/main/java/com/iutlaval/myapplication/GameActivity.java b/app/src/main/java/com/iutlaval/myapplication/GameActivity.java index ba04523..b116462 100644 --- a/app/src/main/java/com/iutlaval/myapplication/GameActivity.java +++ b/app/src/main/java/com/iutlaval/myapplication/GameActivity.java @@ -61,15 +61,8 @@ public class GameActivity extends Activity { @Override public boolean onTouchEvent(MotionEvent event) { if(gameEngine != null)gameEngine.onTouchEvent(event); - System.out.println(event.getX()); return super.onTouchEvent(event); } - - @Override - public boolean onGenericMotionEvent(MotionEvent event) { - System.out.println(event.getX()); - return super.onGenericMotionEvent(event); - } } diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/Renderer.java b/app/src/main/java/com/iutlaval/myapplication/Video/Renderer.java index 9da0520..1f56dba 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Video/Renderer.java +++ b/app/src/main/java/com/iutlaval/myapplication/Video/Renderer.java @@ -11,6 +11,7 @@ import android.view.SurfaceView; import androidx.annotation.NonNull; import com.iutlaval.myapplication.Game.GameLogicThread; +import com.iutlaval.myapplication.GameActivity; import com.iutlaval.myapplication.Video.Drawables.Drawable; import com.iutlaval.myapplication.Video.Drawables.DrawableCard; @@ -67,7 +68,9 @@ public class Renderer extends SurfaceView implements SurfaceHolder.Callback { */ @Override public void surfaceChanged(@NonNull SurfaceHolder surfaceHolder, int i, int i1, int i2) { - + //mise a jour de la valleur de la resolution car la premiere obtenus est inexact et prends en compte la bare menu + GameActivity.screenHeight=surfaceHolder.getSurfaceFrame().height(); + GameActivity.screenWidth=surfaceHolder.getSurfaceFrame().width(); } /** diff --git a/app/src/main/res/drawable/t_cc_defaut.png b/app/src/main/res/drawable/t_cc_defaut.png index 7465e55..6984e6c 100644 Binary files a/app/src/main/res/drawable/t_cc_defaut.png and b/app/src/main/res/drawable/t_cc_defaut.png differ