From 469296e2f5812c78242db4920b559959f125bb84 Mon Sep 17 00:00:00 2001 From: Mysaa Date: Wed, 19 May 2021 20:11:14 +0200 Subject: [PATCH] =?UTF-8?q?Changement=20de=20l'algorithme=20de=20vitesse?= =?UTF-8?q?=20(un=20peu=20d'al=C3=A9atoire)=20et=20mise=20=C3=A0=20jour=20?= =?UTF-8?q?des=20d=C3=A9pendances.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LaRoueDeLInfortune.iml | 2 +- app/app.iml | 16 ++++++++-------- app/build.gradle | 4 ++-- .../BanditManchotAnimator.java | 9 +++------ .../larouedelinfortune/JeuDeQuestions.java | 16 +++------------- .../larouedelinfortune/QuestionsView.java | 1 + build.gradle | 2 +- 7 files changed, 19 insertions(+), 31 deletions(-) diff --git a/LaRoueDeLInfortune.iml b/LaRoueDeLInfortune.iml index 9cff0d4..cfd3942 100644 --- a/LaRoueDeLInfortune.iml +++ b/LaRoueDeLInfortune.iml @@ -1,5 +1,5 @@ - + diff --git a/app/app.iml b/app/app.iml index bee20f2..5d1f9b7 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,11 +1,11 @@ - + @@ -19,8 +19,8 @@ @@ -32,13 +32,13 @@ - + - - + + diff --git a/app/build.gradle b/app/build.gradle index 1f5aed3..fbe6a09 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 - buildToolsVersion "29.0.3" + buildToolsVersion "29.0.2" defaultConfig { applicationId "com.bernard.larouedelinfortune" minSdkVersion 24 targetSdkVersion 29 - versionCode 5 + versionCode 3 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/bernard/larouedelinfortune/BanditManchotAnimator.java b/app/src/main/java/com/bernard/larouedelinfortune/BanditManchotAnimator.java index a3be18d..baa639b 100644 --- a/app/src/main/java/com/bernard/larouedelinfortune/BanditManchotAnimator.java +++ b/app/src/main/java/com/bernard/larouedelinfortune/BanditManchotAnimator.java @@ -26,16 +26,12 @@ public class BanditManchotAnimator implements View.OnTouchListener { long t00 = -1; long t0 = -1; long t1 = -1; - int deltat0 = 1000; + int deltat0 = 2000; int deltat = 500; int deltax = 1000; double epsilon = 0.008; double omega = 0.02*Math.PI; - public int speed = 511; - public int speedRand = 10; - - public BanditManchotAnimator(GridLayout layout, Context ctx,int questionCount, JeuDeQuestions questions, Button triggerer) { this.questionCount = questionCount; @@ -68,6 +64,7 @@ public class BanditManchotAnimator implements View.OnTouchListener { layout.postInvalidate(); } + public int speed = 467; private void onFrameDraw(){ @@ -103,7 +100,7 @@ public class BanditManchotAnimator implements View.OnTouchListener { } for (int i = rollingMinIndex; i < questionCount; i++) { - views[i].position += speed + rand.nextInt(speedRand*2+1)-speedRand; + views[i].position += speed; views[i].invalidate(); } if(rollingMinIndex!=questionCount || deceleratingQuestion!=-1){ diff --git a/app/src/main/java/com/bernard/larouedelinfortune/JeuDeQuestions.java b/app/src/main/java/com/bernard/larouedelinfortune/JeuDeQuestions.java index ce3f19e..f0a1d83 100644 --- a/app/src/main/java/com/bernard/larouedelinfortune/JeuDeQuestions.java +++ b/app/src/main/java/com/bernard/larouedelinfortune/JeuDeQuestions.java @@ -28,8 +28,6 @@ import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.xml.transform.stream.StreamSource; - public class JeuDeQuestions { public static final String jeuxSubFolder = "jeux"; @@ -211,7 +209,6 @@ public class JeuDeQuestions { entry.getValue().sauvegarderJeu(ctx,entry.getKey()); } } - public static Map lireTousLesJeux(Context ctx){ Map output = new HashMap<>(); for(String nom : nomDesJeuxDispos(ctx)){ @@ -222,16 +219,9 @@ public class JeuDeQuestions { } public static void getAndSetDefaultQuestions(Context ctx){ - try { - InputStream fis = ctx.getResources().openRawResource(R.raw.default_infortune); - JeuDeQuestions jeu = JeuDeQuestions.read(fis); - fis.close(); - jeu.sauvegarderJeu(ctx,ctx.getString(R.string.jeuParDefaut)); - Log.i("DefaultJeu","Le jeu par défaut a été créé !!!"); - }catch (IOException err){ - Log.e("defaultJeu","Le jeu n'a as pu être lu",err); - } - + JeuDeQuestions jeu = new JeuDeQuestions(new String[]{ctx.getString(R.string.questionParDéfaut)},new double[]{1}); + jeu.sauvegarderJeu(ctx,ctx.getString(R.string.jeuParDefaut)); + Log.i("DefaultJeu","Le jeu par défaut a été créé !!!"); } public static final String DOTTED_EXTENSION = ".jeuDeQuestions"; diff --git a/app/src/main/java/com/bernard/larouedelinfortune/QuestionsView.java b/app/src/main/java/com/bernard/larouedelinfortune/QuestionsView.java index 9599944..f91d828 100644 --- a/app/src/main/java/com/bernard/larouedelinfortune/QuestionsView.java +++ b/app/src/main/java/com/bernard/larouedelinfortune/QuestionsView.java @@ -13,6 +13,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import io.github.kexanie.library.MathView; public class QuestionsView extends View { diff --git a/build.gradle b/build.gradle index 0acabe9..2afeee3 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:3.6.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files