-Modif mineur sur les locales

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

@@ -38,11 +38,10 @@ import java.util.TimerTask;
 import macampcorp.macamp.game.Bomb;
 import macampcorp.macamp.game.Game;
 import macampcorp.macamp.game.scheduler.SpecialTask;
-import macampcorp.macamp.lang.Locale;
 import macampcorp.macamp.ui.Sound;
 import macampcorp.macamp.utils.Const;
 
-public class BombActivity extends AppCompatActivity {
+public class BombActivity extends LocaleCompatActivity {
 
     protected Bomb mBomb;
     protected Game mGame;

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

@@ -30,7 +30,7 @@ import android.widget.ImageView;
 import macampcorp.macamp.ui.Sound;
 import macampcorp.macamp.utils.Const;
 
-public class CrashActivity extends AppCompatActivity {
+public class CrashActivity extends LocaleCompatActivity {
     protected ImageView mImage;
     protected ImageView mBsod;
     protected View      mRoot;

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

@@ -27,7 +27,7 @@ import android.widget.TextView;
 import macampcorp.macamp.game.Game;
 import macampcorp.macamp.utils.FontChangeCrawler;
 
-public class CreditsActivity extends AppCompatActivity {
+public class CreditsActivity extends LocaleCompatActivity {
 
     private TextView mText;
     private static final String CREDITS="<h1> Credits </h1>\n" +

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

@@ -31,7 +31,7 @@ import macampcorp.macamp.activities.viewers.ResourceListActivity;
 import macampcorp.macamp.game.Game;
 import macampcorp.macamp.utils.Android;
 
-public class EndActivity extends AppCompatActivity {
+public class EndActivity extends LocaleCompatActivity {
     public static final int REQUEST_CODE=1011;
 
     protected boolean mWon=false;
@@ -39,10 +39,7 @@ public class EndActivity extends AppCompatActivity {
     protected Button mRetry;
     protected LinearLayout mRoot;
 
-    public String _(int x)
-    {
-        return  getResources().getString(x);
-    }
+
 
 
     @Override
@@ -57,12 +54,12 @@ public class EndActivity extends AppCompatActivity {
         mText=findViewById(R.id.tv_end);
         if(mWon)
         {
-            mText.setText(Html.fromHtml(_(R.string.text_success)));
+            mText.setText(Html.fromHtml(locale(R.string.text_success)));
             mRetry.setVisibility(View.GONE);
         }
         else
         {
-            mText.setText(Html.fromHtml(_(R.string.text_fail)));
+            mText.setText(Html.fromHtml(locale(R.string.text_fail)));
             mRetry.setVisibility(View.VISIBLE);
             CrashActivity.start(this);
         }

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

@@ -52,13 +52,12 @@ import macampcorp.macamp.game.challenges.Challenge;
 import macampcorp.macamp.game.Indice;
 import macampcorp.macamp.game.scheduler.Scheduler;
 import macampcorp.macamp.game.scheduler.SpecialTask;
-import macampcorp.macamp.lang.Locale;
 import macampcorp.macamp.ui.Sound;
 import macampcorp.macamp.utils.AndroidResources;
 import macampcorp.macamp.utils.L;
 
 
-public class HostActivity extends Activity implements ChallengeFragment.OnFragmentInteractionListener {
+public class HostActivity extends LocaleCompatActivity implements ChallengeFragment.OnFragmentInteractionListener {
     public static final int REQUEST_CODE = 25;
     protected Game mGame;
     protected TextView mUITimeLeft;
@@ -77,11 +76,6 @@ public class HostActivity extends Activity implements ChallengeFragment.OnFragme
 
     private static final int ACTIVITY_RESULT_RESOURCE_VIEWER_SCHEDULER = 2;
 
-    public String _(int x)
-    {
-        return  getResources().getString(x);
-    }
-
     private Timer mTimer;
     private Runnable mTimerTick = new Runnable() {
         public void run() {
@@ -272,15 +266,15 @@ public class HostActivity extends Activity implements ChallengeFragment.OnFragme
         {
             Indice x = mCurrentFragment.getChallenge().peakNextIndice();
             int c = Math.round(x.getPenality()*60);
-            String out = ""+c+" "+_(R.string.secondes);
+            String out = ""+c+" "+locale(R.string.secondes);
             if(c>=60)
-                out=(c/60)+" "+_(R.string.minutes )+" "+
-                        _(R.string.and)+" "+(c%60)+" "+_(R.string.secondes);
+                out=(c/60)+" "+locale(R.string.minutes )+" "+
+                        locale(R.string.and)+" "+(c%60)+" "+locale(R.string.secondes);
 
             new AlertDialog.Builder(this)
-                    .setTitle(_(R.string.dialog_sure_title))
-                    .setMessage(_(R.string.dialog_sure_pre)+" "+out+
-                                _(R.string.dialog_sure_post))
+                    .setTitle(locale(R.string.dialog_sure_title))
+                    .setMessage(locale(R.string.dialog_sure_pre)+" "+out+
+                                locale(R.string.dialog_sure_post))
                     .setNegativeButton(android.R.string.no,  null)
                     .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface arg0, int arg1) {

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

@@ -0,0 +1,18 @@
+package macampcorp.macamp.activities;
+
+import android.support.v7.app.AppCompatActivity;
+import android.text.Html;
+import android.text.Spanned;
+
+public class LocaleCompatActivity extends AppCompatActivity {
+
+    public String locale(int x)
+    {
+        return  getResources().getString(x);
+    }
+
+    public Spanned localeHtml(int x)
+    {
+        return Html.fromHtml(getResources().getString(x));
+    }
+}

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

@@ -27,7 +27,7 @@ import android.widget.Button;
 import macampcorp.macamp.activities.R;
 import macampcorp.macamp.game.Game;
 
-public class MenuActivity extends AppCompatActivity {
+public class MenuActivity extends LocaleCompatActivity {
 
     protected boolean mIsSaved;
     protected Button mContinue;

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

@@ -42,13 +42,12 @@ import java.util.ArrayList;
 
 import macampcorp.macamp.game.Game;
 import macampcorp.macamp.game.Resource;
-import macampcorp.macamp.lang.Locale;
 import macampcorp.macamp.ui.Sound;
 import macampcorp.macamp.utils.files.FileManager;
 
 
 
-public class PermissionActivity extends AppCompatActivity {
+public class PermissionActivity extends LocaleCompatActivity {
     private int m_nPerm;
     static final int PERM_FINE_LOCATION=1337;
     static final int ALL_PERMISSIONS=1337;

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

@@ -23,10 +23,11 @@ import android.text.Html;
 import android.view.View;
 import android.widget.TextView;
 
-public class SelectDifficultActivity extends AppCompatActivity {
+public class SelectDifficultActivity extends LocaleCompatActivity {
     protected TextView mEasy;
     protected TextView mMedium;
     protected TextView mHard;
+    protected TextView mSubTitle;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -35,10 +36,12 @@ public class SelectDifficultActivity extends AppCompatActivity {
         mEasy=findViewById(R.id.tv_easy);
         mMedium=findViewById(R.id.tv_medium);
         mHard=findViewById(R.id.tv_hard);
+        mSubTitle=findViewById(R.id.tv_subtitle);
 
-        mEasy.setText(Html.fromHtml(getResources().getString(R.string.diff_select_easy)));
-        mMedium.setText(Html.fromHtml(getResources().getString(R.string.diff_select_medium)));
-        mHard.setText(Html.fromHtml(getResources().getString(R.string.diff_select_hard)));
+        mEasy.setText(localeHtml(R.string.diff_select_easy));
+        mMedium.setText(localeHtml(R.string.diff_select_medium));
+        mHard.setText(localeHtml(R.string.diff_select_hard));
+        mSubTitle.setText(localeHtml(R.string.diff_select_title));
     }
 
     public void onChooseEasy(View v)

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

@@ -35,11 +35,10 @@ import java.io.InputStream;
 import java.util.ArrayList;
 
 import macampcorp.macamp.game.Game;
-import macampcorp.macamp.lang.Locale;
 import macampcorp.macamp.utils.files.FileManager;
 
 
-public class TutoActivity extends AppCompatActivity  {
+public class TutoActivity extends LocaleCompatActivity  {
     public static final int REQUEST_CODE=1010;
     protected ImageView mImage;
     protected ArrayList<String> mPathList = new ArrayList<>();

app/src/main/java/macampcorp/macamp/activities/fragments/ChallengeFragment.java

@@ -43,7 +43,6 @@ import macampcorp.macamp.game.Resource;
 import macampcorp.macamp.game.ResourceManager;
 import macampcorp.macamp.game.challenges.Challenge;
 import macampcorp.macamp.game.Indice;
-import macampcorp.macamp.lang.Locale;
 import macampcorp.macamp.utils.files.FileManager;
 import uk.co.senab.photoview.PhotoViewAttacher;
 
@@ -55,10 +54,7 @@ public abstract class ChallengeFragment extends Fragment{
     protected abstract  void onResetUi();
 
 
-    public String _(int x)
-    {
-        return  getResources().getString(x);
-    }
+
 
     protected LinearLayout  mUITextIndices;
     protected LinearLayout  mUIGlobalIndice;
@@ -209,7 +205,7 @@ public abstract class ChallengeFragment extends Fragment{
         TextView tv = new TextView(getActivity());
         tv.setTextColor(0xff70e030);
         tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
-        tv.setText(_(R.string.indice_prefix)+ " "+ind.getText());
+        tv.setText(getHostActivity().locale(R.string.indice_prefix)+ " "+ind.getText());
         tv.setTypeface(null, Typeface.BOLD);
         return  tv;
     }

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

@@ -62,7 +62,7 @@
         app:layout_constraintTop_toTopOf="@+id/tv_medium" />
 
     <TextView
-        android:id="@+id/textView5"
+        android:id="@+id/tv_subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -131,7 +131,7 @@
         android:background="?android:attr/listDivider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView5" />
+        app:layout_constraintTop_toBottomOf="@+id/tv_subtitle" />
 
     <View
         android:id="@+id/divider7"