Internationalisation

app/app.iml

@@ -112,6 +112,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />

app/src/main/assets/game_medium

@@ -1,5 +1,5 @@
 {
-    "password" : "12345678",
+    "password" : "19662016",
     "max_time" : 120,
 	"stages" : [{
 	"name" : "Intro",

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

@@ -66,6 +66,18 @@ public class BombActivity extends AppCompatActivity {
         this.runOnUiThread(mTimerTick);
     }
 
+    private void startTimer()
+    {
+        mTimer = new Timer();
+        mTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                timerCallback();
+            }
+
+        }, 0, 1000);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -85,14 +97,7 @@ public class BombActivity extends AppCompatActivity {
         mTvCar.setTypeface(face);
 
         mTvPassword.setText(completeTypedString());
-        mTimer = new Timer();
-        mTimer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                timerCallback();
-            }
-
-        }, 0, 1000);
+        startTimer();
 
         mButtons[0] = findViewById(R.id.button7);
         mButtons[1] = findViewById(R.id.button8);
@@ -158,9 +163,10 @@ public class BombActivity extends AppCompatActivity {
     {
         if(mLength == mTyped.length())
         {
-            if(mBomb.disarm(mTyped))
+            mTimer.cancel();
+
+            if(mBomb.disarm(mTyped))//section critique
             { //code bon
-                mTimer.cancel();
                 mGame.getScheduler().clear();
                 mGame.getScheduler().append(SpecialTask.FINISHED_SUCESS);
                 setResult(0);
@@ -172,6 +178,7 @@ public class BombActivity extends AppCompatActivity {
                 Toast.makeText(this,  R.string.toast_fail, Toast.LENGTH_LONG).show();
                 mGame.getBomb().addTime(-100);
                 clear();
+                startTimer();
             }
         }else
         Toast.makeText(this, R.string.toast_length, Toast.LENGTH_SHORT).show();

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

@@ -45,8 +45,6 @@ public class CreditsActivity extends AppCompatActivity {
         {
             mText.setText(Html.fromHtml(CREDITS, Html.FROM_HTML_MODE_COMPACT));
         }
-        Game.erase(this);
-        Game.setGame(null);
     }
 
     public static final int REQUEST_CODE = 23;

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

@@ -11,6 +11,7 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import macampcorp.macamp.activities.viewers.ResourceListActivity;
 import macampcorp.macamp.game.Game;
 import macampcorp.macamp.utils.Android;
 
@@ -22,9 +23,10 @@ public class EndActivity extends AppCompatActivity {
     protected Button mRetry;
     protected LinearLayout mRoot;
 
-    protected static final String mTextWin = "Bien joué";
-    protected static final String mTextLoose = "Perdu !";
-
+    public String _(int x)
+    {
+        return  getResources().getString(x);
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -34,15 +36,16 @@ public class EndActivity extends AppCompatActivity {
         mRetry = findViewById(R.id.btn_retry);
         mRoot = findViewById(R.id.ll_end);
 
+
         mText=findViewById(R.id.tv_end);
         if(mWon)
         {
-            mText.setText(Html.fromHtml(mTextWin));
+            mText.setText(Html.fromHtml(_(R.string.text_success)));
             mRetry.setVisibility(View.GONE);
         }
         else
         {
-            mText.setText(Html.fromHtml(mTextLoose));
+            mText.setText(Html.fromHtml(_(R.string.text_fail)));
             mRetry.setVisibility(View.VISIBLE);
             CrashActivity.start(this);
         }
@@ -55,8 +58,6 @@ public class EndActivity extends AppCompatActivity {
 
     public void onQuit(View v)
     {
-        Game.erase(this);
-        Game.setGame(null);
         finish();
     }
 
@@ -72,4 +73,9 @@ public class EndActivity extends AppCompatActivity {
         it.putExtra("won", win);
         a.startActivityForResult(it, REQUEST_CODE);
     }
+
+    public void onJournal(View v)
+    {
+        ResourceListActivity.start(this);
+    }
 }

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

@@ -219,15 +219,10 @@ public class HostActivity extends Activity implements ChallengeFragment.OnFragme
 
     public void onClickVideos(View v)
     {
-        Intent intent = new Intent(this, ResourceListActivity.class);
-        intent.putExtra("inventaire", mGame.getInventaire());
-        startActivity(intent);
+        ResourceListActivity.start(this);
     }
 
-    public void onClickDisarm(View v)
-    {
 
-    }
 
     public void discoverIndice()
     {

app/src/main/java/macampcorp/macamp/activities/viewers/ResourceListActivity.java

@@ -1,9 +1,12 @@
 package macampcorp.macamp.activities.viewers;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.ListView;
+
+import macampcorp.macamp.game.Game;
 import macampcorp.macamp.game.Inventaire;
 import java.util.ArrayList;
 
@@ -46,4 +49,11 @@ public class ResourceListActivity extends Activity {
         mList = (ListView) findViewById(R.id.list_layout);
         fill();
     }
+
+    public static void start(Activity a)
+    {
+        Intent intent = new Intent(a, ResourceListActivity.class);
+        intent.putExtra("inventaire", Game.game().getInventaire());
+        a.startActivity(intent);
+    }
 }

app/src/main/java/macampcorp/macamp/game/Bomb.java

@@ -19,7 +19,8 @@ public class Bomb implements Serializable{
     public  static final int BOMB_EXPLOSED=3;
 
     protected long      mDeadLine;
-    protected String    mPassword;
+    protected long      mDisarmAt=0;
+    protected String     mPassword;
     protected char      mPasswordKnown[];
     protected int       mStatus;
     protected int       mMinutes;
@@ -51,7 +52,7 @@ public class Bomb implements Serializable{
     {
         if(password.toLowerCase().compareTo(mPassword.toLowerCase())==0)
         {
-            mDeadLine = (mDeadLine - Calendar.getInstance().getTimeInMillis()) / 1000;
+            mDisarmAt = (mDeadLine - Calendar.getInstance().getTimeInMillis()) / 1000;
             mStatus=BOMB_DISARMED;
             return true;
         }else {
@@ -94,7 +95,7 @@ public class Bomb implements Serializable{
             if(mStatus==BOMB_ARMED)
                 now=(mDeadLine - Calendar.getInstance().getTimeInMillis()) / 1000;
             else
-                now=mDeadLine;
+                now=mDisarmAt;
 
 
             int h = 0, m = 0, s = 0;
@@ -142,10 +143,11 @@ public class Bomb implements Serializable{
 
     public boolean hasExplosed()
     {
-        if(getSecondsBeforeBoom()<0)
+
+        if(getSecondsBeforeBoom()<0 && mStatus==BOMB_ARMED)
             explose();
 
-        return mStatus!=BOMB_DISARMED && mDeadLine < Calendar.getInstance().getTimeInMillis();
+        return mStatus==BOMB_EXPLOSED;
     }
 
     public int getStatus() { return mStatus; }

app/src/main/java/macampcorp/macamp/game/scheduler/SpecialTask.java

@@ -53,7 +53,7 @@ public class SpecialTask extends Task {
             case END_FAILED:
                 EndActivity.start(cd, false);
                 //cd.finish();
-                break;
+               // break;
 
             case END_SUCCESS:
                 EndActivity.start(cd, true);

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

@@ -21,6 +21,13 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
+        <Button
+            android:id="@+id/button10"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="onJournal"
+            android:text="@string/btn_journal" />
+
         <Button
             android:id="@+id/button16"
             android:layout_width="match_parent"

app/src/main/res/values-xlarge/dimens.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="bomb_key_size">120dp</dimen>
-    <dimen name="padding_afficheur" > 250dp</dimen>
+    <dimen name="bomb_key_size">90dp</dimen>
+    <dimen name="padding_afficheur" > 100dp</dimen>
 </resources>

app/src/main/res/values/strings.xml

@@ -132,6 +132,8 @@
     <string name="dialog_sure_title">Êtes-vous sûre ?</string>
     <string name="dialog_sure_pre">Cet indice vous coutera</string>
     <string name="dialog_sure_post">, voulez vous continuer ?</string>
+    <string name="text_success"><h1>Félicitations !</h1>Tu as réussi tous les défis et tu a désamrocé la bombe IEM !<br/> Si cette aventure t'as plu, n'hésite pas à la partager et à remercier le personel de la médiathèque et de la MJC.</string>
+    <string name="text_fail"><h1>Tu as échoué !</h1> La tâche était trop dure ! C\'est pas si grave, il n\'y aura plus d\'objets électroniques (téléphone, tablettes, PC, télévisions, etc.). À moins que ... tu souhaite réessayer ?</string>
 
 
 </resources>