-Tuto refait

app/src/main/assets/game_easy

@@ -321,7 +321,7 @@
 				"good_message" : "Bravo !",
 				"resource" : "accueil",
 				"qr_value" : "https://www.facebook.com/mediathequesdequartierdangouleme/",
-				"text" : "Pour trouver ce QR code caché, pose la question \"Comment est votre blanquette\" à l’habitant de l’aquarium",
+				"question" : "Pour trouver ce QR code caché, pose la question \"Comment est votre blanquette\" à l’habitant de l’aquarium",
 				"indices" : [
 					{
 						"penality" : 0.5,

app/src/main/assets/game_hard

@@ -321,7 +321,7 @@
 				"good_message" : "Bravo !",
 				"resource" : "accueil",
 				"qr_value" : "https://www.facebook.com/mediathequesdequartierdangouleme/",
-				"text" : "Pour trouver ce QR code caché, pose la question \"Comment est votre blanquette\" à l’habitant de l’aquarium",
+				"question" : "Pour trouver ce QR code caché, pose la question \"Comment est votre blanquette\" à l’habitant de l’aquarium",
 				"indices" : [
 					{
 						"penality" : 0.5,

app/src/main/assets/game_medium

@@ -321,7 +321,7 @@
 				"good_message" : "Bravo !",
 				"resource" : "accueil",
 				"qr_value" : "https://www.facebook.com/mediathequesdequartierdangouleme/",
-				"text" : "Pour trouver ce QR code caché, pose la question \"Comment est votre blanquette\" à l’habitant de l’aquarium",
+				"question" : "Pour trouver ce QR code caché, pose la question \"Comment est votre blanquette\" à l’habitant de l’aquarium",
 				"indices" : [
 					{
 						"penality" : 0.5,

app/src/main/java/macampcorp/macamp/activities/HostActivity.java

@@ -102,7 +102,7 @@ public class HostActivity extends LocaleCompatActivity implements ChallengeFragm
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_host);
-
+        Sound.init(this);
         mQCMFragment = QCMFragment.newInstance();
         mQuestionFragment = QuestionFragment.newInstance();
         mQRCodeFragment = QRCodeFragment.newInstance();

app/src/main/java/macampcorp/macamp/activities/PermissionActivity.java

@@ -101,7 +101,7 @@ public class PermissionActivity extends LocaleCompatActivity {
             e.printStackTrace();
         }
 
-        Sound.init(this);
+
     }
 
 

app/src/main/java/macampcorp/macamp/activities/TutoActivity.java

@@ -144,7 +144,7 @@ public class TutoActivity extends LocaleCompatActivity  {
         boolean ok=true;
         for(int i=0; i<1000 && ok; i++)
         {
-            String x = "tuto/"+i+".png";
+            String x = "tuto/"+i+".jpg";
             ok=testTutoFile(x);
             if(ok) mPathList.add(x);
         }

app/src/main/java/macampcorp/macamp/ui/Sound.java

@@ -30,6 +30,7 @@ import android.view.animation.AnimationUtils;
 import java.io.IOException;
 
 import macampcorp.macamp.activities.R;
+import macampcorp.macamp.utils.L;
 
 public class Sound {
     public interface MediaCompletionListener{
@@ -67,8 +68,9 @@ public class Sound {
 
     public static void init(Activity a)
     {
-        for(int i = 0; i<mIds.length; i++)
-            precache(a, i);
+        if(mPlayers[0]==null)
+            for(int i = 0; i<mIds.length; i++)
+                precache(a, i);
     }
 
     public static void play(Activity a, int x)

app/src/main/java/uk/co/senab/photoview/PhotoViewAttacher.java

@@ -970,7 +970,7 @@ public class PhotoViewAttacher implements IPhotoView, View.OnTouchListener,
     public interface OnMatrixChangedListener {
         /**
          * Callback for when the Matrix displaying the Drawable has changed. This could be because
-         * the View's bounds have changed, or the user has zoomed.
+         * the View's bounds have changed, or th²e user has zoomed.
          *
          * @param rect - Rectangle displaying the Drawable's new bounds.
          */

app/src/main/res/layout/activity_media.xml

@@ -42,21 +42,19 @@
     <SeekBar
         android:id="@+id/seekBar"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/play"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_below="@+id/title"
-        android:layout_marginBottom="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:layout_toLeftOf="@+id/play"
         android:layout_toStartOf="@+id/play"
-        android:background="#191919"
-        app:layout_constraintBottom_toBottomOf="@+id/play"
+        app:layout_constraintBottom_toTopOf="@+id/media_viewer"
         app:layout_constraintEnd_toStartOf="@+id/play"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/title" />

app/src/main/res/layout/activity_tuto.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#E6616161"
     tools:context=".TutoActivity">
 
     <ImageView
@@ -12,6 +11,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginBottom="8dp"
+        android:onClick="onNext"
         android:src="@drawable/logo"
         android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@+id/btn_prev"

app/src/main/res/layout/activity_viewer.xml

@@ -23,6 +23,7 @@
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
         android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
         android:adjustViewBounds="true"
         android:cropToPadding="false"
         android:focusable="true"
@@ -30,8 +31,10 @@
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title" />
+        app:layout_constraintTop_toBottomOf="@+id/imageButton"
+        app:layout_constraintVertical_bias="1.0" />
 
     <TextView
         android:id="@+id/title"
@@ -44,16 +47,19 @@
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
         android:layout_marginStart="8dp"
+        android:layout_marginTop="16dp"
         android:layout_toLeftOf="@+id/imageButton"
         android:layout_toStartOf="@+id/imageButton"
+        android:clickable="false"
         android:onClick="onClick"
-        android:text="Large Text"
+        android:selectAllOnFocus="true"
+        android:singleLine="false"
+        android:text="Salut"
         android:textAlignment="center"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="25dp"
-        android:textStyle="bold"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
         app:layout_constraintEnd_toStartOf="@+id/imageButton"
-        app:layout_constraintStart_toEndOf="@+id/imageView5" />
+        app:layout_constraintStart_toEndOf="@+id/imageView5"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageButton
         android:id="@+id/imageButton"
@@ -70,7 +76,8 @@
         android:src="@android:drawable/ic_menu_crop"
         app:layout_constraintBottom_toBottomOf="@+id/title"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0" />
 
     <ImageView
         android:id="@+id/imageView5"